Import from samosa: Removed superflous whitespace

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

diff --git a/ud-useradd b/ud-useradd
index 74008e5..88d6d66 100755 (executable)
--- a/ud-useradd
+++ b/ud-useradd
@@ -9,15 +9,15 @@ from userdir_gpg import *;
 # this, one is to fetch all the entires and pick the highest, the other
 # is to randomly guess uids until one is free. This uses the former.
 # Regrettably ldap doesn't have an integer attribute comparision function
-# so we can only cut the search down slightly 
+# so we can only cut the search down slightly
 def GetFreeID(l):
    HighestUID = 1400;
-   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,  
-                      "uidnumber>="+str(HighestUID),["uidnumber"]);
+   Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,
+                      "uidnumber>="+str(HighestUID),["uidNumber"]);
    HighestUID = 0;
    for I in Attrs:
-      ID = int(GetAttr(I,"uidnumber","0"));
-      if ID > HighestUID: 
+      ID = int(GetAttr(I,"uidNumber","0"));
+      if ID > HighestUID:
          HighestUID = ID;
    return HighestUID + 1;
 
@@ -67,8 +67,8 @@ while (1):
    print "A matching key was found:"
    GPGPrintKeyInfo(Keys[0]);
    break;
-   
-# Crack up the email address from the key into a best guess 
+
+# Crack up the email address from the key into a best guess
 # first/middle/last name
 Addr = SplitEmail(Keys[0][2]);
 (cn,mn,sn) = NameSplit(re.sub('["]','',Addr[0]))
@@ -76,8 +76,8 @@ email = Addr[1] + '@' + Addr[2];
 account = Addr[1];
 
 privsub = email;
-gidnumber = str(DefaultGID);
-uidnumber = 0;
+gidNumber = str(DefaultGID);
+uidNumber = 0;
 
 # Decide if we should use IDEA encryption
 UsePGP2 = 0;
@@ -89,6 +89,11 @@ while len(Keys[0][1]) < 40:
    if Res == "":
       break;
 
+Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"keyFingerPrint=" + Keys[0][1]);
+if len(Attrs) != 0:
+   print "*** This key already belongs to",GetAttr(Attrs[0],"uid");
+   account = GetAttr(Attrs[0],"uid");
+
 # Try to get a uniq account name
 Update=0
 while 1:
@@ -103,10 +108,10 @@ while 1:
    if Res == "yes":
       # Update mode, fetch the default values from the directory
       Update = 1;
-      privsub = GetAttr(Attrs[0],"privatesub");
-      gidnumber = GetAttr(Attrs[0],"gidnumber");
-      uidnumber = GetAttr(Attrs[0],"uidnumber");
-      email = GetAttr(Attrs[0],"emailforward");
+      privsub = GetAttr(Attrs[0],"privateSub");
+      gidNumber = GetAttr(Attrs[0],"gidNumber");
+      uidNumber = GetAttr(Attrs[0],"uidNumber");
+      email = GetAttr(Attrs[0],"emailForward");
       cn = GetAttr(Attrs[0],"cn");
       sn = GetAttr(Attrs[0],"sn");
       mn = GetAttr(Attrs[0],"mn");
@@ -134,13 +139,13 @@ if Res != "":
    privsub = Res;
 
 # GID
-Res = raw_input("Group ID Number [" + gidnumber + "]? ");
+Res = raw_input("Group ID Number [" + gidNumber + "]? ");
 if Res != "":
-   gidnumber = Res;
+   gidNumber = Res;
 
 # UID
-if uidnumber == 0:
-   uidnumber = GetFreeID(l);
+if uidNumber == 0:
+   uidNumber = GetFreeID(l);
 
 # Generate a random password
 if Update == 0 or ForceMail == 1:
@@ -165,14 +170,14 @@ else:
    Pass = None;
 
 # Now we have all the bits of information.
-if mn != "": 
+if mn != "":
    FullName = "%s %s %s" % (cn,mn,sn);
 else:
    FullName = "%s %s" % (cn,sn);
 print "------------";
 print "Final information collected:"
 print " %s <%s@%s>:" % (FullName,account,EmailAppend);
-print "   Assigned UID:",uidnumber," GID:", gidnumber;
+print "   Assigned UID:",uidNumber," GID:", gidNumber;
 print "   Email forwarded to:",email;
 print "   Private Subscription:",privsub;
 print "   GECOS Field: \"%s,,,,\"" % (FullName);
@@ -195,15 +200,15 @@ Subst["__PASSWORD__"] = CryptedPass;
 
 # Generate the LDAP request
 Rec = [(ldap.MOD_REPLACE,"uid",account),
-       (ldap.MOD_REPLACE,"uidNumber",str(uidnumber)),
-       (ldap.MOD_REPLACE,"gidNumber",str(gidnumber)),
+       (ldap.MOD_REPLACE,"uidNumber",str(uidNumber)),
+       (ldap.MOD_REPLACE,"gidNumber",str(gidNumber)),
        (ldap.MOD_REPLACE,"gecos",FullName+",,,,"),
        (ldap.MOD_REPLACE,"loginShell","/bin/bash"),
-       (ldap.MOD_REPLACE,"keyfingerprint",Keys[0][1]),
+       (ldap.MOD_REPLACE,"keyFingerPrint",Keys[0][1]),
        (ldap.MOD_REPLACE,"cn",cn),
        (ldap.MOD_REPLACE,"mn",mn),
        (ldap.MOD_REPLACE,"sn",sn),
-       (ldap.MOD_REPLACE,"emailforward",email),
+       (ldap.MOD_REPLACE,"emailForward",email),
        (ldap.MOD_REPLACE,"shadowLastChange",str(int(time.time()/24/60/60))),
        (ldap.MOD_REPLACE,"shadowMin","0"),
        (ldap.MOD_REPLACE,"shadowMax","99999"),
@@ -211,11 +216,11 @@ Rec = [(ldap.MOD_REPLACE,"uid",account),
        (ldap.MOD_REPLACE,"shadowInactive",""),
        (ldap.MOD_REPLACE,"shadowExpire","")];
 if privsub != " ":
-   Rec.append((ldap.MOD_REPLACE,"privatesub",privsub));
+   Rec.append((ldap.MOD_REPLACE,"privateSub",privsub));
 if Pass != None:
    Rec.append((ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass));
 
-# Submit the modification request   
+# Submit the modification request
 Dn = "uid=" + account + "," + BaseDn;
 print "Updating LDAP directory..",
 sys.stdout.flush();
@@ -245,10 +250,10 @@ if Update == 1 and ForceMail == 0:
 #   Child.write(Sub);
 #   if Child.close() != None:
 #       raise Error, "Sendmail gave a non-zero return code";
-   
+
 # Send the Welcome message
 print "Sending Welcome Email"
-Reply = TemplateSubst(Subst,open(TemplatesDir+"/welcome-message-"+gidnumber,"r").read());
+Reply = TemplateSubst(Subst,open(TemplatesDir+"/welcome-message-"+gidNumber,"r").read());
 Child = os.popen("/usr/sbin/sendmail -t","w");
 #Child = os.popen("cat","w");
 Child.write(Reply);