summaryrefslogtreecommitdiff
path: root/source3/torture
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-09-13 14:33:31 +0200
committerStefan Metzmacher <metze@samba.org>2011-09-15 10:25:17 +0200
commit3f00cce9b3502c8ec9b3f7fcf5b2024c10550f82 (patch)
treea0ea277fecceb874d1a77b459ccb0a833945b8d9 /source3/torture
parent4f7be46d99b68040c3b42f3a4662fccd777012a3 (diff)
downloadsamba-3f00cce9b3502c8ec9b3f7fcf5b2024c10550f82.tar.gz
samba-3f00cce9b3502c8ec9b3f7fcf5b2024c10550f82.tar.bz2
samba-3f00cce9b3502c8ec9b3f7fcf5b2024c10550f82.zip
s3:libsmb: pass max_protocol to cli_negprot()
metze
Diffstat (limited to 'source3/torture')
-rw-r--r--source3/torture/locktest.c2
-rw-r--r--source3/torture/masktest.c4
-rw-r--r--source3/torture/torture.c6
3 files changed, 5 insertions, 7 deletions
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index da3b9a7cdf..e7d3df2ce7 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -198,7 +198,7 @@ static struct cli_state *connect_one(char *share, int snum)
return NULL;
}
- status = cli_negprot(c);
+ status = cli_negprot(c, PROTOCOL_NT1);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("protocol negotiation failed: %s\n",
nt_errstr(status)));
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 6a4bb6e1d1..eaac0d8edc 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -187,9 +187,7 @@ static struct cli_state *connect_one(char *share)
return NULL;
}
- c->protocol = max_protocol;
-
- status = cli_negprot(c);
+ status = cli_negprot(c, max_protocol);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("protocol negotiation failed: %s\n",
nt_errstr(status)));
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 1de7e79732..3eb6fec294 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -3037,7 +3037,7 @@ static bool run_negprot_nowait(int dummy)
for (i=0;i<50000;i++) {
struct tevent_req *req;
- req = cli_negprot_send(ev, ev, cli);
+ req = cli_negprot_send(ev, ev, cli, PROTOCOL_NT1);
if (req == NULL) {
TALLOC_FREE(ev);
return false;
@@ -6289,7 +6289,7 @@ static bool run_error_map_extract(int dummy) {
}
disable_spnego = false;
- status = cli_negprot(c_nt);
+ status = cli_negprot(c_nt, PROTOCOL_NT1);
if (!NT_STATUS_IS_OK(status)) {
printf("%s rejected the NT-error negprot (%s)\n", host,
@@ -6316,7 +6316,7 @@ static bool run_error_map_extract(int dummy) {
disable_spnego = false;
force_dos_errors = false;
- status = cli_negprot(c_dos);
+ status = cli_negprot(c_dos, PROTOCOL_NT1);
if (!NT_STATUS_IS_OK(status)) {
printf("%s rejected the DOS-error negprot (%s)\n", host,
nt_errstr(status));