projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ud-generate: deal with users without loginShell
[mirror/userdir-ldap.git]
/
ud-useradd
diff --git
a/ud-useradd
b/ud-useradd
index
77f71dc
..
0dee8c4
100755
(executable)
--- a/
ud-useradd
+++ b/
ud-useradd
@@
-268,7
+268,7
@@
if Update == 0 or ForceMail == 1:
"0x"+Keys[0][1],UsePGP2);
Password = None;
if CryptedPass is None:
"0x"+Keys[0][1],UsePGP2);
Password = None;
if CryptedPass is None:
- raise
"Error","Password Encryption failed"
+ raise
Exception("Password Encryption failed")
else:
Pass = HashPass(Password);
CryptedPass = "Your password has been set to the previously agreed value.";
else:
Pass = HashPass(Password);
CryptedPass = "Your password has been set to the previously agreed value.";
@@
-398,7
+398,7
@@
Child = os.popen("/usr/sbin/sendmail -t","w");
#Child = os.popen("cat","w");
Child.write(Reply);
if Child.close() is not None:
#Child = os.popen("cat","w");
Child.write(Reply);
if Child.close() is not None:
- raise E
rror, "Sendmail gave a non-zero return code";
+ raise E
xception("Sendmail gave a non-zero return code")
# vim:set et:
# vim:set ts=3:
# vim:set et:
# vim:set ts=3: