[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  69a67a1 s3: Check for the packet size before accessing it
      from  bf0da0b LDAP-CLDAP: demonstrate that pdc name is an unc path

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 69a67a1b7358d45f7a75fe8f87f652fc237342f7
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Jan 3 22:19:27 2012 +0100

    s3: Check for the packet size before accessing it
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Wed Jan  4 15:16:20 CET 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/process.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index c448267..f366600 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1409,8 +1409,7 @@ static connection_struct *switch_message(uint8 type, struct smb_request *req, in
 
 	/* Make sure this is an SMB packet. smb_size contains NetBIOS header
 	 * so subtract 4 from it. */
-	if (!valid_smb_header(sconn, req->inbuf)
-	    || (size < (smb_size - 4))) {
+	if ((size < (smb_size - 4)) || !valid_smb_header(sconn, req->inbuf)) {
 		DEBUG(2,("Non-SMB packet of length %d. Terminating server\n",
 			 smb_len(req->inbuf)));
 		exit_server_cleanly("Non-SMB packet");


-- 
Samba Shared Repository