ud-useradd: When looking for free UIDs/GIDs, also consider groups

diff --git a/debian/changelog b/debian/changelog
index cfad4ee..4f2317f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+userdir-ldap (0.3.88) UNRELEASED; urgency=medium
+
+  * ud-useradd: When looking for free UIDs/GIDs, also consider groups.
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 08 Feb 2017 18:26:49 +0100
+
 userdir-ldap (0.3.87) unstable; urgency=medium
 
   [ Peter Palfrader ]

diff --git a/ud-useradd b/ud-useradd
index d6114ba..fcda26f 100755 (executable)
--- a/ud-useradd
+++ b/ud-useradd
@@ -51,7 +51,7 @@ def ShouldIgnoreID(uid):
 #      search through all UIDs.
 def GetFreeID(l):
    Attrs = l.search_s(BaseBaseDn,ldap.SCOPE_SUBTREE,
-                      "uidNumber=*",["uidNumber", "gidNumber", "uid"]);
+                      "(|(uidNumber=*)(gidNumber=*))",["uidNumber", "gidNumber", "uid"]);
    HighestUID = 0;
    gids = [];
    uids = [];