summaryrefslogtreecommitdiff
path: root/source4/libcli/ldap/ldap_client.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-02-25 12:49:37 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-02-25 12:49:37 +0100
commit258ae4cec596631b758fb17c170c4494e4db8a8e (patch)
tree5c9ef9246eef3af3b744e862d0e5314a4686304e /source4/libcli/ldap/ldap_client.c
parentfff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf (diff)
parenta041d9061922b1a90e5b5047af77934d908afdd5 (diff)
downloadsamba-258ae4cec596631b758fb17c170c4494e4db8a8e.tar.gz
samba-258ae4cec596631b758fb17c170c4494e4db8a8e.tar.bz2
samba-258ae4cec596631b758fb17c170c4494e4db8a8e.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts: source4/scripting/python/samba/provision.py
Diffstat (limited to 'source4/libcli/ldap/ldap_client.c')
-rw-r--r--source4/libcli/ldap/ldap_client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 3e54d7fff0..304a2e1253 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -200,7 +200,7 @@ static NTSTATUS ldap_recv_handler(void *private_data, DATA_BLOB blob)
return NT_STATUS_LDAP(LDAP_PROTOCOL_ERROR);
}
- status = ldap_decode(asn1, msg);
+ status = ldap_decode(asn1, samba_ldap_control_handlers(), msg);
if (!NT_STATUS_IS_OK(status)) {
asn1_free(asn1);
return status;
@@ -608,7 +608,7 @@ _PUBLIC_ struct ldap_request *ldap_request_send(struct ldap_connection *conn,
msg->messageid = req->messageid;
- if (!ldap_encode(msg, &req->data, req)) {
+ if (!ldap_encode(msg, samba_ldap_control_handlers(), &req->data, req)) {
status = NT_STATUS_INTERNAL_ERROR;
goto failed;
}