diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-12-06 15:44:17 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:06:23 -0500 |
| commit | 0ad10aec63201c45b09f91541e9eee17fcf7ede5 (patch) | |
| tree | 3c1dd8ce737deec71af739f0bd61ecc536bb5c79 /source4/ldap_server | |
| parent | a7e97c1eccf7f8b7dca701349a7b0dadd2ba309a (diff) | |
| download | samba-0ad10aec63201c45b09f91541e9eee17fcf7ede5.tar.gz samba-0ad10aec63201c45b09f91541e9eee17fcf7ede5.tar.bz2 samba-0ad10aec63201c45b09f91541e9eee17fcf7ede5.zip | |
r4079: implement the gensec_have_feature() correctly by asking
the backend what is actually in use
metze
(This used to be commit 6f3eb7bc03609108b9e0ea5676fca3d04140e737)
Diffstat (limited to 'source4/ldap_server')
| -rw-r--r-- | source4/ldap_server/ldap_server.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 9f256b0b8b..ea1b8cb9b4 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -195,8 +195,8 @@ static BOOL ldapsrv_read_buf(struct ldapsrv_connection *conn) size_t nread; if (!conn->gensec || !conn->session_info || - !(gensec_have_feature(conn->gensec, GENSEC_WANT_SIGN) && - gensec_have_feature(conn->gensec, GENSEC_WANT_SEAL))) { + !(gensec_have_feature(conn->gensec, GENSEC_FEATURE_SIGN) && + gensec_have_feature(conn->gensec, GENSEC_FEATURE_SEAL))) { return read_into_buf(sock, &conn->in_buffer); } @@ -254,7 +254,7 @@ static BOOL ldapsrv_read_buf(struct ldapsrv_connection *conn) tmp_blob.data = buf + (4 + creds.length); tmp_blob.length = (4 + sasl_length) - (4 + creds.length); - if (gensec_have_feature(conn->gensec, GENSEC_WANT_SEAL)) { + if (gensec_have_feature(conn->gensec, GENSEC_FEATURE_SEAL)) { status = gensec_unseal_packet(conn->gensec, mem_ctx, tmp_blob.data, tmp_blob.length, tmp_blob.data, tmp_blob.length, @@ -320,8 +320,8 @@ static BOOL ldapsrv_write_buf(struct ldapsrv_connection *conn) TALLOC_CTX *mem_ctx; if (!conn->gensec || !conn->session_info || - !(gensec_have_feature(conn->gensec, GENSEC_WANT_SIGN) && - gensec_have_feature(conn->gensec, GENSEC_WANT_SEAL))) { + !(gensec_have_feature(conn->gensec, GENSEC_FEATURE_SIGN) && + gensec_have_feature(conn->gensec, GENSEC_FEATURE_SEAL))) { return write_from_buf(sock, &conn->out_buffer); } @@ -338,7 +338,7 @@ static BOOL ldapsrv_write_buf(struct ldapsrv_connection *conn) goto nodata; } - if (gensec_have_feature(conn->gensec, GENSEC_WANT_SEAL)) { + if (gensec_have_feature(conn->gensec, GENSEC_FEATURE_SEAL)) { status = gensec_seal_packet(conn->gensec, mem_ctx, tmp_blob.data, tmp_blob.length, tmp_blob.data, tmp_blob.length, |