svn commit: samba r1936 - branches/SAMBA_3_0/source/smbd

[jra at samba.org]

Author: jra
Date: 2004-08-19 20:03:41 +0000 (Thu, 19 Aug 2004)
New Revision: 1936

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=1936&nolog=1

Log:
Fix bug noticed by Steve - ensure extended security bit is on only
if we negotiated extended security. Do not merge for 3.0.6. Works
with W2K but needs further testing.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/negprot.c
   branches/SAMBA_3_0/source/smbd/process.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/negprot.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/negprot.c	2004-08-19 20:03:22 UTC (rev 1935)
+++ branches/SAMBA_3_0/source/smbd/negprot.c	2004-08-19 20:03:41 UTC (rev 1936)
@@ -249,6 +249,7 @@
 	    (SVAL(inbuf, smb_flg2) & FLAGS2_EXTENDED_SECURITY)) {
 		negotiate_spnego = True;
 		capabilities |= CAP_EXTENDED_SECURITY;
+		add_to_common_flags2(FLAGS2_EXTENDED_SECURITY);
 	}
 	
 	capabilities |= CAP_NT_SMBS|CAP_RPC_REMOTE_APIS|CAP_UNICODE;

Modified: branches/SAMBA_3_0/source/smbd/process.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/process.c	2004-08-19 20:03:22 UTC (rev 1935)
+++ branches/SAMBA_3_0/source/smbd/process.c	2004-08-19 20:03:41 UTC (rev 1936)
@@ -1130,8 +1130,13 @@
  Helper functions for contruct_reply.
 ****************************************************************************/
 
-static uint32 common_flags2 = FLAGS2_LONG_PATH_COMPONENTS|FLAGS2_EXTENDED_SECURITY|FLAGS2_32_BIT_ERROR_CODES;
+static uint32 common_flags2 = FLAGS2_LONG_PATH_COMPONENTS|FLAGS2_32_BIT_ERROR_CODES;
 
+void add_to_common_flags2(uint32 v)
+{
+	common_flags2 |= v;
+}
+
 void remove_from_common_flags2(uint32 v)
 {
 	common_flags2 &= ~v;