summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-09-08 09:56:16 +0200
committerStefan Metzmacher <metze@samba.org>2011-09-08 19:23:32 +0200
commitfe11e9b2c6cd244dbd219de12fe83634ccd82705 (patch)
treebfb5a465948be3beb808c6c90cc01eb0983ee334
parent173e323cd9623d1da8db921a3b64f23c21314c54 (diff)
downloadsamba-fe11e9b2c6cd244dbd219de12fe83634ccd82705.tar.gz
samba-fe11e9b2c6cd244dbd219de12fe83634ccd82705.tar.bz2
samba-fe11e9b2c6cd244dbd219de12fe83634ccd82705.zip
s3:torture: make use of CLI_FULL_CONNECTION_DONT_SPNEGO
metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Thu Sep 8 19:23:32 CEST 2011 on sn-devel-104
-rw-r--r--source3/torture/torture.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 49f26a37a3..886c58eafa 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -56,6 +56,7 @@ static fstring randomfname;
static bool use_oplocks;
static bool use_level_II_oplocks;
static const char *client_txt = "client_oplocks.txt";
+static bool disable_spnego;
static bool use_kerberos;
static bool force_dos_errors;
static fstring multishare_conn_fname;
@@ -184,6 +185,10 @@ static struct cli_state *open_nbt_connection(void)
NTSTATUS status;
int flags = 0;
+ if (disable_spnego) {
+ flags |= CLI_FULL_CONNECTION_DONT_SPNEGO;
+ }
+
if (use_oplocks) {
flags |= CLI_FULL_CONNECTION_OPLOCKS;
}
@@ -6292,11 +6297,12 @@ static bool run_error_map_extract(int dummy) {
/* NT-Error connection */
+ disable_spnego = true;
if (!(c_nt = open_nbt_connection())) {
+ disable_spnego = false;
return False;
}
-
- c_nt->use_spnego = False;
+ disable_spnego = false;
status = cli_negprot(c_nt);
@@ -6315,15 +6321,16 @@ static bool run_error_map_extract(int dummy) {
/* DOS-Error connection */
+ disable_spnego = true;
force_dos_errors = true;
if (!(c_dos = open_nbt_connection())) {
+ disable_spnego = false;
force_dos_errors = false;
return False;
}
+ disable_spnego = false;
force_dos_errors = false;
- c_dos->use_spnego = False;
-
status = cli_negprot(c_dos);
if (!NT_STATUS_IS_OK(status)) {
printf("%s rejected the DOS-error negprot (%s)\n", host,