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

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  bdb2c72 s3:smbd: don't call smbd_terminate_connection in smb2_validate_message_id() (bug #8476)
       via  46ead7f Fix bug #8476 - Samba asserts when SMB2 client breaks the crediting rules.
      from  65d953f s3-libnet: allow to use default krb5 ccache in libnet_Join/libnet_Unjoin.

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


- Log -----------------------------------------------------------------
commit bdb2c72565e1374585bd638d2d12862d90b80c6b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Sep 23 06:08:51 2011 +0200

    s3:smbd: don't call smbd_terminate_connection in smb2_validate_message_id() (bug #8476)
    
    Only return false and the caller will terminate the connection.
    
    metze
    (cherry picked from commit 02d83d8fd4d21825110fd7da1ccb570a26e66ca6)
    
    Part of a fix for bug #8476 (Samba asserts when SMB2 client breaks the crediting
    rules.)

commit 46ead7f8b1ee69cb61abdc1358ed2c4c411e3fc1
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Sep 22 09:06:48 2011 -0700

    Fix bug #8476 - Samba asserts when SMB2 client breaks the crediting rules.
    
    Just drop the connection, not SMB_ASSERT.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Thu Sep 22 19:41:31 CEST 2011 on sn-devel-104
    (cherry picked from commit d50fa9c21e1c3b6f7126c33e24966099c7567225)

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

Summary of changes:
 source3/smbd/smb2_server.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 41ef607..aa9f22b 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -319,8 +319,14 @@ static bool smb2_validate_message_id(struct smbd_server_connection *sconn,
 		return false;
 	}
 
+	if (sconn->smb2.credits_granted == 0) {
+		DEBUG(0,("smb2_validate_message_id: client used more "
+			 "credits than granted message_id (%llu)\n",
+			 (unsigned long long)message_id));
+		return false;
+	}
+
 	/* client just used a credit. */
-	SMB_ASSERT(sconn->smb2.credits_granted > 0);
 	sconn->smb2.credits_granted -= 1;
 
 	/* Mark the message_id as seen in the bitmap. */


-- 
Samba Shared Repository