fix gid conflicts

Author: simonLeary42

resources/lib/UnityLDAP.php

@@ -120,7 +120,7 @@ public function getNextUIDNumber($UnitySQL)
         $max_uid = $UnitySQL->getSiteVar('MAX_UID');
         $new_uid = $max_uid + 1;
 
-        while ($this->UIDNumInUse($new_uid)) {
+        while ($this->UIDNumInUse($new_uid) || $this->GIDNumInUse($new_uid)) {
             $new_uid++;
         }
 
@@ -134,7 +134,7 @@ public function getNextPiGIDNumber($UnitySQL)
         $max_pigid = $UnitySQL->getSiteVar('MAX_PIGID');
         $new_pigid = $max_pigid + 1;
 
-        while ($this->PIGIDNumInUse($new_pigid)) {
+        while ($this->GIDNumInUse($new_pigid)) {
             $new_pigid++;
         }
 
@@ -169,27 +169,28 @@ private function UIDNumInUse($id)
         return false;
     }
 
-    private function PIGIDNumInUse($id)
+    // FIXME libpam-ldap on unity nodes does not check specific OUs, they check the whole tree
+    // one should conform to the other
+    private function GIDNumInUse($id)
     {
+        $groups = $this->groupOU->getChildrenArray(true);
+        foreach ($groups as $group) {
+            if ($group["gidnumber"][0] == $id) {
+                return true;
+            }
+        }
         $pi_groups = $this->pi_groupOU->getChildrenArray(true);
         foreach ($pi_groups as $pi_group) {
             if ($pi_group["gidnumber"][0] == $id) {
                 return true;
             }
         }
-
-        return false;
-    }
-
-    private function GIDNumInUse($id)
-    {
-        $groups = $this->groupOU->getChildrenArray(true);
-        foreach ($groups as $group) {
-            if ($group["gidnumber"][0] == $id) {
+        $org_groups = $this->org_groupOU->getChildrenArray(true);
+        foreach ($org_groups as $org_group) {
+            if ($org_group["gidnumber"][0] == $id) {
                 return true;
             }
         }
-
         return false;
     }