X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=UDLdap.py;h=2e4509258e9301947b38334676df1bd0d1a5a242;hb=032921f6a9454a411d72cf859aaef6dabdf8a2c9;hp=5b0caa7c4fb44243e62595a5650ec6e02de931a1;hpb=d1ad8523f8e88bf96d9c515da8c8c451a3089bea;p=mirror%2Fuserdir-ldap.git

diff --git a/UDLdap.py b/UDLdap.py
index 5b0caa7..2e45092 100644
--- a/UDLdap.py
+++ b/UDLdap.py
@@ -3,8 +3,10 @@ import time
 import userdir_ldap
 
 class Account:
-    array_values = ['keyFingerPrint', 'mailWhitelist', 'mailRBL', 'mailRHSBL', 'supplementaryGid', 'sshRSAAuthKey', 'sudoPassword']
-    int_values = ['shadowExpire', 'gidNumber']
+    array_values = ['objectClass', 'keyFingerPrint', 'mailWhitelist', 'mailRBL',
+                    'mailRHSBL', 'supplementaryGid', 'sshRSAAuthKey',
+                    'sudoPassword', 'dnsZoneEntry', 'allowedHost']
+    int_values = ['shadowExpire', 'gidNumber', 'uidNumber']
     defaults = {
                  'accountStatus': 'active',
                  'keyFingerPrint': []
@@ -94,9 +96,20 @@ class Account:
 
         return '(%s)'%(', '.join(status))
 
+    def delete_mailforward(self):
+        del self.attributes['emailForward']
+
     def get_dn(self):
         return self.dn
 
+    def email_address(self):
+        mailbox = "<%s@%s>" % (self['uid'], userdir_ldap.EmailAppend)
+        tokens = []
+        if 'cn' in self: tokens.append(self['cn'])
+        if 'sn' in self: tokens.append(self['sn'])
+        tokens.append(mailbox)
+        return ' '.join(tokens)
+
 # vim:set et:
 # vim:set ts=4:
 # vim:set shiftwidth=4: