From bba5f0a6418db2fd5a65e5f72a5a93dc8c7c0240 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 22 Jul 2011 12:15:06 +1000 Subject: s3-ntlmssp Remove auth_ntlmssp_or_flags We now just use auth_ntlmssp_want_feature to get extra flags on the NTLMSSP context Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/libsmb/clifsinfo.c | 2 +- source3/libsmb/ntlmssp_wrap.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'source3/libsmb') diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c index 3e268b5e6f..9005d4dac4 100644 --- a/source3/libsmb/clifsinfo.c +++ b/source3/libsmb/clifsinfo.c @@ -623,7 +623,7 @@ NTSTATUS cli_raw_ntlm_smb_encryption_start(struct cli_state *cli, } auth_ntlmssp_want_feature(es->s.auth_ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY); - auth_ntlmssp_or_flags(es->s.auth_ntlmssp_state, NTLMSSP_NEGOTIATE_SIGN|NTLMSSP_NEGOTIATE_SEAL); + auth_ntlmssp_want_feature(es->s.auth_ntlmssp_state, NTLMSSP_FEATURE_SEAL); if (!NT_STATUS_IS_OK(status = auth_ntlmssp_set_username(es->s.auth_ntlmssp_state, user))) { goto fail; diff --git a/source3/libsmb/ntlmssp_wrap.c b/source3/libsmb/ntlmssp_wrap.c index 454720423a..817dc62910 100644 --- a/source3/libsmb/ntlmssp_wrap.c +++ b/source3/libsmb/ntlmssp_wrap.c @@ -148,11 +148,6 @@ void auth_ntlmssp_and_flags(struct auth_ntlmssp_state *ans, uint32_t flags) ans->ntlmssp_state->neg_flags &= flags; } -void auth_ntlmssp_or_flags(struct auth_ntlmssp_state *ans, uint32_t flags) -{ - ans->ntlmssp_state->neg_flags |= flags; -} - void auth_ntlmssp_want_feature(struct auth_ntlmssp_state *ans, uint32_t feature) { if (ans->gensec_security) { -- cgit