summaryrefslogtreecommitdiff
path: root/source4/ldap_server/ldap_bind.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-24 18:38:45 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-24 18:38:45 +0200
commitedeb20b92128f1859d2d8ecee820846ac5799ed5 (patch)
treeb7c66bf4da6bbe5628fc25def555448d1789b5b1 /source4/ldap_server/ldap_bind.c
parentda01822671b3a553fd805315df7322b8225cfe95 (diff)
parentd2062ab74f7684f8b6975a7415fac23389851278 (diff)
downloadsamba-edeb20b92128f1859d2d8ecee820846ac5799ed5.tar.gz
samba-edeb20b92128f1859d2d8ecee820846ac5799ed5.tar.bz2
samba-edeb20b92128f1859d2d8ecee820846ac5799ed5.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4
Conflicts: source3/include/includes.h
Diffstat (limited to 'source4/ldap_server/ldap_bind.c')
-rw-r--r--source4/ldap_server/ldap_bind.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c
index 8357251a8f..20777e5261 100644
--- a/source4/ldap_server/ldap_bind.c
+++ b/source4/ldap_server/ldap_bind.c
@@ -208,6 +208,7 @@ static NTSTATUS ldapsrv_BindSASL(struct ldapsrv_call *call)
} else {
ctx->conn = conn;
status = gensec_socket_init(conn->gensec,
+ conn->connection,
conn->connection->socket,
conn->connection->event.ctx,
stream_io_handler_callback,