X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2F__init__.py;h=db0e25e9d5417cd9301ddd4e7cb74367a0e3c2e7;hb=5e5a297901eafca68d181d75f952f33bb53f49b1;hp=c622eb31491f65d618a2f3b6e9bd596ebb147b41;hpb=0be5396f6fbb66545d009e95b332b098803260b5;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/__init__.py b/ldapdb/__init__.py
index c622eb3..db0e25e 100644
--- a/ldapdb/__init__.py
+++ b/ldapdb/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # 
 # django-ldapdb
-# Copyright (C) 2009 Bolloré telecom
+# Copyright (C) 2009-2010 Bolloré telecom
 # See AUTHORS file for a full list of contributors.
 # 
 # This program is free software: you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 import ldap
 
 from django.conf import settings
+from django.db.backends import BaseDatabaseOperations
 
 def convert(field, value, func):
     if not value or field == 'jpegPhoto':
@@ -31,12 +32,25 @@ 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 DatabaseOperations(BaseDatabaseOperations):
+    def quote_name(self, name):
+        return name
+
 class LdapConnection(object):
     def __init__(self, server, bind_dn, bind_password):
         self.connection = ldap.initialize(server)
         self.connection.simple_bind_s(bind_dn, bind_password)
         self.charset = "utf-8"
+        self.ops = DatabaseOperations()
 
     def add_s(self, dn, modlist):
         mods = []
@@ -49,7 +63,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 = []