X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=UDLdap.py;h=096f117cde0c3a822e3bf5f76d6ff5b4f7cd0d23;hb=6b038cc113dde577b9cc19c62656bf6d2b41362d;hp=46bd7d07f68ac94eed5efa7d5141bbd9b8a8d442;hpb=619506fcec54daf0af7a605c4dc6963031bdc9a6;p=mirror%2Fuserdir-ldap.git

diff --git a/UDLdap.py b/UDLdap.py
index 46bd7d0..096f117 100644
--- a/UDLdap.py
+++ b/UDLdap.py
@@ -3,8 +3,8 @@ import time
 import userdir_ldap
 
 class Account:
-    array_values = ['keyFingerPrint', 'mailWhitelist', 'mailRBL', 'mailRHSBL']
-    int_values = ['shadowExpire']
+    array_values = ['keyFingerPrint', 'mailWhitelist', 'mailRBL', 'mailRHSBL', 'supplementaryGid', 'sshRSAAuthKey', 'sudoPassword']
+    int_values = ['shadowExpire', 'gidNumber']
     defaults = {
                  'accountStatus': 'active',
                  'keyFingerPrint': []
@@ -30,11 +30,12 @@ class Account:
         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: