summaryrefslogtreecommitdiff
path: root/source4/ldap_server
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-14 03:51:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:09 -0500
commit2e8968714455be3f8f643faf3880f64ec4d65d5b (patch)
tree71dbb9975e95d3671d4e960e82d426ad0d64662f /source4/ldap_server
parent1491f9b6150f01ca3d20076962aa595f34c44aa4 (diff)
downloadsamba-2e8968714455be3f8f643faf3880f64ec4d65d5b.tar.gz
samba-2e8968714455be3f8f643faf3880f64ec4d65d5b.tar.bz2
samba-2e8968714455be3f8f643faf3880f64ec4d65d5b.zip
r7565: fixed handling of sasl data in ldap server
(This used to be commit 9b7a89735f18f66ead010d5a1a0a6516ee9b93fe)
Diffstat (limited to 'source4/ldap_server')
-rw-r--r--source4/ldap_server/ldap_server.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 7319c1c7ac..9f62d72e2c 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -223,7 +223,8 @@ static BOOL ldapsrv_write_buf(struct ldapsrv_connection *conn)
if (!conn->session_info) {
return write_from_buf(sock, &conn->out_buffer);
}
- if (!(gensec_have_feature(conn->gensec, GENSEC_FEATURE_SIGN) ||
+ if (conn->sasl_out_buffer.length == 0 &&
+ !(gensec_have_feature(conn->gensec, GENSEC_FEATURE_SIGN) ||
gensec_have_feature(conn->gensec, GENSEC_FEATURE_SEAL))) {
return write_from_buf(sock, &conn->out_buffer);
}