From: W. Trevor King <wking@tremily.us>
Date: Wed, 15 Aug 2012 14:13:20 +0000 (-0400)
Subject: Also search on displayName in mutt-ldap.py and ldap-jpeg.py.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=79185ca2757e4109f6d08a06988181ab9af80052;p=mw2txt.git

Also search on displayName in mutt-ldap.py and ldap-jpeg.py.

Also prefer displayName to cn when formatting names.
---

diff --git a/posts/LDAP/ldap-jpeg.py b/posts/LDAP/ldap-jpeg.py
index 2d28797..15866a4 100755
--- a/posts/LDAP/ldap-jpeg.py
+++ b/posts/LDAP/ldap-jpeg.py
@@ -83,7 +83,7 @@ def search(query, connection=None):
             post = '*'
         filterstr = '(|%s)' % (
             u' '.join([u'(%s=*%s%s)' % (field, query, post)
-                       for field in ['cn', 'uid', 'mail']]))
+                       for field in ['cn', 'displayName' 'uid', 'mail']]))
         r = connection.search_s(
             CONFIG.get('connection', 'basedn'),
             _ldap.SCOPE_SUBTREE,
@@ -110,7 +110,7 @@ def view_entry_photo(entry):
     cn,data = entry
     if 'jpegPhoto' in data:
         for jpeg in data['jpegPhoto']:
-            name = data['cn'][-1]
+            name = data.get('displayName', data['cn'])[-1]
             fd,filename = _tempfile.mkstemp(
                 prefix= name + '-', suffix='.jpeg')
             try:
diff --git a/posts/LDAP/mutt-ldap.py b/posts/LDAP/mutt-ldap.py
index 059b25c..7c51d85 100755
--- a/posts/LDAP/mutt-ldap.py
+++ b/posts/LDAP/mutt-ldap.py
@@ -87,7 +87,7 @@ def search(query, connection=None):
             post = '*'
         filterstr = '(|%s)' % (
             u' '.join([u'(%s=*%s%s)' % (field, query, post)
-                       for field in ['cn', 'uid', 'mail']]))
+                       for field in ['cn', 'displayName', 'uid', 'mail']]))
         r = connection.search_s(
             CONFIG.get('connection', 'basedn'),
             ldap.SCOPE_SUBTREE,
@@ -100,8 +100,9 @@ def search(query, connection=None):
 def format_entry(entry):
     cn,data = entry
     if 'mail' in data:
+        name = data.get('displayName', data['cn'])[-1]
         for m in data['mail']:
-            yield email.utils.formataddr((data['cn'][-1], m))
+            yield email.utils.formataddr((name, m))
 
 
 if __name__ == '__main__':