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

metze at samba.org metze at samba.org
Wed Mar 22 11:49:24 GMT 2006


Author: metze
Date: 2006-03-22 11:49:24 +0000 (Wed, 22 Mar 2006)
New Revision: 14638

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14638

Log:
we need to call smbsrv_setup_reply() before using smbsrv_setup_error()

tridge: can you please check if the whole function ok?

jelmer: this fixes a crash bug, when asking for Security Descriptors
        and should be in the TP2

metze
Modified:
   branches/SAMBA_4_0/source/smb_server/smb/nttrans.c


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb/nttrans.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/nttrans.c	2006-03-22 10:22:46 UTC (rev 14637)
+++ branches/SAMBA_4_0/source/smb_server/smb/nttrans.c	2006-03-22 11:49:24 UTC (rev 14638)
@@ -465,6 +465,8 @@
 		}
 	}
 
+	smbsrv_setup_reply(req, 18 + trans->out.setup_count, 0);
+
 	/* note that we don't check the max_setup count (matching w2k3
 	   behaviour) */
 
@@ -482,8 +484,6 @@
 	params      = trans->out.params.data;
 	data        = trans->out.data.data;
 
-	smbsrv_setup_reply(req, 18 + trans->out.setup_count, 0);
-
 	/* we need to divide up the reply into chunks that fit into
 	   the negotiated buffer size */
 	do {



More information about the samba-cvs mailing list