X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-useradd;h=6c2e19d4f43286566b79793b6067a4c1d0ab6f53;hb=9c46f82fc6e9dc4f6966dafcf2cca92d5f01ec80;hp=9088502dc335e67ee2a67935632218b2956a60d6;hpb=d0ee80d18e57382cb67def8a5f6ecff11f2cfcc0;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-useradd b/ud-useradd
index 9088502..6c2e19d 100755
--- a/ud-useradd
+++ b/ud-useradd
@@ -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:
@@ -150,7 +155,6 @@ if Update == 0 or ForceMail == 1:
       print "Randomizing and encrypting password"
       Password = GenPass();
       Pass = HashPass(Password);
-      print "PASS: ", Password;
 
       # Use GPG to encrypt it, pass the fingerprint to ID it
       CryptedPass = GPGEncrypt("Your new password is '" + Password + "'\n",\