From 7d5b6592e4832accdc672cc42e99028470378781 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 16 Nov 2009 06:56:21 +0000
Subject: [PATCH] Fixed messed up regular expression. -Couldn't create primary
 groups anymore out of posixAccount class.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14813 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../personal/posix/class_posixAccount.inc     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc
index 9ae31c78e..92be4091f 100644
--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
+++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -894,24 +894,24 @@ class posixAccount extends plugin
       if ($ldap->count() == 0){
 
         $groupcn = $this->uid;
-        $groupdn= preg_replace ('/^'.preg_quote($this->config->get_cfg_value("accountPrimaryAttribute").'=[^,]+,'.get_people_ou(), '/').'/i',
+        $pri_attr = $this->config->get_cfg_value("accountPrimaryAttribute");
+        $groupdn= preg_replace ('/^'.preg_quote($pri_attr,'/').'=[^,]+,'.preg_quote(get_people_ou(),'/').'/i',
             'cn='.$groupcn.','.get_groups_ou(), $this->dn);
 
         /* Request a new and uniqe gidNumber, if required */
         if(!$this->force_ids){
           $this->gidNumber= get_next_id("gidNumber", $this->dn);
-        }else{
-
-          /* If forced gidNumber could not be found, then check if the given group name already exists 
-              we do not want to modify the gidNumber of an existing group.
-           */
-          $cnt= 0; 
-          while($ldap->dn_exists($groupdn)){
-            $cnt ++;
-            $groupcn = $this->uid."_".$cnt;
-            $groupdn= preg_replace ('/^'.preg_quote($this->config->get_cfg_value("accountPrimaryAttribute").'=[^,]+,'.get_people_ou(), '/').'/i',
-            'cn='.$groupcn.','.get_groups_ou(), $this->dn);
-          }
+        }
+
+        /* If forced gidNumber could not be found, then check if the given group name already exists 
+           we do not want to modify the gidNumber of an existing group.
+         */
+        $cnt= 0; 
+        while($ldap->dn_exists($groupdn) && ($cnt < 100)){
+          $cnt ++;
+          $groupcn = $this->uid."_".$cnt;
+          $groupdn= preg_replace ('/^'.preg_quote($pri_attr,'/').'=[^,]+,'.preg_quote(get_people_ou(),'/').'/i',
+              'cn='.$groupcn.','.get_groups_ou(), $this->dn);
         }
 
         /* Create new primary group and enforce the new gidNumber */
-- 
2.30.2