From 6f75ba2df079ddee038f25aaead4f45ee7cf67b2 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 21 May 2011 16:42:02 +0200 Subject: [PATCH] no userpassword means locked. --- UDLdap.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/UDLdap.py b/UDLdap.py index 97fd2fb..acc645f 100644 --- a/UDLdap.py +++ b/UDLdap.py @@ -43,7 +43,7 @@ class Account: 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 @@ -55,6 +55,8 @@ class Account: # 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}!"): -- 2.20.1