[SCM] Samba Shared Repository - branch v3-6-test updated

Jeremy Allison jra at samba.org
Mon Sep 27 19:26:06 MDT 2010


The branch, v3-6-test has been updated
       via  540cb5c Small tweak to bugfix for 7698 - Assert causes smbd to panic on invalid NetBIOS session request.
      from  46cc0b2 libsmbconf: parse an empty share as empty share, not as NULL.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 540cb5c76ba3f08715c31c1cc8a02f182290aba9
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Sep 27 18:21:46 2010 -0700

    Small tweak to bugfix for 7698 - Assert causes smbd to panic on invalid NetBIOS session request.
    
    Don't just fail to reply on a bad NBT name, just don't do the
    internal action.
    
    Jeremy.
    (cherry picked from commit a738f5b846598fa3f44a7c6aa8019ef886bd1bb7)

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 6316406..829fd27 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -519,12 +519,12 @@ void reply_special(struct smbd_server_connection *sconn, char *inbuf, size_t inb
 		name_len1 = name_len((unsigned char *)(inbuf+4),inbuf_size - 4);
 		if (name_len1 <= 0 || name_len1 > inbuf_size - 4) {
 			DEBUG(0,("Invalid name length in session request\n"));
-			return;
+			break;
 		}
 		name_len2 = name_len((unsigned char *)(inbuf+4+name_len1),inbuf_size - 4 - name_len1);
 		if (name_len2 <= 0 || name_len2 > inbuf_size - 4 - name_len1) {
 			DEBUG(0,("Invalid name length in session request\n"));
-			return;
+			break;
 		}
 
 		name_type1 = name_extract((unsigned char *)inbuf,
@@ -534,7 +534,7 @@ void reply_special(struct smbd_server_connection *sconn, char *inbuf, size_t inb
 
 		if (name_type1 == -1 || name_type2 == -1) {
 			DEBUG(0,("Invalid name type in session request\n"));
-			return;
+			break;
 		}
 
 		DEBUG(2,("netbios connect: name1=%s0x%x name2=%s0x%x\n",


-- 
Samba Shared Repository


More information about the samba-cvs mailing list