projects
/
mirror
/
userdir-ldap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
703033b
)
no userpassword means locked.
author
Peter Palfrader
<peter@palfrader.org>
Sat, 21 May 2011 14:42:02 +0000
(16:42 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Sat, 21 May 2011 14:42:02 +0000
(16:42 +0200)
UDLdap.py
patch
|
blob
|
history
diff --git
a/UDLdap.py
b/UDLdap.py
index
97fd2fb
..
acc645f
100644
(file)
--- a/
UDLdap.py
+++ b/
UDLdap.py
@@
-43,7
+43,7
@@
class Account:
elif key in self.defaults:
return self.defaults[key]
else:
elif key in self.defaults:
return self.defaults[key]
else:
- raise IndexError
+ raise IndexError
, "No such key: %s (dn: %s)"%(key, self.dn)
def __contains__(self, key):
return key in self.attributes
def __contains__(self, key):
return key in self.attributes
@@
-55,6
+55,8
@@
class Account:
# not locked locked, just reset to something invalid like {crypt}*SSLRESET* is still active
def pw_active(self):
# not locked locked, just reset to something invalid like {crypt}*SSLRESET* is still active
def pw_active(self):
+ if not 'userPassword' in self:
+ return False
if self['userPassword'] == '{crypt}*LK*':
return False
if self['userPassword'].startswith("{crypt}!"):
if self['userPassword'] == '{crypt}*LK*':
return False
if self['userPassword'].startswith("{crypt}!"):