summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-12-29 12:58:44 +0100
committerStefan Metzmacher <metze@samba.org>2009-12-29 17:06:24 +0100
commitdea456089a7838219e7819bfb04a98e03f3d0002 (patch)
treee07cd9bc6e5fd4548f8878096d905f4091262439
parent60b9434492423d463bd1a43d84b5084dce980ecb (diff)
downloadsamba-dea456089a7838219e7819bfb04a98e03f3d0002.tar.gz
samba-dea456089a7838219e7819bfb04a98e03f3d0002.tar.bz2
samba-dea456089a7838219e7819bfb04a98e03f3d0002.zip
s4:ntlmssp: use data_blob_null in ntlmssp_server_auth()
metze
-rw-r--r--source4/auth/ntlmssp/ntlmssp_server.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
index 80d5896b58..7c165b8eea 100644
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ b/source4/auth/ntlmssp/ntlmssp_server.c
@@ -543,8 +543,8 @@ NTSTATUS ntlmssp_server_auth(struct gensec_security *gensec_security,
const DATA_BLOB in, DATA_BLOB *out)
{
struct gensec_ntlmssp_state *gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
- DATA_BLOB user_session_key = data_blob(NULL, 0);
- DATA_BLOB lm_session_key = data_blob(NULL, 0);
+ DATA_BLOB user_session_key = data_blob_null;
+ DATA_BLOB lm_session_key = data_blob_null;
NTSTATUS nt_status;
TALLOC_CTX *mem_ctx = talloc_new(out_mem_ctx);
@@ -553,7 +553,7 @@ NTSTATUS ntlmssp_server_auth(struct gensec_security *gensec_security,
}
/* zero the outbound NTLMSSP packet */
- *out = data_blob_talloc(out_mem_ctx, NULL, 0);
+ *out = data_blob_null;
if (!NT_STATUS_IS_OK(nt_status = ntlmssp_server_preauth(gensec_ntlmssp_state, in))) {
talloc_free(mem_ctx);
@@ -574,7 +574,9 @@ NTSTATUS ntlmssp_server_auth(struct gensec_security *gensec_security,
talloc_free(mem_ctx);
return nt_status;
}
-
+
+ gensec_ntlmssp_state->session_key = data_blob_null;
+
if (gensec_security->want_features
& (GENSEC_FEATURE_SIGN|GENSEC_FEATURE_SEAL|GENSEC_FEATURE_SESSION_KEY)) {
nt_status = ntlmssp_server_postauth(gensec_security, &user_session_key, &lm_session_key);