diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-18 21:20:01 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-10-21 08:43:18 +0200 |
| commit | 487545d48fc0625aab20aa8f46897e2bd622554f (patch) | |
| tree | 2e491335f0fdacd499a291029c4dfdb82fbb3c6a | |
| parent | 083025ccd53fe3ee90fcc81eb8d4c566e11fd6ac (diff) | |
| download | samba-487545d48fc0625aab20aa8f46897e2bd622554f.tar.gz samba-487545d48fc0625aab20aa8f46897e2bd622554f.tar.bz2 samba-487545d48fc0625aab20aa8f46897e2bd622554f.zip | |
s3-ntlmssp Remove auth_ntlmssp_negotiated_sign() and auth_ntlmssp_negotiated_seal()
We now just call the gensec_have_feature() directly.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/include/ntlmssp_wrap.h | 2 | ||||
| -rw-r--r-- | source3/libsmb/ntlmssp_wrap.c | 10 | ||||
| -rw-r--r-- | source3/rpc_server/dcesrv_ntlmssp.c | 4 | ||||
| -rw-r--r-- | source3/smbd/seal.c | 4 |
4 files changed, 4 insertions, 16 deletions
diff --git a/source3/include/ntlmssp_wrap.h b/source3/include/ntlmssp_wrap.h index 71fa3b7370..a2c4f7a6be 100644 --- a/source3/include/ntlmssp_wrap.h +++ b/source3/include/ntlmssp_wrap.h @@ -60,8 +60,6 @@ NTSTATUS auth_ntlmssp_unseal_packet(struct auth_ntlmssp_state *ans, const uint8_t *whole_pdu, size_t pdu_length, const DATA_BLOB *sig); -bool auth_ntlmssp_negotiated_sign(struct auth_ntlmssp_state *ans); -bool auth_ntlmssp_negotiated_seal(struct auth_ntlmssp_state *ans); NTSTATUS auth_ntlmssp_set_username(struct auth_ntlmssp_state *ans, const char *user); NTSTATUS auth_ntlmssp_set_domain(struct auth_ntlmssp_state *ans, diff --git a/source3/libsmb/ntlmssp_wrap.c b/source3/libsmb/ntlmssp_wrap.c index af5f2c9f68..e18a60b730 100644 --- a/source3/libsmb/ntlmssp_wrap.c +++ b/source3/libsmb/ntlmssp_wrap.c @@ -72,16 +72,6 @@ NTSTATUS auth_ntlmssp_unseal_packet(struct auth_ntlmssp_state *ans, data, length, whole_pdu, pdu_length, sig); } -bool auth_ntlmssp_negotiated_sign(struct auth_ntlmssp_state *ans) -{ - return gensec_have_feature(ans->gensec_security, GENSEC_FEATURE_SIGN); -} - -bool auth_ntlmssp_negotiated_seal(struct auth_ntlmssp_state *ans) -{ - return gensec_have_feature(ans->gensec_security, GENSEC_FEATURE_SEAL); -} - NTSTATUS auth_ntlmssp_set_username(struct auth_ntlmssp_state *ans, const char *user) { diff --git a/source3/rpc_server/dcesrv_ntlmssp.c b/source3/rpc_server/dcesrv_ntlmssp.c index dcbfafb1c2..221b3bfbbe 100644 --- a/source3/rpc_server/dcesrv_ntlmssp.c +++ b/source3/rpc_server/dcesrv_ntlmssp.c @@ -97,13 +97,13 @@ NTSTATUS ntlmssp_server_step(struct auth_ntlmssp_state *ctx, NTSTATUS ntlmssp_server_check_flags(struct auth_ntlmssp_state *ctx, bool do_sign, bool do_seal) { - if (do_sign && !auth_ntlmssp_negotiated_sign(ctx)) { + if (do_sign && !gensec_have_feature(ctx->gensec_security, GENSEC_FEATURE_SIGN)) { DEBUG(1, (__location__ "Integrity was requested but client " "failed to negotiate signing.\n")); return NT_STATUS_ACCESS_DENIED; } - if (do_seal && !auth_ntlmssp_negotiated_seal(ctx)) { + if (do_seal && !gensec_have_feature(ctx->gensec_security, GENSEC_FEATURE_SEAL)) { DEBUG(1, (__location__ "Privacy was requested but client " "failed to negotiate sealing.\n")); return NT_STATUS_ACCESS_DENIED; diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c index 73efc6ceff..f1508d4d4f 100644 --- a/source3/smbd/seal.c +++ b/source3/smbd/seal.c @@ -761,11 +761,11 @@ static NTSTATUS check_enc_good(struct smb_srv_trans_enc_ctx *ec) } if (ec->es->smb_enc_type == SMB_TRANS_ENC_NTLM) { - if (!auth_ntlmssp_negotiated_sign((ec->auth_ntlmssp_state))) { + if (!gensec_have_feature(ec->auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SIGN)) { return NT_STATUS_INVALID_PARAMETER; } - if (!auth_ntlmssp_negotiated_seal((ec->auth_ntlmssp_state))) { + if (!gensec_have_feature(ec->auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SEAL)) { return NT_STATUS_INVALID_PARAMETER; } } |