From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 1 Aug 2012 12:14:39 +0000 (+0200)
Subject: libcli/smb: allow resetting of the smb1 application_key
X-Git-Tag: ldb-1.1.9~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7af537e66f0e73ee629b3457ee78a11101f4e1c9;p=thirdparty%2Fsamba.git

libcli/smb: allow resetting of the smb1 application_key

We need this untill we have fixed all callers...

metze
---

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 1b3a688a9e0..ff24688f087 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -4303,7 +4303,6 @@ void smb1cli_session_set_id(struct smbXcli_session *session,
 			    uint16_t session_id)
 {
 	session->smb1.session_id = session_id;
-	data_blob_clear_free(&session->smb1.application_key);
 }
 
 NTSTATUS smb1cli_session_set_session_key(struct smbXcli_session *session,
@@ -4317,7 +4316,12 @@ NTSTATUS smb1cli_session_set_session_key(struct smbXcli_session *session,
 	}
 
 	if (session->smb1.application_key.length != 0) {
-		return NT_STATUS_INVALID_PARAMETER_MIX;
+		/*
+		 * TODO: do not allow this...
+		 *
+		 * return NT_STATUS_INVALID_PARAMETER_MIX;
+		 */
+		data_blob_clear_free(&session->smb1.application_key);
 	}
 
 	if (_session_key.length == 0) {