summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-07-08 18:32:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:54 -0500
commit2c87cb390d9c46bb1259c4fae95f4a44be97297b (patch)
tree009a11579107b22fbb9a96cdc86fe5d394cea4e7
parent0fa2b94c5629104000afe12e7eb0447ac515613f (diff)
downloadsamba-2c87cb390d9c46bb1259c4fae95f4a44be97297b.tar.gz
samba-2c87cb390d9c46bb1259c4fae95f4a44be97297b.tar.bz2
samba-2c87cb390d9c46bb1259c4fae95f4a44be97297b.zip
r1409: if we have no user name don't use extended security
the capabilities in the union smb_sesssetup should be used to decide if we can use extented security metze (This used to be commit e3760fcc17cc645d942f0fc7f7325976391309ea)
-rw-r--r--source4/libcli/raw/clisession.c2
-rw-r--r--source4/libcli/raw/clitree.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/libcli/raw/clisession.c b/source4/libcli/raw/clisession.c
index dd13657549..d420aa7cd6 100644
--- a/source4/libcli/raw/clisession.c
+++ b/source4/libcli/raw/clisession.c
@@ -497,7 +497,7 @@ static NTSTATUS smb_raw_session_setup_generic(struct cli_session *session,
}
/* see if we should use the NT1 interface */
- if (!(session->transport->negotiate.capabilities & CAP_EXTENDED_SECURITY)) {
+ if (!(parms->generic.in.capabilities & CAP_EXTENDED_SECURITY)) {
return smb_raw_session_setup_generic_nt1(session, mem_ctx, parms);
}
diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index 3b16c4c336..f1513ea51c 100644
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -240,6 +240,7 @@ NTSTATUS cli_tree_full_connection(struct cli_tree **ret_tree,
setup.generic.in.password = NULL;
setup.generic.in.user = "";
setup.generic.in.domain = "";
+ setup.generic.in.capabilities &= ~CAP_EXTENDED_SECURITY;
} else {
setup.generic.in.password = password;
setup.generic.in.user = user;