projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mutt brokenness fixes
[mirror/userdir-ldap.git]
/
ud-useradd
diff --git
a/ud-useradd
b/ud-useradd
index
cdaf3f8
..
6c2e19d
100755
(executable)
--- a/
ud-useradd
+++ b/
ud-useradd
@@
-89,6
+89,11
@@
while len(Keys[0][1]) < 40:
if Res == "":
break;
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:
# 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 "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",\
# Use GPG to encrypt it, pass the fingerprint to ID it
CryptedPass = GPGEncrypt("Your new password is '" + Password + "'\n",\
@@
-192,7
+196,7
@@
Subst["__LOGIN__"] = account;
Subst["__PRIVATE__"] = privsub;
Subst["__EMAIL__"] = email;
Subst["__PASSWORD__"] = CryptedPass;
Subst["__PRIVATE__"] = privsub;
Subst["__EMAIL__"] = email;
Subst["__PASSWORD__"] = CryptedPass;
-Subst["__LISTPASS__"] = string.strip(open(pwd.getpwuid(os.getuid())[5]+"/.debian-lists_passwd","r").read());
+
#
Subst["__LISTPASS__"] = string.strip(open(pwd.getpwuid(os.getuid())[5]+"/.debian-lists_passwd","r").read());
# Generate the LDAP request
Rec = [(ldap.MOD_REPLACE,"uid",account),
# Generate the LDAP request
Rec = [(ldap.MOD_REPLACE,"uid",account),