projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use "foo is None" instead of "foo == None".
[mirror/userdir-ldap.git]
/
ud-useradd
diff --git
a/ud-useradd
b/ud-useradd
index
d6114ba
..
6dd82d9
100755
(executable)
--- a/
ud-useradd
+++ b/
ud-useradd
@@
-51,7
+51,7
@@
def ShouldIgnoreID(uid):
# search through all UIDs.
def GetFreeID(l):
Attrs = l.search_s(BaseBaseDn,ldap.SCOPE_SUBTREE,
# 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 = [];
HighestUID = 0;
gids = [];
uids = [];
@@
-180,7
+180,7
@@
while 1:
cn = GetAttr(Attrs[0],"cn");
sn = GetAttr(Attrs[0],"sn");
mn = GetAttr(Attrs[0],"mn");
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:
privsub = " ";
break;
else:
@@
-249,7
+249,7
@@
if GuestAccount:
shadowExpire = int(time.time() / 3600 / 24) + exp
res = raw_input("Hosts to grant access to: ")
for h in res.split():
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)
if exp > 0: h = h + " " + datetime.datetime.fromtimestamp( time.time() + exp * 24*3600 ).strftime("%Y%m%d")
hostacl.append(h)
@@
-267,7
+267,7
@@
if Update == 0 or ForceMail == 1:
CryptedPass = GPGEncrypt("Your new password is '" + Password + "'\n",\
"0x"+Keys[0][1],UsePGP2);
Password = None;
CryptedPass = GPGEncrypt("Your new password is '" + Password + "'\n",\
"0x"+Keys[0][1],UsePGP2);
Password = None;
- if CryptedPass
==
None:
+ if CryptedPass
is
None:
raise "Error","Password Encryption failed"
else:
Pass = HashPass(Password);
raise "Error","Password Encryption failed"
else:
Pass = HashPass(Password);