From 778bf87d8dbae333bfeea3b0d904fd2b17782745 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 22 Jul 2011 12:10:30 +1000 Subject: s3-ntlmssp Remove calls to auth_ntlmssp_and_flags from the server This is changed so that the callers ask for the additional flags that they need, starting with no additional flags. This helps to create a proper abstraction layer in ntlmssp_wrap/auth_ntlmssp. Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/rpc_server/dcesrv_ntlmssp.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'source3/rpc_server') diff --git a/source3/rpc_server/dcesrv_ntlmssp.c b/source3/rpc_server/dcesrv_ntlmssp.c index 87c8e0bece..fd5b820143 100644 --- a/source3/rpc_server/dcesrv_ntlmssp.c +++ b/source3/rpc_server/dcesrv_ntlmssp.c @@ -43,17 +43,12 @@ NTSTATUS ntlmssp_server_auth_start(TALLOC_CTX *mem_ctx, return status; } - /* Clear flags, then set them according to requested flags */ - auth_ntlmssp_and_flags(a, ~(NTLMSSP_NEGOTIATE_SIGN | - NTLMSSP_NEGOTIATE_SEAL)); - if (do_sign) { - auth_ntlmssp_or_flags(a, NTLMSSP_NEGOTIATE_SIGN); + auth_ntlmssp_want_feature(a, NTLMSSP_FEATURE_SIGN); } if (do_seal) { /* Always implies both sign and seal for ntlmssp */ - auth_ntlmssp_or_flags(a, NTLMSSP_NEGOTIATE_SIGN | - NTLMSSP_NEGOTIATE_SEAL); + auth_ntlmssp_want_feature(a, NTLMSSP_FEATURE_SEAL); } status = auth_ntlmssp_update(a, mem_ctx, *token_in, token_out); -- cgit