From: Peter Palfrader Date: Sat, 21 May 2011 14:50:21 +0000 (+0200) Subject: Handle capital {CRYPT} in userpasswd X-Git-Tag: userdir-ldap-0.3.85~102 X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=6da780be4bcbe8e5667d22d24431440e1c55221b Handle capital {CRYPT} in userpasswd --- diff --git a/UDLdap.py b/UDLdap.py index acc645f..b546112 100644 --- a/UDLdap.py +++ b/UDLdap.py @@ -57,15 +57,15 @@ class Account: def pw_active(self): if not 'userPassword' in self: return False - if self['userPassword'] == '{crypt}*LK*': + if self['userPassword'].upper() == '{CRYPT}*LK*': return False - if self['userPassword'].startswith("{crypt}!"): + if self['userPassword'].upper().startswith("{CRYPT}!"): return False return True def get_password(self): p = self['userPassword'] - if not p.startswith('{crypt}') or len(p) > 50: + if not p.upper().startswith('{CRYPT}') or len(p) > 50: return p else: return p[7:]