From f9b042641f9c6615f6a4b102f0182de545d6a19a Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 17 Oct 2011 20:19:11 +1100 Subject: s3-ntlmssp split auth_ntlmssp_client_start() into two parts This will allow it to be a wrapper around a gensec module, which requires that they options be set on a context, but before the mechanism is started. This also simplfies the callers, by moving the lp_*() calls into one place. Andrew Bartlett --- source3/rpc_client/cli_pipe.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'source3/rpc_client') diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 247e4867f9..94e4a5106f 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -2283,11 +2283,8 @@ static NTSTATUS rpccli_ntlmssp_bind_data(TALLOC_CTX *mem_ctx, goto fail; } - status = auth_ntlmssp_client_start(result, - lp_netbios_name(), - lp_workgroup(), - lp_client_ntlmv2_auth(), - &ntlmssp_ctx); + status = auth_ntlmssp_client_prepare(result, + &ntlmssp_ctx); if (!NT_STATUS_IS_OK(status)) { goto fail; } @@ -2313,6 +2310,11 @@ static NTSTATUS rpccli_ntlmssp_bind_data(TALLOC_CTX *mem_ctx, auth_ntlmssp_want_feature(ntlmssp_ctx, NTLMSSP_FEATURE_SEAL); } + status = auth_ntlmssp_client_start(ntlmssp_ctx); + if (!NT_STATUS_IS_OK(status)) { + goto fail; + } + result->auth_ctx = ntlmssp_ctx; *presult = result; return NT_STATUS_OK; -- cgit