diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-09-07 20:35:51 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-09-08 10:21:50 +0200 |
| commit | 3e227d8544a020d1aea24c38c9ca45a75d14c3f1 (patch) | |
| tree | 607d31b7e117519742db8c5ebfd90a67a21781d3 /source3/torture/torture.c | |
| parent | cdca1e0ac3c185856fbe2d061a30bfa8e71e4e1c (diff) | |
| download | samba-3e227d8544a020d1aea24c38c9ca45a75d14c3f1.tar.gz samba-3e227d8544a020d1aea24c38c9ca45a75d14c3f1.tar.bz2 samba-3e227d8544a020d1aea24c38c9ca45a75d14c3f1.zip | |
s3:libsmb: pass CLI_FULL_CONNECTION_* flags via cli_connect_nb()
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Sep 8 10:21:50 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/torture/torture.c')
| -rw-r--r-- | source3/torture/torture.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/source3/torture/torture.c b/source3/torture/torture.c index f07026d17a..495875b27a 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -181,19 +181,28 @@ static struct cli_state *open_nbt_connection(void) { struct cli_state *c; NTSTATUS status; + int flags = 0; + + if (use_oplocks) { + flags |= CLI_FULL_CONNECTION_OPLOCKS; + } + + if (use_level_II_oplocks) { + flags |= CLI_FULL_CONNECTION_LEVEL_II_OPLOCKS; + } + + if (use_kerberos) { + flags |= CLI_FULL_CONNECTION_USE_KERBEROS; + } status = cli_connect_nb(host, NULL, port_to_use, 0x20, myname, - signing_state, &c); + signing_state, flags, &c); if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect with %s. Error %s\n", host, nt_errstr(status) ); return NULL; } - c->use_kerberos = use_kerberos; - cli_set_timeout(c, 120000); /* set a really long timeout (2 minutes) */ - if (use_oplocks) c->use_oplocks = True; - if (use_level_II_oplocks) c->use_level_II_oplocks = True; return c; } @@ -3545,18 +3554,12 @@ static bool run_oplock2(int dummy) return False; } - cli1->use_oplocks = True; - cli1->use_level_II_oplocks = True; - if (!torture_open_connection(&cli2, 1)) { use_level_II_oplocks = False; use_oplocks = saved_use_oplocks; return False; } - cli2->use_oplocks = True; - cli2->use_level_II_oplocks = True; - cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN); cli_sockopt(cli1, sockops); |