[Da-tools-commits] r348 .: Remove usergroup patch for now, as it changes the default behaviour

[Marc 'HE' Brockschmidt]

------------------------------------------------------------
revno: 348
committer: Marc 'HE' Brockschmidt <he at debian.org>
branch nick: userdir-ldap-common
timestamp: Tue 2007-12-25 10:25:26 +0100
message:
  Remove usergroup patch for now, as it changes the default behaviour
modified:
  ud-useradd
-------------- next part --------------
=== modified file 'ud-useradd'
--- a/ud-useradd	2007-12-25 00:12:29 +0000
+++ b/ud-useradd	2007-12-25 09:25:26 +0000
@@ -33,31 +33,21 @@
 #      search through all UIDs.
 def GetFreeID(l, RoleAccount):
    Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,
-                      "uidNumber=*",["uidNumber", "gidNumber"]);
+                      "uidNumber=*",["uidNumber"]);
    HighestRoleUID = 0;
    HighestUID = 0;
-   gids = [];
    for I in Attrs:
       ID = int(GetAttr(I,"uidNumber","0"));
-      gids.append(int(GetAttr(I, "gidNumber","0")))
       if ID < 1000 and ID > HighestRoleUID:
          HighestRoleUID = ID;
       if ID > HighestUID:
          HighestUID = ID;
 
-   resUID = 0;
    #try to get a UID below 1000 for role accounts:
    if RoleAccount and HighestRoleUID < 999:
-      resUID = HighestRoleUID + 1;
+      return HighestRoleUID + 1;
    else:
-      resUID = HighestUID + 1;
-
-   #try to get a fitting GID:
-   resGID = resUID;
-   while resGID in gids:
-      resGID = resGID + 1
-
-   return (resUID, resGID)
+      return HighestUID + 1;
 
 # Main starts here
 AdminUser = pwd.getpwuid(os.getuid())[0];
@@ -116,7 +106,7 @@
 account = Addr[1];
 
 privsub = email;
-gidNumber = 0;
+gidNumber = str(DefaultGID);
 uidNumber = 0;
 
 # Decide if we should use IDEA encryption
@@ -184,25 +174,14 @@
 if Res != "":
    privsub = Res;
 
-(uidNumber, generatedGID) = GetFreeID(l, RoleAccount)
-UserGroup = 0
+# GID
+Res = raw_input("Group ID Number [" + gidNumber + "]? ");
+if Res != "":
+   gidNumber = Group2GID(l, Res);
 
 # UID
-if not Update:
-   Res = raw_input("User ID Number [%s]? " % (uidNumber));
-   if Res != "":
-      uidNumber = Res;
-
-# GID
-if not gidNumber:
-   gidNumber = generatedGID
-
-Res = raw_input("Group ID Number (default group is %s, new usergroup %s) [%s]" % (DefaultGID, generatedGID, gidNumber));
-if Res != "":
-   gidNumber = Res;
-
-if gidNumber == generatedGID:
-   UserGroup = 1
+if uidNumber == 0:
+   uidNumber = GetFreeID(l, RoleAccount);
 
 # Generate a random password
 if (not RoleAccount) and (Update == 0 or ForceMail == 1):
@@ -297,12 +276,6 @@
       Details.append(("mn",mn));
    if privsub != " ":
       Details.append(("privateSub",privsub))
-
-   #Add user group if needed, then the actual user:
-   if UserGroup == 1:
-      Dn = "gid=" + account + "," + BaseDn;
-      l.add_s(Dn,[("gid",account), ("gidNumber",str(gidNumber)), ("objectClass",("top", "debianGroup"))]);
-
    l.add_s(Dn,Details);
 else:
    # Modification