svn commit: samba r2664 - in branches/SAMBA_4_0/source: libcli/raw smb_server

[tridge at samba.org]

Author: tridge
Date: 2004-09-26 12:51:49 +0000 (Sun, 26 Sep 2004)
New Revision: 2664

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=2664&nolog=1

Log:
fixed the final server leak for normal operation. We now get a clean report from --leak-check


Modified:
   branches/SAMBA_4_0/source/libcli/raw/smb_signing.c
   branches/SAMBA_4_0/source/smb_server/signing.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/smb_signing.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/smb_signing.c	2004-09-26 12:50:36 UTC (rev 2663)
+++ branches/SAMBA_4_0/source/libcli/raw/smb_signing.c	2004-09-26 12:51:49 UTC (rev 2664)
@@ -321,7 +321,8 @@
 /***********************************************************
  SMB signing - Simple implementation - setup the MAC key.
 ************************************************************/
-BOOL smbcli_simple_set_signing(struct smb_signing_context *sign_info,
+BOOL smbcli_simple_set_signing(TALLOC_CTX *mem_ctx,
+			       struct smb_signing_context *sign_info,
 			       const DATA_BLOB *user_session_key, 
 			       const DATA_BLOB *response)
 {
@@ -332,9 +333,9 @@
 	DEBUG(5, ("SMB signing enabled!\n"));
 
 	if (response && response->length) {
-		sign_info->mac_key = data_blob(NULL, response->length + user_session_key->length);
+		sign_info->mac_key = data_blob_talloc(mem_ctx, NULL, response->length + user_session_key->length);
 	} else {
-		sign_info->mac_key = data_blob(NULL, user_session_key->length);
+		sign_info->mac_key = data_blob_talloc(mem_ctx, NULL, user_session_key->length);
 	}
 		
 	memcpy(&sign_info->mac_key.data[0], user_session_key->data, user_session_key->length);
@@ -365,7 +366,8 @@
 		return False;
 	}
 
-	return smbcli_simple_set_signing(&transport->negotiate.sign_info,
+	return smbcli_simple_set_signing(transport,
+					 &transport->negotiate.sign_info,
 					 &user_session_key,
 					 &response);
 }

Modified: branches/SAMBA_4_0/source/smb_server/signing.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/signing.c	2004-09-26 12:50:36 UTC (rev 2663)
+++ branches/SAMBA_4_0/source/smb_server/signing.c	2004-09-26 12:51:49 UTC (rev 2664)
@@ -67,7 +67,8 @@
 	if (!set_smb_signing_common(&smb_conn->signing)) {
 		return False;
 	}
-	return smbcli_simple_set_signing(&smb_conn->signing, session_key, response);
+	return smbcli_simple_set_signing(smb_conn,
+					 &smb_conn->signing, session_key, response);
 }
 
 void srv_signing_restart(struct smbsrv_connection *smb_conn,