X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2F__init__.py;h=07db7bb587b2fca5da7b0cca6cca8384efd482a7;hb=c92a7be6f574fceac92e13b5805aebdbc31c281e;hp=c8c56eda8704e34532b4db35b0433849b8ee5922;hpb=90eac76434e76b9ec52afabd695b2c06987668d6;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/__init__.py b/ldapdb/__init__.py
index c8c56ed..07db7bb 100644
--- a/ldapdb/__init__.py
+++ b/ldapdb/__init__.py
@@ -31,7 +31,15 @@ def convert(field, value, func):
         return [ func(x) for x in value ]
     else:
         return func(value)
-        
+
+def escape_ldap_filter(value):
+    value = str(value)
+    return value.replace('\\', '\\5c') \
+                .replace('*', '\\2a') \
+                .replace('(', '\\28') \
+                .replace(')', '\\29') \
+                .replace('\0', '\\00')
+
 class LdapConnection(object):
     def __init__(self, server, bind_dn, bind_password):
         self.connection = ldap.initialize(server)
@@ -49,7 +57,7 @@ class LdapConnection(object):
         return self.connection.add_s(dn.encode(self.charset), mods)
 
     def delete_s(self, dn):
-        return self.connection.delete_s(dn)
+        return self.connection.delete_s(dn.encode(self.charset))
 
     def modify_s(self, dn, modlist):
         mods = []
@@ -62,13 +70,15 @@ class LdapConnection(object):
 
     def search_s(self, base, scope, filterstr, attrlist):
         results = self.connection.search_s(base, scope, filterstr.encode(self.charset), attrlist)
+        output = []
         for dn, attrs in results:
             for field in attrs:
                 if field == "member" or field == "memberUid":
                     attrs[field] = convert(field, attrs[field], lambda x: x.decode(self.charset))
                 else:
                     attrs[field] = convert(field, attrs[field][0], lambda x: x.decode(self.charset))
-        return results
+            output.append((dn.decode(self.charset), attrs))
+        return output
 
 # FIXME: is this the right place to initialize the LDAP connection?
 connection = LdapConnection(settings.LDAPDB_SERVER_URI,