summaryrefslogtreecommitdiff
path: root/source3/librpc
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-10-17 20:19:11 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-10-18 12:25:30 +0200
commitf9b042641f9c6615f6a4b102f0182de545d6a19a (patch)
tree3697a6f9e7d87c77e2a451fc384aca3e8bb981a1 /source3/librpc
parentf3333bdade7d54b19bfcdc2addc685abd165eddf (diff)
downloadsamba-f9b042641f9c6615f6a4b102f0182de545d6a19a.tar.gz
samba-f9b042641f9c6615f6a4b102f0182de545d6a19a.tar.bz2
samba-f9b042641f9c6615f6a4b102f0182de545d6a19a.zip
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
Diffstat (limited to 'source3/librpc')
-rw-r--r--source3/librpc/crypto/cli_spnego.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source3/librpc/crypto/cli_spnego.c b/source3/librpc/crypto/cli_spnego.c
index 3420e20d27..4742158b24 100644
--- a/source3/librpc/crypto/cli_spnego.c
+++ b/source3/librpc/crypto/cli_spnego.c
@@ -99,10 +99,7 @@ NTSTATUS spnego_ntlmssp_init_client(TALLOC_CTX *mem_ctx,
}
sp_ctx->mech = SPNEGO_NTLMSSP;
- status = auth_ntlmssp_client_start(sp_ctx,
- lp_netbios_name(),
- lp_workgroup(),
- lp_client_ntlmv2_auth(),
+ status = auth_ntlmssp_client_prepare(sp_ctx,
&sp_ctx->mech_ctx.ntlmssp_state);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(sp_ctx);
@@ -138,6 +135,12 @@ NTSTATUS spnego_ntlmssp_init_client(TALLOC_CTX *mem_ctx,
NTLMSSP_FEATURE_SEAL);
}
+ status = auth_ntlmssp_client_start(sp_ctx->mech_ctx.ntlmssp_state);
+ if (!NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(sp_ctx);
+ return status;
+ }
+
*spnego_ctx = sp_ctx;
return NT_STATUS_OK;
}