ud-generate: deal with users without loginShell

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

diff --git a/ud-useradd b/ud-useradd
index 6dd82d9..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:
-        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.";
@@ -376,7 +376,7 @@ else:
           (ldap.MOD_REPLACE,"shadowExpire","")];
    if privsub != " ":
       Rec.append((ldap.MOD_REPLACE,"privateSub",privsub));
-   if Pass != None:
+   if Pass is not None:
       Rec.append((ldap.MOD_REPLACE,"userPassword","{crypt}"+Pass));
    # Do it
    l.modify_s(Dn,Rec);
@@ -397,8 +397,8 @@ Reply = TemplateSubst(Subst,open(templatepath, "r").read())
 Child = os.popen("/usr/sbin/sendmail -t","w");
 #Child = os.popen("cat","w");
 Child.write(Reply);
-if Child.close() != None:
-   raise Error, "Sendmail gave a non-zero return code";
+if Child.close() is not None:
+   raise Exception("Sendmail gave a non-zero return code")
 
 # vim:set et:
 # vim:set ts=3: