summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-08-19 20:03:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:24 -0500
commit6219c997cbe49952213460f1e100004d32469132 (patch)
treed92758f434a98fa86a6d045daf4292c1544489c0 /source3/smbd
parentdf5b09fe768defb90205e458030d1a9aab746179 (diff)
downloadsamba-6219c997cbe49952213460f1e100004d32469132.tar.gz
samba-6219c997cbe49952213460f1e100004d32469132.tar.bz2
samba-6219c997cbe49952213460f1e100004d32469132.zip
r1936: 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. (This used to be commit 284689aa18d2711a9041598cdf490359466f7f77)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/negprot.c1
-rw-r--r--source3/smbd/process.c7
2 files changed, 7 insertions, 1 deletions
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 5ff53f6300..5ee8abbe6b 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -249,6 +249,7 @@ static int reply_nt1(char *inbuf, char *outbuf)
(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;
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 60ce1499e8..5be68d9f0a 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1130,7 +1130,12 @@ const char *smb_fn_name(int type)
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)
{