[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  258ffdd libcli/smb: s/FLAGS2_UNKNOWN_BIT4/FLAGS2_SMB_SECURITY_SIGNATURES_REQUIRED
      from  47130f9 s4-s3-upgrade Do not use python 2.6 style exceptions

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


- Log -----------------------------------------------------------------
commit 258ffddf1cc1ac6b1ff5a07585940ca552170807
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Sep 9 22:43:28 2011 +0200

    libcli/smb: s/FLAGS2_UNKNOWN_BIT4/FLAGS2_SMB_SECURITY_SIGNATURES_REQUIRED
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Sat Sep 10 00:34:50 CEST 2011 on sn-devel-104

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

Summary of changes:
 libcli/smb/smb_constants.h |    2 +-
 source3/smbd/negprot.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h
index 11b1394..c5d07ae 100644
--- a/libcli/smb/smb_constants.h
+++ b/libcli/smb/smb_constants.h
@@ -49,7 +49,7 @@ enum protocol_types {
 #define FLAGS2_LONG_PATH_COMPONENTS    0x0001
 #define FLAGS2_EXTENDED_ATTRIBUTES     0x0002
 #define FLAGS2_SMB_SECURITY_SIGNATURES 0x0004
-#define FLAGS2_UNKNOWN_BIT4            0x0010
+#define FLAGS2_SMB_SECURITY_SIGNATURES_REQUIRED 0x0010
 #define FLAGS2_IS_LONG_NAME            0x0040
 #define FLAGS2_EXTENDED_SECURITY       0x0800
 #define FLAGS2_DFS_PATHNAMES           0x1000
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index a38534f..71e0291 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -315,7 +315,7 @@ static void reply_nt1(struct smb_request *req, uint16 choice)
 	   distinguish from NT which doesn't set it either. */
 
 	if ( (req->flags2 & FLAGS2_EXTENDED_SECURITY) &&
-		((req->flags2 & FLAGS2_UNKNOWN_BIT4) == 0) )
+		((req->flags2 & FLAGS2_SMB_SECURITY_SIGNATURES_REQUIRED) == 0) )
 	{
 		if (get_remote_arch() != RA_SAMBA) {
 			set_remote_arch( RA_VISTA );


-- 
Samba Shared Repository