import userdir_ldap
class Account:
- array_values = ['keyFingerPrint']
- int_values = ['shadowExpire']
+ array_values = ['keyFingerPrint', 'mailWhitelist', 'mailRBL', 'mailRHSBL', 'supplementaryGid', 'sshRSAAuthKey']
+ int_values = ['shadowExpire', 'gidNumber']
defaults = {
'accountStatus': 'active',
'keyFingerPrint': []
if key in self.attributes:
if key in self.array_values:
return self.attributes[key]
- elif key in self.int_values:
- if len(self.attributes[key]) == 1:
- return int(self.attributes[key][0])
- else:
- raise ValueError, 'non-array value has not exactly one value'
+
+ if not len(self.attributes[key]) == 1:
+ raise ValueError, 'non-array value has not exactly one value'
+
+ if key in self.int_values:
+ return int(self.attributes[key][0])
else:
return self.attributes[key][0]
elif key in self.defaults:
def pw_active(self):
if self['userPassword'] == '{crypt}*LK*':
return False
+ if self['userPassword'].startswith("!"):
+ return False
return True
# not expired