diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-18 21:55:24 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-10-21 08:43:38 +0200 |
| commit | 0a0839821adb8a4e959e10128e9c103f82e0ff80 (patch) | |
| tree | 89e62a0d47b74330cf735e61d9ca83b41a69f1a0 /source3/librpc/crypto | |
| parent | 3f079885b21f22ec4f27cccaa6f59ebce0e56067 (diff) | |
| download | samba-0a0839821adb8a4e959e10128e9c103f82e0ff80.tar.gz samba-0a0839821adb8a4e959e10128e9c103f82e0ff80.tar.bz2 samba-0a0839821adb8a4e959e10128e9c103f82e0ff80.zip | |
s3-ntlmssp Remove auth_ntlmssp_session_key()
We now just call the gensec_session_key() directly.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/librpc/crypto')
| -rw-r--r-- | source3/librpc/crypto/cli_spnego.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/librpc/crypto/cli_spnego.c b/source3/librpc/crypto/cli_spnego.c index 31d0157069..c81b424af3 100644 --- a/source3/librpc/crypto/cli_spnego.c +++ b/source3/librpc/crypto/cli_spnego.c @@ -330,13 +330,18 @@ NTSTATUS spnego_get_negotiated_mech(struct spnego_context *sp_ctx, DATA_BLOB spnego_get_session_key(TALLOC_CTX *mem_ctx, struct spnego_context *sp_ctx) { + DATA_BLOB sk; + NTSTATUS status; switch (sp_ctx->mech) { case SPNEGO_KRB5: return gse_get_session_key(mem_ctx, sp_ctx->mech_ctx.gssapi_state); case SPNEGO_NTLMSSP: - return auth_ntlmssp_get_session_key( - sp_ctx->mech_ctx.ntlmssp_state, mem_ctx); + status = gensec_session_key(sp_ctx->mech_ctx.ntlmssp_state->gensec_security, mem_ctx, &sk); + if (!NT_STATUS_IS_OK(status)) { + return data_blob_null; + } + return sk; default: DEBUG(0, ("Unsupported type in request!\n")); return data_blob_null; |