svn commit: samba r2521 - in branches/SAMBA_4_0/source/smb_server: .

tridge at samba.org tridge at samba.org
Wed Sep 22 12:45:33 GMT 2004


Author: tridge
Date: 2004-09-22 12:45:33 +0000 (Wed, 22 Sep 2004)
New Revision: 2521

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

Log:
fixed two uninitialised data errors found with valgrind when
negotiating a old style session setup (eg. LANMAN1)


Modified:
   branches/SAMBA_4_0/source/smb_server/negprot.c
   branches/SAMBA_4_0/source/smb_server/sesssetup.c


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/negprot.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/negprot.c	2004-09-22 12:38:19 UTC (rev 2520)
+++ branches/SAMBA_4_0/source/smb_server/negprot.c	2004-09-22 12:45:33 UTC (rev 2521)
@@ -131,6 +131,7 @@
 	SIVAL(req->out.vwv, VWV(6), req->smb_conn->pid);
 	srv_push_dos_date(req->smb_conn, req->out.vwv, VWV(8), t);
 	SSVAL(req->out.vwv, VWV(10), req->smb_conn->negotiate.zone_offset/60);
+	SIVAL(req->out.vwv, VWV(11), 0); /* reserved */
 
 	/* Create a token value and add it to the outgoing packet. */
 	if (req->smb_conn->negotiate.encrypted_passwords) {

Modified: branches/SAMBA_4_0/source/smb_server/sesssetup.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/sesssetup.c	2004-09-22 12:38:19 UTC (rev 2520)
+++ branches/SAMBA_4_0/source/smb_server/sesssetup.c	2004-09-22 12:45:33 UTC (rev 2521)
@@ -44,18 +44,15 @@
 	struct auth_usersupplied_info *user_info = NULL;
 	struct auth_serversupplied_info *server_info = NULL;
 	struct auth_session_info *session_info;
-	DATA_BLOB null_blob;
 
 	if (!req->smb_conn->negotiate.done_sesssetup) {
 		req->smb_conn->negotiate.max_send = sess->old.in.bufsize;
 	}
 
-	null_blob.length = 0;
-
 	status = make_user_info_for_reply_enc(&user_info, 
 					      sess->old.in.user, sess->old.in.domain,
 					      sess->old.in.password,
-					      null_blob);
+					      data_blob(NULL, 0));
 	if (!NT_STATUS_IS_OK(status)) {
 		return NT_STATUS_ACCESS_DENIED;
 	}



More information about the samba-cvs mailing list