* ud-userimport, ud-groupadd, ud-roleadd, ud-useradd, userdir_ldap.py:

[mirror/userdir-ldap.git] / ud-useradd

diff --git a/ud-useradd b/ud-useradd
index 98cf8cb..e0c30e9 100755 (executable)
--- a/ud-useradd
+++ b/ud-useradd
@@ -167,7 +167,7 @@ Res = raw_input("Subscribe to debian-private (space is none) [" + privsub + "]?
 if Res != "":
    privsub = Res;
 
-(uidNumber, generatedGID) = GetFreeID(l, RoleAccount)
+(uidNumber, generatedGID) = GetFreeID(l)
 if not gidNumber:
    gidNumber = DefaultGID
 UserGroup = 0
@@ -248,8 +248,7 @@ sys.stdout.flush();
 if Update == 0:
    # New account
    Details = [("uid",account),
-              ("objectClass",
-               ("top","inetOrgPerson","debianAccount","shadowAccount","debianDeveloper")),
+              ("objectClass", UserObjectClasses),
               ("uidNumber",str(uidNumber)),
               ("gidNumber",str(gidNumber)),
               ("gecos",FullName+",,,,"),
@@ -271,7 +270,7 @@ if Update == 0:
    #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,[("gid",account), ("gidNumber",str(gidNumber)), ("objectClass", GroupObjectClasses)])
 
    l.add_s(Dn,Details);
 else: