diff options
| author | Luk Claes <luk@debian.org> | 2012-05-20 17:54:29 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-05-28 14:49:49 +0200 |
| commit | 764b5e56108362a53acf8f435203dd1e56ecd2ce (patch) | |
| tree | 2433fbabf58b5351da003c163e1c9a85d054f4d9 /source3/torture | |
| parent | 82895ab22fb19fabe43ec29365dbe33da0b917f2 (diff) | |
| download | samba-764b5e56108362a53acf8f435203dd1e56ecd2ce.tar.gz samba-764b5e56108362a53acf8f435203dd1e56ecd2ce.tar.bz2 samba-764b5e56108362a53acf8f435203dd1e56ecd2ce.zip | |
s3:libsmb: get rid of cli_negprot
Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/torture')
| -rw-r--r-- | source3/torture/locktest.c | 4 | ||||
| -rw-r--r-- | source3/torture/masktest.c | 3 | ||||
| -rw-r--r-- | source3/torture/torture.c | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c index 288ce8fe54..04928f20ac 100644 --- a/source3/torture/locktest.c +++ b/source3/torture/locktest.c @@ -22,6 +22,7 @@ #include "system/filesys.h" #include "locking/proto.h" #include "libsmb/nmblib.h" +#include "../libcli/smb/smbXcli_base.h" static fstring password[2]; static fstring username[2]; @@ -198,7 +199,8 @@ static struct cli_state *connect_one(char *share, int snum) return NULL; } - status = cli_negprot(c, PROTOCOL_NT1); + status = smbXcli_negprot(c->conn, c->timeout, PROTOCOL_CORE, + 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 6669949635..74f33a5cdd 100644 --- a/source3/torture/masktest.c +++ b/source3/torture/masktest.c @@ -188,7 +188,8 @@ static struct cli_state *connect_one(char *share) return NULL; } - status = cli_negprot(c, max_protocol); + status = smbXcli_negprot(c->conn, c->timeout, PROTOCOL_CORE, + 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 b49a7a73e2..1f463f6672 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -3053,7 +3053,8 @@ static bool run_negprot_nowait(int dummy) for (i=0;i<50000;i++) { struct tevent_req *req; - req = cli_negprot_send(ev, ev, cli, PROTOCOL_NT1); + req = smbXcli_negprot_send(ev, ev, cli->conn, cli->timeout, + PROTOCOL_CORE, PROTOCOL_NT1); if (req == NULL) { TALLOC_FREE(ev); return false; @@ -6307,7 +6308,8 @@ static bool run_error_map_extract(int dummy) { } disable_spnego = false; - status = cli_negprot(c_nt, PROTOCOL_NT1); + status = smbXcli_negprot(c_nt->conn, c_nt->timeout, PROTOCOL_CORE, + PROTOCOL_NT1); if (!NT_STATUS_IS_OK(status)) { printf("%s rejected the NT-error negprot (%s)\n", host, @@ -6334,7 +6336,8 @@ static bool run_error_map_extract(int dummy) { disable_spnego = false; force_dos_errors = false; - status = cli_negprot(c_dos, PROTOCOL_NT1); + status = smbXcli_negprot(c_dos->conn, c_dos->timeout, PROTOCOL_CORE, + PROTOCOL_NT1); if (!NT_STATUS_IS_OK(status)) { printf("%s rejected the DOS-error negprot (%s)\n", host, nt_errstr(status)); |