From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 21 May 2011 14:42:02 +0000 (+0200)
Subject: no userpassword means locked.
X-Git-Tag: userdir-ldap-0.3.85~104
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=6f75ba2df079ddee038f25aaead4f45ee7cf67b2

no userpassword means locked.
---

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}!"):