# search through all UIDs.
def GetFreeID(l):
Attrs = l.search_s(BaseBaseDn,ldap.SCOPE_SUBTREE,
- "uidNumber=*",["uidNumber", "gidNumber", "uid"]);
+ "(|(uidNumber=*)(gidNumber=*))",["uidNumber", "gidNumber", "uid"]);
HighestUID = 0;
gids = [];
uids = [];
cn = GetAttr(Attrs[0],"cn");
sn = GetAttr(Attrs[0],"sn");
mn = GetAttr(Attrs[0],"mn");
- if privsub == None or privsub == "":
+ if privsub is None or privsub == "":
privsub = " ";
break;
else:
shadowExpire = int(time.time() / 3600 / 24) + exp
res = raw_input("Hosts to grant access to: ")
for h in res.split():
- if not '.' in h: h = h + '.' + HostDomain
+ if '.' not in h: h = h + '.' + HostDomain
if exp > 0: h = h + " " + datetime.datetime.fromtimestamp( time.time() + exp * 24*3600 ).strftime("%Y%m%d")
hostacl.append(h)
CryptedPass = GPGEncrypt("Your new password is '" + Password + "'\n",\
"0x"+Keys[0][1],UsePGP2);
Password = None;
- if CryptedPass == None:
- raise "Error","Password Encryption failed"
+ if CryptedPass is None:
+ raise Exception("Password Encryption failed")
else:
Pass = HashPass(Password);
CryptedPass = "Your password has been set to the previously agreed value.";
(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);
# Send the Welcome message
print "Sending Welcome Email"
-templatepath = TemplatesDir + "/welcome-message-%d" % int(gidNumber)
+templatepath = TemplatesDir + "/welcome-message-%s" % supplementaryGid
if not os.path.exists(templatepath):
templatepath = TemplatesDir + "/welcome-message"
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: