X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-roleadd;h=a3dc1b5ccedc63f84938ba1bb688c80f47515dd7;hb=efc48e4f01ce7f402a4c793727bf776bcf083c05;hp=08f28ac4564215b8c6a9e7151e2313cc314c7d8f;hpb=87683e24b12b5171f9e0f4f814f63f76848a341d;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-roleadd b/ud-roleadd
index 08f28ac..a3dc1b5 100755
--- a/ud-roleadd
+++ b/ud-roleadd
@@ -69,7 +69,10 @@ if Res != "":
 # GID
 Res = raw_input("Group ID Number? ")
 if Res != "":
-   gidNumber = Group2GID(Res)
+   gidNumber = Group2GID(l, Res)
+   if gidNumber == -1:
+      print "Can't figure out which gid %s is" % Res
+      sys.exit(1)
 
 # UID
 uidNumber = GetFreeID(l)
@@ -83,6 +86,7 @@ print "   GECOS Field: \"%s,,,,\"" % cn
 print "   Login Shell: /bin/false"
 Res = raw_input("Continue [No/yes]? ")
 if Res != "yes":
+   print "Not adding %s" % cn
    sys.exit(1)
 
 # Submit the modification request
@@ -91,8 +95,7 @@ print "Updating LDAP directory..",
 sys.stdout.flush()
 
 Details = [("uid",account),
-           ("objectClass",
-            ("top","inetOrgPerson","debianAccount","shadowAccount","debianRoleAccount")),
+           ("objectClass", RoleObjectClasses),
            ("uidNumber",str(uidNumber)),
            ("gidNumber",str(gidNumber)),
            ("gecos",cn+",,,,"),