summaryrefslogtreecommitdiff
path: root/source4/lib/ldb/ldb.py
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-11 03:25:22 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-01-11 03:26:45 +0100
commit1d8cdddcd0901c5886099b7596f6d9629bdfad69 (patch)
tree6f357e48f82c79a5f966d73b7c732440ada14087 /source4/lib/ldb/ldb.py
parent6a875cc8529d971cd41d2ba53952481545989d53 (diff)
downloadsamba-1d8cdddcd0901c5886099b7596f6d9629bdfad69.tar.gz
samba-1d8cdddcd0901c5886099b7596f6d9629bdfad69.tar.bz2
samba-1d8cdddcd0901c5886099b7596f6d9629bdfad69.zip
python/ldap: Support controls argument to ldb.search().
(This used to be commit 9eddc27f13fa2feb56d6b015e66d8c54081487da)
Diffstat (limited to 'source4/lib/ldb/ldb.py')
-rw-r--r--source4/lib/ldb/ldb.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/source4/lib/ldb/ldb.py b/source4/lib/ldb/ldb.py
index 5a921b5394..4cc8b5268a 100644
--- a/source4/lib/ldb/ldb.py
+++ b/source4/lib/ldb/ldb.py
@@ -192,8 +192,16 @@ class Ldb(object):
if url is not None:
self.connect(url, flags, options)
+ def search(self, base=None, scope=SCOPE_DEFAULT, expression=None,
+ attrs=None, controls=None):
+ parsed_controls = None
+ if controls is not None:
+ parsed_controls = self.parse_control_strings(controls)
+ return self.search_ex(base, scope, expression, attrs,
+ parsed_controls)
+
Ldb.connect = new_instancemethod(_ldb.Ldb_connect,None,Ldb)
-Ldb.search = new_instancemethod(_ldb.Ldb_search,None,Ldb)
+Ldb.search_ex = new_instancemethod(_ldb.Ldb_search_ex,None,Ldb)
Ldb.delete = new_instancemethod(_ldb.Ldb_delete,None,Ldb)
Ldb.rename = new_instancemethod(_ldb.Ldb_rename,None,Ldb)
Ldb.parse_control_strings = new_instancemethod(_ldb.Ldb_parse_control_strings,None,Ldb)