X-Git-Url: http://git.samba.org/samba.git/?p=bbaumbach%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=source4%2Ftorture%2Ftorture.c;h=6b92bce691caa9fce705d539add2859f12c90152;hp=aadc07781a19002113c10c977abc08c4eba3b3cc;hb=75ddf59ea110117578acd3a7b889549bfb40473c;hpb=98d291423ff581786a369ce373c861f94c654aa0 diff --git a/source4/torture/torture.c b/source4/torture/torture.c index aadc07781a1..6b92bce691c 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -19,87 +19,77 @@ */ #include "includes.h" +#include "dynconfig.h" +#include "clilist.h" +#include "lib/cmdline/popt_common.h" +#include "libcli/raw/libcliraw.h" +#include "system/time.h" +#include "system/wait.h" +#include "system/filesys.h" +#include "ioctl.h" +#include "librpc/gen_ndr/ndr_security.h" int torture_nprocs=4; int torture_numops=100; int torture_entries=1000; int torture_failures=1; +int torture_seed=0; static int procnum; /* records process count number when forking */ -static struct cli_state *current_cli; +static struct smbcli_state *current_cli; static BOOL use_oplocks; static BOOL use_level_II_oplocks; -static BOOL use_kerberos; BOOL torture_showall = False; #define CHECK_MAX_FAILURES(label) do { if (++failures >= torture_failures) goto label; } while (0) -static struct cli_state *open_nbt_connection(void) +static struct smbcli_state *open_nbt_connection(void) { - struct nmb_name called, calling; - struct in_addr ip; - struct cli_state *cli; - char *host = lp_parm_string(-1, "torture", "host"); + struct nbt_name called, calling; + struct smbcli_state *cli; + const char *host = lp_parm_string(-1, "torture", "host"); - make_nmb_name(&calling, lp_netbios_name(), 0x0); - make_nmb_name(&called , host, 0x20); + calling.name = lp_netbios_name(); + calling.type = NBT_NAME_CLIENT; + calling.scope = NULL; - zero_ip(&ip); + nbt_choose_called_name(NULL, &called, host, NBT_NAME_SERVER); - cli = cli_state_init(); + cli = smbcli_state_init(NULL); if (!cli) { - printf("Failed initialize cli_struct to connect with %s\n", host); + printf("Failed initialize smbcli_struct to connect with %s\n", host); return NULL; } - if (!cli_socket_connect(cli, host, &ip)) { + if (!smbcli_socket_connect(cli, host)) { printf("Failed to connect with %s\n", host); return cli; } - cli->transport->socket->timeout = 120000; /* set a really long timeout (2 minutes) */ - - if (!cli_transport_establish(cli, &calling, &called)) { - /* - * Well, that failed, try *SMBSERVER ... - * However, we must reconnect as well ... - */ - if (!cli_socket_connect(cli, host, &ip)) { - printf("Failed to connect with %s\n", host); - return False; - } - - make_nmb_name(&called, "*SMBSERVER", 0x20); - if (!cli_transport_establish(cli, &calling, &called)) { - printf("%s rejected the session\n",host); - printf("We tried with a called name of %s & %s\n", - host, "*SMBSERVER"); - cli_shutdown(cli); - return NULL; - } + if (!smbcli_transport_establish(cli, &calling, &called)) { + printf("%s rejected the session\n",host); + smbcli_shutdown(cli); + return NULL; } return cli; } -BOOL torture_open_connection_share(struct cli_state **c, +BOOL torture_open_connection_share(struct smbcli_state **c, const char *hostname, const char *sharename) { - BOOL retry; - int flags = 0; NTSTATUS status; - char *username = lp_parm_string(-1, "torture", "username"); - char *password = lp_parm_string(-1, "torture", "password"); - - if (use_kerberos) - flags |= CLI_FULL_CONNECTION_USE_KERBEROS; - - status = cli_full_connection(c, lp_netbios_name(), - hostname, NULL, - sharename, "?????", - username, username[0]?lp_workgroup():"", - password, flags, &retry); + const char *username = lp_parm_string(-1, "torture", "username"); + const char *userdomain = lp_parm_string(-1, "torture", "userdomain"); + const char *password = lp_parm_string(-1, "torture", "password"); + + status = smbcli_full_connection(NULL, + c, lp_netbios_name(), + hostname, + sharename, NULL, + username, username[0]?userdomain:"", + password); if (!NT_STATUS_IS_OK(status)) { printf("Failed to open connection - %s\n", nt_errstr(status)); return False; @@ -107,45 +97,50 @@ BOOL torture_open_connection_share(struct cli_state **c, (*c)->transport->options.use_oplocks = use_oplocks; (*c)->transport->options.use_level2_oplocks = use_level_II_oplocks; - (*c)->transport->socket->timeout = 120000; return True; } -BOOL torture_open_connection(struct cli_state **c) +BOOL torture_open_connection(struct smbcli_state **c) { - char *host = lp_parm_string(-1, "torture", "host"); - char *share = lp_parm_string(-1, "torture", "share"); + const char *host = lp_parm_string(-1, "torture", "host"); + const char *share = lp_parm_string(-1, "torture", "share"); return torture_open_connection_share(c, host, share); } -BOOL torture_close_connection(struct cli_state *c) +BOOL torture_close_connection(struct smbcli_state *c) { BOOL ret = True; - DEBUG(9,("torture_close_connection: cli_state@%p\n", c)); if (!c) return True; - if (NT_STATUS_IS_ERR(cli_tdis(c))) { - printf("tdis failed (%s)\n", cli_errstr(c->tree)); + if (NT_STATUS_IS_ERR(smbcli_tdis(c))) { + printf("tdis failed (%s)\n", smbcli_errstr(c->tree)); ret = False; } - DEBUG(9,("torture_close_connection: call cli_shutdown\n")); - cli_shutdown(c); - DEBUG(9,("torture_close_connection: exit\n")); + smbcli_shutdown(c); return ret; } +/* initialise a DCOM context */ +NTSTATUS torture_dcom_init(struct dcom_context **ctx) +{ + dcom_init(ctx, lp_parm_string(-1, "torture", "userdomain"), + lp_parm_string(-1, "torture", "username"), + lp_parm_string(-1, "torture", "password")); + + return NT_STATUS_OK; +} -/* open a rpc connection to a named pipe */ +/* open a rpc connection to the chosen binding string */ NTSTATUS torture_rpc_connection(struct dcerpc_pipe **p, const char *pipe_name, const char *pipe_uuid, uint32_t pipe_version) { NTSTATUS status; - char *binding = lp_parm_string(-1, "torture", "binding"); + const char *binding = lp_parm_string(-1, "torture", "binding"); if (!binding) { printf("You must specify a ncacn binding string\n"); @@ -153,13 +148,47 @@ NTSTATUS torture_rpc_connection(struct dcerpc_pipe **p, } status = dcerpc_pipe_connect(p, binding, pipe_uuid, pipe_version, - lp_workgroup(), + lp_parm_string(-1, "torture", "userdomain"), lp_parm_string(-1, "torture", "username"), lp_parm_string(-1, "torture", "password")); return status; } +/* open a rpc connection to a specific transport */ +NTSTATUS torture_rpc_connection_transport(struct dcerpc_pipe **p, + const char *pipe_name, + const char *pipe_uuid, + uint32_t pipe_version, + enum dcerpc_transport_t transport) +{ + NTSTATUS status; + const char *binding = lp_parm_string(-1, "torture", "binding"); + struct dcerpc_binding b; + TALLOC_CTX *mem_ctx = talloc_init("torture_rpc_connection_smb"); + + if (!binding) { + printf("You must specify a ncacn binding string\n"); + return NT_STATUS_INVALID_PARAMETER; + } + + status = dcerpc_parse_binding(mem_ctx, binding, &b); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0,("Failed to parse dcerpc binding '%s'\n", binding)); + talloc_free(mem_ctx); + return status; + } + + b.transport = transport; + + status = dcerpc_pipe_connect_b(p, &b, pipe_uuid, pipe_version, + lp_parm_string(-1, "torture", "userdomain"), + lp_parm_string(-1, "torture", "username"), + lp_parm_string(-1, "torture", "password")); + + return status; +} + /* close a rpc connection to a named pipe */ NTSTATUS torture_rpc_close(struct dcerpc_pipe *p) { @@ -169,22 +198,22 @@ NTSTATUS torture_rpc_close(struct dcerpc_pipe *p) /* check if the server produced the expected error code */ -static BOOL check_error(int line, struct cli_state *c, - uint8_t eclass, uint32_t ecode, NTSTATUS nterr) +BOOL check_error(const char *location, struct smbcli_state *c, + uint8_t eclass, uint32_t ecode, NTSTATUS nterr) { - if (cli_is_dos_error(c->tree)) { + if (smbcli_is_dos_error(c->tree)) { uint8_t class; uint32_t num; /* Check DOS error */ - cli_dos_error(c, &class, &num); + smbcli_dos_error(c, &class, &num); if (eclass != class || ecode != num) { printf("unexpected error code class=%d code=%d\n", (int)class, (int)num); - printf(" expected %d/%d %s (line=%d)\n", - (int)eclass, (int)ecode, nt_errstr(nterr), line); + printf(" expected %d/%d %s (at %s)\n", + (int)eclass, (int)ecode, nt_errstr(nterr), location); return False; } @@ -193,11 +222,11 @@ static BOOL check_error(int line, struct cli_state *c, /* Check NT error */ - status = cli_nt_error(c->tree); + status = smbcli_nt_error(c->tree); if (NT_STATUS_V(nterr) != NT_STATUS_V(status)) { printf("unexpected error code %s\n", nt_errstr(status)); - printf(" expected %s (line=%d)\n", nt_errstr(nterr), line); + printf(" expected %s (at %s)\n", nt_errstr(nterr), location); return False; } } @@ -206,16 +235,16 @@ static BOOL check_error(int line, struct cli_state *c, } -static BOOL wait_lock(struct cli_state *c, int fnum, uint32_t offset, uint32_t len) +static BOOL wait_lock(struct smbcli_state *c, int fnum, uint32_t offset, uint32_t len) { - while (NT_STATUS_IS_ERR(cli_lock(c->tree, fnum, offset, len, -1, WRITE_LOCK))) { - if (!check_error(__LINE__, c, ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED)) return False; + while (NT_STATUS_IS_ERR(smbcli_lock(c->tree, fnum, offset, len, -1, WRITE_LOCK))) { + if (!check_error(__location__, c, ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED)) return False; } return True; } -static BOOL rw_torture(struct cli_state *c) +static BOOL rw_torture(struct smbcli_state *c) { const char *lockfname = "\\torture.lck"; char *fname; @@ -223,21 +252,21 @@ static BOOL rw_torture(struct cli_state *c) int fnum2; pid_t pid2, pid = getpid(); int i, j; - char buf[1024]; + uint8_t buf[1024]; BOOL correct = True; - fnum2 = cli_open(c->tree, lockfname, O_RDWR | O_CREAT | O_EXCL, + fnum2 = smbcli_open(c->tree, lockfname, O_RDWR | O_CREAT | O_EXCL, DENY_NONE); if (fnum2 == -1) - fnum2 = cli_open(c->tree, lockfname, O_RDWR, DENY_NONE); + fnum2 = smbcli_open(c->tree, lockfname, O_RDWR, DENY_NONE); if (fnum2 == -1) { - printf("open of %s failed (%s)\n", lockfname, cli_errstr(c->tree)); + printf("open of %s failed (%s)\n", lockfname, smbcli_errstr(c->tree)); return False; } for (i=0;itree, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_ALL); + fnum = smbcli_open(c->tree, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_ALL); if (fnum == -1) { - printf("open failed (%s)\n", cli_errstr(c->tree)); + printf("open failed (%s)\n", smbcli_errstr(c->tree)); correct = False; break; } - if (cli_write(c->tree, fnum, 0, (char *)&pid, 0, sizeof(pid)) != sizeof(pid)) { - printf("write failed (%s)\n", cli_errstr(c->tree)); + if (smbcli_write(c->tree, fnum, 0, &pid, 0, sizeof(pid)) != sizeof(pid)) { + printf("write failed (%s)\n", smbcli_errstr(c->tree)); correct = False; } for (j=0;j<50;j++) { - if (cli_write(c->tree, fnum, 0, (char *)buf, + if (smbcli_write(c->tree, fnum, 0, buf, sizeof(pid)+(j*sizeof(buf)), sizeof(buf)) != sizeof(buf)) { - printf("write failed (%s)\n", cli_errstr(c->tree)); + printf("write failed (%s)\n", smbcli_errstr(c->tree)); correct = False; } } pid2 = 0; - if (cli_read(c->tree, fnum, (char *)&pid2, 0, sizeof(pid)) != sizeof(pid)) { - printf("read failed (%s)\n", cli_errstr(c->tree)); + if (smbcli_read(c->tree, fnum, &pid2, 0, sizeof(pid)) != sizeof(pid)) { + printf("read failed (%s)\n", smbcli_errstr(c->tree)); correct = False; } @@ -280,32 +309,32 @@ static BOOL rw_torture(struct cli_state *c) correct = False; } - if (NT_STATUS_IS_ERR(cli_close(c->tree, fnum))) { - printf("close failed (%s)\n", cli_errstr(c->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(c->tree, fnum))) { + printf("close failed (%s)\n", smbcli_errstr(c->tree)); correct = False; } - if (NT_STATUS_IS_ERR(cli_unlink(c->tree, fname))) { - printf("unlink failed (%s)\n", cli_errstr(c->tree)); + if (NT_STATUS_IS_ERR(smbcli_unlink(c->tree, fname))) { + printf("unlink failed (%s)\n", smbcli_errstr(c->tree)); correct = False; } - if (NT_STATUS_IS_ERR(cli_unlock(c->tree, fnum2, n*sizeof(int), sizeof(int)))) { - printf("unlock failed (%s)\n", cli_errstr(c->tree)); + if (NT_STATUS_IS_ERR(smbcli_unlock(c->tree, fnum2, n*sizeof(int), sizeof(int)))) { + printf("unlock failed (%s)\n", smbcli_errstr(c->tree)); correct = False; } free(fname); } - cli_close(c->tree, fnum2); - cli_unlink(c->tree, lockfname); + smbcli_close(c->tree, fnum2); + smbcli_unlink(c->tree, lockfname); printf("%d\n", i); return correct; } -static BOOL run_torture(struct cli_state *cli, int dummy) +static BOOL run_torture(struct smbcli_state *cli, int dummy) { BOOL ret; @@ -318,30 +347,29 @@ static BOOL run_torture(struct cli_state *cli, int dummy) return ret; } -static BOOL rw_torture3(struct cli_state *c, const char *lockfname) +static BOOL rw_torture3(struct smbcli_state *c, const char *lockfname) { int fnum = -1; uint_t i = 0; - char buf[131072]; - char buf_rd[131072]; - unsigned count; - unsigned countprev = 0; + uint8_t buf[131072]; + uint8_t buf_rd[131072]; + uint_t count; + uint_t countprev = 0; ssize_t sent = 0; BOOL correct = True; - srandom(1); for (i = 0; i < sizeof(buf); i += sizeof(uint32_t)) { - SIVAL(buf, i, sys_random()); + SIVAL(buf, i, random()); } if (procnum == 0) { - fnum = cli_open(c->tree, lockfname, O_RDWR | O_CREAT | O_EXCL, + fnum = smbcli_open(c->tree, lockfname, O_RDWR | O_CREAT | O_EXCL, DENY_NONE); if (fnum == -1) { printf("first open read/write of %s failed (%s)\n", - lockfname, cli_errstr(c->tree)); + lockfname, smbcli_errstr(c->tree)); return False; } } @@ -349,13 +377,13 @@ static BOOL rw_torture3(struct cli_state *c, const char *lockfname) { for (i = 0; i < 500 && fnum == -1; i++) { - fnum = cli_open(c->tree, lockfname, O_RDONLY, + fnum = smbcli_open(c->tree, lockfname, O_RDONLY, DENY_NONE); msleep(10); } if (fnum == -1) { printf("second open read-only of %s failed (%s)\n", - lockfname, cli_errstr(c->tree)); + lockfname, smbcli_errstr(c->tree)); return False; } } @@ -372,26 +400,26 @@ static BOOL rw_torture3(struct cli_state *c, const char *lockfname) if (procnum == 0) { - sent = ((unsigned)sys_random()%(20))+ 1; + sent = ((uint_t)random()%(20))+ 1; if (sent > sizeof(buf) - count) { sent = sizeof(buf) - count; } - if (cli_write(c->tree, fnum, 0, buf+count, count, (size_t)sent) != sent) { - printf("write failed (%s)\n", cli_errstr(c->tree)); + if (smbcli_write(c->tree, fnum, 0, buf+count, count, (size_t)sent) != sent) { + printf("write failed (%s)\n", smbcli_errstr(c->tree)); correct = False; } } else { - sent = cli_read(c->tree, fnum, buf_rd+count, count, + sent = smbcli_read(c->tree, fnum, buf_rd+count, count, sizeof(buf)-count); if (sent < 0) { printf("read failed offset:%d size:%d (%s)\n", count, sizeof(buf)-count, - cli_errstr(c->tree)); + smbcli_errstr(c->tree)); correct = False; sent = 0; } @@ -410,15 +438,15 @@ static BOOL rw_torture3(struct cli_state *c, const char *lockfname) } - if (NT_STATUS_IS_ERR(cli_close(c->tree, fnum))) { - printf("close failed (%s)\n", cli_errstr(c->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(c->tree, fnum))) { + printf("close failed (%s)\n", smbcli_errstr(c->tree)); correct = False; } return correct; } -static BOOL rw_torture2(struct cli_state *c1, struct cli_state *c2) +static BOOL rw_torture2(struct smbcli_state *c1, struct smbcli_state *c2) { const char *lockfname = "\\torture2.lck"; int fnum1; @@ -429,23 +457,23 @@ static BOOL rw_torture2(struct cli_state *c1, struct cli_state *c2) BOOL correct = True; ssize_t bytes_read, bytes_written; - if (cli_deltree(c1->tree, lockfname) == -1) { - printf("unlink failed (%s)\n", cli_errstr(c1->tree)); + if (smbcli_deltree(c1->tree, lockfname) == -1) { + printf("unlink failed (%s)\n", smbcli_errstr(c1->tree)); } - fnum1 = cli_open(c1->tree, lockfname, O_RDWR | O_CREAT | O_EXCL, + fnum1 = smbcli_open(c1->tree, lockfname, O_RDWR | O_CREAT | O_EXCL, DENY_NONE); if (fnum1 == -1) { printf("first open read/write of %s failed (%s)\n", - lockfname, cli_errstr(c1->tree)); + lockfname, smbcli_errstr(c1->tree)); return False; } - fnum2 = cli_open(c2->tree, lockfname, O_RDONLY, + fnum2 = smbcli_open(c2->tree, lockfname, O_RDONLY, DENY_NONE); if (fnum2 == -1) { printf("second open read-only of %s failed (%s)\n", - lockfname, cli_errstr(c2->tree)); - cli_close(c1->tree, fnum1); + lockfname, smbcli_errstr(c2->tree)); + smbcli_close(c1->tree, fnum1); return False; } @@ -453,22 +481,22 @@ static BOOL rw_torture2(struct cli_state *c1, struct cli_state *c2) for (i=0;itree, fnum1, 0, buf, 0, buf_size)) != buf_size) { - printf("write failed (%s)\n", cli_errstr(c1->tree)); + if ((bytes_written = smbcli_write(c1->tree, fnum1, 0, buf, 0, buf_size)) != buf_size) { + printf("write failed (%s)\n", smbcli_errstr(c1->tree)); printf("wrote %d, expected %d\n", bytes_written, buf_size); correct = False; break; } - if ((bytes_read = cli_read(c2->tree, fnum2, buf_rd, 0, buf_size)) != buf_size) { - printf("read failed (%s)\n", cli_errstr(c2->tree)); + if ((bytes_read = smbcli_read(c2->tree, fnum2, buf_rd, 0, buf_size)) != buf_size) { + printf("read failed (%s)\n", smbcli_errstr(c2->tree)); printf("read %d, expected %d\n", bytes_read, buf_size); correct = False; break; @@ -482,26 +510,28 @@ static BOOL rw_torture2(struct cli_state *c1, struct cli_state *c2) } } - if (NT_STATUS_IS_ERR(cli_close(c2->tree, fnum2))) { - printf("close failed (%s)\n", cli_errstr(c2->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(c2->tree, fnum2))) { + printf("close failed (%s)\n", smbcli_errstr(c2->tree)); correct = False; } - if (NT_STATUS_IS_ERR(cli_close(c1->tree, fnum1))) { - printf("close failed (%s)\n", cli_errstr(c1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(c1->tree, fnum1))) { + printf("close failed (%s)\n", smbcli_errstr(c1->tree)); correct = False; } - if (NT_STATUS_IS_ERR(cli_unlink(c1->tree, lockfname))) { - printf("unlink failed (%s)\n", cli_errstr(c1->tree)); + if (NT_STATUS_IS_ERR(smbcli_unlink(c1->tree, lockfname))) { + printf("unlink failed (%s)\n", smbcli_errstr(c1->tree)); correct = False; } return correct; } -static BOOL run_readwritetest(int dummy) +#define BOOLSTR(b) ((b) ? "Yes" : "No") + +static BOOL run_readwritetest(void) { - struct cli_state *cli1, *cli2; + struct smbcli_state *cli1, *cli2; BOOL test1, test2 = True; if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) { @@ -529,7 +559,7 @@ static BOOL run_readwritetest(int dummy) return (test1 && test2); } -static BOOL run_readwritemulti(struct cli_state *cli, int dummy) +static BOOL run_readwritemulti(struct smbcli_state *cli, int dummy) { BOOL test; @@ -543,136 +573,23 @@ static BOOL run_readwritemulti(struct cli_state *cli, int dummy) } -/* - This test checks for two things: - - 1) correct support for retaining locks over a close (ie. the server - must not use posix semantics) - 2) support for lock timeouts - */ -static BOOL run_locktest1(int dummy) -{ - struct cli_state *cli1, *cli2; - const char *fname = "\\lockt1.lck"; - int fnum1, fnum2, fnum3; - time_t t1, t2; - unsigned lock_timeout; - - if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) { - return False; - } - - printf("starting locktest1\n"); - - cli_unlink(cli1->tree, fname); - - fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - if (fnum1 == -1) { - printf("open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - return False; - } - fnum2 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE); - if (fnum2 == -1) { - printf("open2 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - return False; - } - fnum3 = cli_open(cli2->tree, fname, O_RDWR, DENY_NONE); - if (fnum3 == -1) { - printf("open3 of %s failed (%s)\n", fname, cli_errstr(cli2->tree)); - return False; - } - - if (NT_STATUS_IS_ERR(cli_lock(cli1->tree, fnum1, 0, 4, 0, WRITE_LOCK))) { - printf("lock1 failed (%s)\n", cli_errstr(cli1->tree)); - return False; - } - - - if (NT_STATUS_IS_OK(cli_lock(cli2->tree, fnum3, 0, 4, 0, WRITE_LOCK))) { - printf("lock2 succeeded! This is a locking bug\n"); - return False; - } else { - if (!check_error(__LINE__, cli2, ERRDOS, ERRlock, - NT_STATUS_LOCK_NOT_GRANTED)) return False; - } - - - lock_timeout = (6 + (random() % 20)); - printf("Testing lock timeout with timeout=%u\n", lock_timeout); - t1 = time(NULL); - if (NT_STATUS_IS_OK(cli_lock(cli2->tree, fnum3, 0, 4, lock_timeout * 1000, WRITE_LOCK))) { - printf("lock3 succeeded! This is a locking bug\n"); - return False; - } else { - if (!check_error(__LINE__, cli2, ERRDOS, ERRlock, - NT_STATUS_FILE_LOCK_CONFLICT)) return False; - } - t2 = time(NULL); - - if (t2 - t1 < 5) { - printf("error: This server appears not to support timed lock requests\n"); - } - printf("server slept for %u seconds for a %u second timeout\n", - (uint_t)(t2-t1), lock_timeout); - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum2))) { - printf("close1 failed (%s)\n", cli_errstr(cli1->tree)); - return False; - } - - if (NT_STATUS_IS_OK(cli_lock(cli2->tree, fnum3, 0, 4, 0, WRITE_LOCK))) { - printf("lock4 succeeded! This is a locking bug\n"); - return False; - } else { - if (!check_error(__LINE__, cli2, ERRDOS, ERRlock, - NT_STATUS_FILE_LOCK_CONFLICT)) return False; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("close2 failed (%s)\n", cli_errstr(cli1->tree)); - return False; - } - - if (NT_STATUS_IS_ERR(cli_close(cli2->tree, fnum3))) { - printf("close3 failed (%s)\n", cli_errstr(cli2->tree)); - return False; - } - - if (NT_STATUS_IS_ERR(cli_unlink(cli1->tree, fname))) { - printf("unlink failed (%s)\n", cli_errstr(cli1->tree)); - return False; - } - - - if (!torture_close_connection(cli1)) { - return False; - } - - if (!torture_close_connection(cli2)) { - return False; - } - - printf("Passed locktest1\n"); - return True; -} - /* this checks to see if a secondary tconx can use open files from an earlier tconx */ -static BOOL run_tcon_test(int dummy) +static BOOL run_tcon_test(void) { - struct cli_state *cli; + struct smbcli_state *cli; const char *fname = "\\tcontest.tmp"; int fnum1; uint16_t cnum1, cnum2, cnum3; uint16_t vuid1, vuid2; - char buf[4]; + uint8_t buf[4]; BOOL ret = True; - struct cli_tree *tree1; - char *host = lp_parm_string(-1, "torture", "host"); - char *share = lp_parm_string(-1, "torture", "share"); - char *password = lp_parm_string(-1, "torture", "password"); + struct smbcli_tree *tree1; + const char *host = lp_parm_string(-1, "torture", "host"); + const char *share = lp_parm_string(-1, "torture", "share"); + const char *password = lp_parm_string(-1, "torture", "password"); if (!torture_open_connection(&cli)) { return False; @@ -680,13 +597,13 @@ static BOOL run_tcon_test(int dummy) printf("starting tcontest\n"); - if (cli_deltree(cli->tree, fname) == -1) { - printf("unlink of %s failed (%s)\n", fname, cli_errstr(cli->tree)); + if (smbcli_deltree(cli->tree, fname) == -1) { + printf("unlink of %s failed (%s)\n", fname, smbcli_errstr(cli->tree)); } - fnum1 = cli_open(cli->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); + fnum1 = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); if (fnum1 == -1) { - printf("open of %s failed (%s)\n", fname, cli_errstr(cli->tree)); + printf("open of %s failed (%s)\n", fname, smbcli_errstr(cli->tree)); return False; } @@ -694,16 +611,16 @@ static BOOL run_tcon_test(int dummy) vuid1 = cli->session->vuid; memset(&buf, 0, 4); /* init buf so valgrind won't complain */ - if (cli_write(cli->tree, fnum1, 0, buf, 130, 4) != 4) { - printf("initial write failed (%s)\n", cli_errstr(cli->tree)); + if (smbcli_write(cli->tree, fnum1, 0, buf, 130, 4) != 4) { + printf("initial write failed (%s)\n", smbcli_errstr(cli->tree)); return False; } tree1 = cli->tree; /* save old tree connection */ - if (NT_STATUS_IS_ERR(cli_send_tconX(cli, share, "?????", password))) { + if (NT_STATUS_IS_ERR(smbcli_send_tconX(cli, share, "?????", password))) { printf("%s refused 2nd tree connect (%s)\n", host, - cli_errstr(cli->tree)); - cli_shutdown(cli); + smbcli_errstr(cli->tree)); + smbcli_shutdown(cli); return False; } @@ -714,47 +631,47 @@ static BOOL run_tcon_test(int dummy) /* try a write with the wrong tid */ cli->tree->tid = cnum2; - if (cli_write(cli->tree, fnum1, 0, buf, 130, 4) == 4) { + if (smbcli_write(cli->tree, fnum1, 0, buf, 130, 4) == 4) { printf("* server allows write with wrong TID\n"); ret = False; } else { - printf("server fails write with wrong TID : %s\n", cli_errstr(cli->tree)); + printf("server fails write with wrong TID : %s\n", smbcli_errstr(cli->tree)); } /* try a write with an invalid tid */ cli->tree->tid = cnum3; - if (cli_write(cli->tree, fnum1, 0, buf, 130, 4) == 4) { + if (smbcli_write(cli->tree, fnum1, 0, buf, 130, 4) == 4) { printf("* server allows write with invalid TID\n"); ret = False; } else { - printf("server fails write with invalid TID : %s\n", cli_errstr(cli->tree)); + printf("server fails write with invalid TID : %s\n", smbcli_errstr(cli->tree)); } /* try a write with an invalid vuid */ cli->session->vuid = vuid2; cli->tree->tid = cnum1; - if (cli_write(cli->tree, fnum1, 0, buf, 130, 4) == 4) { + if (smbcli_write(cli->tree, fnum1, 0, buf, 130, 4) == 4) { printf("* server allows write with invalid VUID\n"); ret = False; } else { - printf("server fails write with invalid VUID : %s\n", cli_errstr(cli->tree)); + printf("server fails write with invalid VUID : %s\n", smbcli_errstr(cli->tree)); } cli->session->vuid = vuid1; cli->tree->tid = cnum1; - if (NT_STATUS_IS_ERR(cli_close(cli->tree, fnum1))) { - printf("close failed (%s)\n", cli_errstr(cli->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli->tree, fnum1))) { + printf("close failed (%s)\n", smbcli_errstr(cli->tree)); return False; } cli->tree->tid = cnum2; - if (NT_STATUS_IS_ERR(cli_tdis(cli))) { - printf("secondary tdis failed (%s)\n", cli_errstr(cli->tree)); + if (NT_STATUS_IS_ERR(smbcli_tdis(cli))) { + printf("secondary tdis failed (%s)\n", smbcli_errstr(cli->tree)); return False; } @@ -770,15 +687,15 @@ static BOOL run_tcon_test(int dummy) -static BOOL tcon_devtest(struct cli_state *cli, +static BOOL tcon_devtest(struct smbcli_state *cli, const char *myshare, const char *devtype, NTSTATUS expected_error) { BOOL status; BOOL ret; - char *password = lp_parm_string(-1, "torture", "password"); + const char *password = lp_parm_string(-1, "torture", "password"); - status = NT_STATUS_IS_OK(cli_send_tconX(cli, myshare, devtype, + status = NT_STATUS_IS_OK(smbcli_send_tconX(cli, myshare, devtype, password)); printf("Trying share %s with devtype %s\n", myshare, devtype); @@ -792,7 +709,7 @@ static BOOL tcon_devtest(struct cli_state *cli, myshare, devtype); ret = False; } - cli_tdis(cli); + smbcli_tdis(cli); } else { if (status) { printf("tconx to share %s with type %s " @@ -800,7 +717,7 @@ static BOOL tcon_devtest(struct cli_state *cli, myshare, devtype); ret = False; } else { - if (NT_STATUS_EQUAL(cli_nt_error(cli->tree), + if (NT_STATUS_EQUAL(smbcli_nt_error(cli->tree), expected_error)) { ret = True; } else { @@ -815,23 +732,23 @@ static BOOL tcon_devtest(struct cli_state *cli, /* checks for correct tconX support */ -static BOOL run_tcon_devtype_test(int dummy) +static BOOL run_tcon_devtype_test(void) { - struct cli_state *cli1 = NULL; - BOOL retry; - int flags = 0; + struct smbcli_state *cli1 = NULL; NTSTATUS status; BOOL ret = True; - char *host = lp_parm_string(-1, "torture", "host"); - char *share = lp_parm_string(-1, "torture", "share"); - char *username = lp_parm_string(-1, "torture", "username"); - char *password = lp_parm_string(-1, "torture", "password"); - - status = cli_full_connection(&cli1, lp_netbios_name(), - host, NULL, - share, "?????", - username, lp_workgroup(), - password, flags, &retry); + const char *host = lp_parm_string(-1, "torture", "host"); + const char *share = lp_parm_string(-1, "torture", "share"); + const char *username = lp_parm_string(-1, "torture", "username"); + const char *userdomain = lp_parm_string(-1, "torture", "userdomain"); + const char *password = lp_parm_string(-1, "torture", "password"); + + status = smbcli_full_connection(NULL, + &cli1, lp_netbios_name(), + host, + share, NULL, + username, userdomain, + password); if (!NT_STATUS_IS_OK(status)) { printf("could not open connection\n"); @@ -868,7 +785,7 @@ static BOOL run_tcon_devtype_test(int dummy) if (!tcon_devtest(cli1, share, "FOOBA", NT_STATUS_BAD_DEVICE_TYPE)) ret = False; - cli_shutdown(cli1); + smbcli_shutdown(cli1); if (ret) printf("Passed tcondevtest\n"); @@ -878,967 +795,291 @@ static BOOL run_tcon_devtype_test(int dummy) /* - This test checks that - - 1) the server supports multiple locking contexts on the one SMB - connection, distinguished by PID. - - 2) the server correctly fails overlapping locks made by the same PID (this - goes against POSIX behaviour, which is why it is tricky to implement) - - 3) the server denies unlock requests by an incorrect client PID +test whether fnums and tids open on one VC are available on another (a major +security hole) */ -static BOOL run_locktest2(int dummy) +static BOOL run_fdpasstest(void) { - struct cli_state *cli; - const char *fname = "\\lockt2.lck"; - int fnum1, fnum2, fnum3; - BOOL correct = True; + struct smbcli_state *cli1, *cli2; + const char *fname = "\\fdpass.tst"; + int fnum1, oldtid; + uint8_t buf[1024]; - if (!torture_open_connection(&cli)) { + if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) { return False; } - printf("starting locktest2\n"); + printf("starting fdpasstest\n"); - cli_unlink(cli->tree, fname); + smbcli_unlink(cli1->tree, fname); - printf("Testing pid context\n"); - - cli->session->pid = 1; + printf("Opening a file on connection 1\n"); - fnum1 = cli_open(cli->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); + fnum1 = smbcli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); if (fnum1 == -1) { - printf("open of %s failed (%s)\n", fname, cli_errstr(cli->tree)); - return False; - } - - fnum2 = cli_open(cli->tree, fname, O_RDWR, DENY_NONE); - if (fnum2 == -1) { - printf("open2 of %s failed (%s)\n", fname, cli_errstr(cli->tree)); + printf("open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return False; } - cli->session->pid = 2; + printf("writing to file on connection 1\n"); - fnum3 = cli_open(cli->tree, fname, O_RDWR, DENY_NONE); - if (fnum3 == -1) { - printf("open3 of %s failed (%s)\n", fname, cli_errstr(cli->tree)); + if (smbcli_write(cli1->tree, fnum1, 0, "hello world\n", 0, 13) != 13) { + printf("write failed (%s)\n", smbcli_errstr(cli1->tree)); return False; } - cli->session->pid = 1; + oldtid = cli2->tree->tid; + cli2->session->vuid = cli1->session->vuid; + cli2->tree->tid = cli1->tree->tid; + cli2->session->pid = cli1->session->pid; + + printf("reading from file on connection 2\n"); - if (NT_STATUS_IS_ERR(cli_lock(cli->tree, fnum1, 0, 4, 0, WRITE_LOCK))) { - printf("lock1 failed (%s)\n", cli_errstr(cli->tree)); + if (smbcli_read(cli2->tree, fnum1, buf, 0, 13) == 13) { + printf("read succeeded! nasty security hole [%s]\n", + buf); return False; } - if (NT_STATUS_IS_OK(cli_lock(cli->tree, fnum1, 0, 4, 0, WRITE_LOCK))) { - printf("WRITE lock1 succeeded! This is a locking bug\n"); - correct = False; - } else { - if (!check_error(__LINE__, cli, ERRDOS, ERRlock, - NT_STATUS_LOCK_NOT_GRANTED)) return False; - } + smbcli_close(cli1->tree, fnum1); + smbcli_unlink(cli1->tree, fname); - if (NT_STATUS_IS_OK(cli_lock(cli->tree, fnum2, 0, 4, 0, WRITE_LOCK))) { - printf("WRITE lock2 succeeded! This is a locking bug\n"); - correct = False; - } else { - if (!check_error(__LINE__, cli, ERRDOS, ERRlock, - NT_STATUS_LOCK_NOT_GRANTED)) return False; - } + cli2->tree->tid = oldtid; - if (NT_STATUS_IS_OK(cli_lock(cli->tree, fnum2, 0, 4, 0, READ_LOCK))) { - printf("READ lock2 succeeded! This is a locking bug\n"); - correct = False; - } else { - if (!check_error(__LINE__, cli, ERRDOS, ERRlock, - NT_STATUS_FILE_LOCK_CONFLICT)) return False; - } + torture_close_connection(cli1); + torture_close_connection(cli2); - if (NT_STATUS_IS_ERR(cli_lock(cli->tree, fnum1, 100, 4, 0, WRITE_LOCK))) { - printf("lock at 100 failed (%s)\n", cli_errstr(cli->tree)); - } + printf("finished fdpasstest\n"); + return True; +} - cli->session->pid = 2; - if (NT_STATUS_IS_OK(cli_unlock(cli->tree, fnum1, 100, 4))) { - printf("unlock at 100 succeeded! This is a locking bug\n"); - correct = False; - } +/* +test the timing of deferred open requests +*/ +static BOOL run_deferopen(struct smbcli_state *cli, int dummy) +{ + const char *fname = "\\defer_open_test.dat"; + int retries=4; + int i = 0; + BOOL correct = True; - if (NT_STATUS_IS_OK(cli_unlock(cli->tree, fnum1, 0, 4))) { - printf("unlock1 succeeded! This is a locking bug\n"); - correct = False; - } else { - if (!check_error(__LINE__, cli, - ERRDOS, ERRlock, - NT_STATUS_RANGE_NOT_LOCKED)) return False; + if (retries <= 0) { + printf("failed to connect\n"); + return False; } - if (NT_STATUS_IS_OK(cli_unlock(cli->tree, fnum1, 0, 8))) { - printf("unlock2 succeeded! This is a locking bug\n"); - correct = False; - } else { - if (!check_error(__LINE__, cli, - ERRDOS, ERRlock, - NT_STATUS_RANGE_NOT_LOCKED)) return False; - } + printf("Testing deferred open requests.\n"); - if (NT_STATUS_IS_OK(cli_lock(cli->tree, fnum3, 0, 4, 0, WRITE_LOCK))) { - printf("lock3 succeeded! This is a locking bug\n"); - correct = False; - } else { - if (!check_error(__LINE__, cli, ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED)) return False; - } + while (i < 4) { + int fnum = -1; - cli->session->pid = 1; + do { + struct timeval tv; + tv = timeval_current(); + fnum = smbcli_nt_create_full(cli->tree, fname, 0, + SEC_RIGHTS_FILE_ALL, + FILE_ATTRIBUTE_NORMAL, + NTCREATEX_SHARE_ACCESS_NONE, + NTCREATEX_DISP_OPEN_IF, 0, 0); + if (fnum != -1) { + break; + } + if (NT_STATUS_EQUAL(smbcli_nt_error(cli->tree),NT_STATUS_SHARING_VIOLATION)) { + double e = timeval_elapsed(&tv); + if (e < 0.5 || e > 1.5) { + fprintf(stderr,"Timing incorrect %.2f violation\n", + e); + } + } + } while (NT_STATUS_EQUAL(smbcli_nt_error(cli->tree),NT_STATUS_SHARING_VIOLATION)); - if (NT_STATUS_IS_ERR(cli_close(cli->tree, fnum1))) { - printf("close1 failed (%s)\n", cli_errstr(cli->tree)); - return False; - } + if (fnum == -1) { + fprintf(stderr,"Failed to open %s, error=%s\n", fname, smbcli_errstr(cli->tree)); + return False; + } - if (NT_STATUS_IS_ERR(cli_close(cli->tree, fnum2))) { - printf("close2 failed (%s)\n", cli_errstr(cli->tree)); - return False; + printf("pid %u open %d\n", getpid(), i); + + sleep(10); + i++; + if (NT_STATUS_IS_ERR(smbcli_close(cli->tree, fnum))) { + fprintf(stderr,"Failed to close %s, error=%s\n", fname, smbcli_errstr(cli->tree)); + return False; + } + sleep(2); } - if (NT_STATUS_IS_ERR(cli_close(cli->tree, fnum3))) { - printf("close3 failed (%s)\n", cli_errstr(cli->tree)); - return False; + if (NT_STATUS_IS_ERR(smbcli_unlink(cli->tree, fname))) { + /* All until the last unlink will fail with sharing violation. */ + if (!NT_STATUS_EQUAL(smbcli_nt_error(cli->tree),NT_STATUS_SHARING_VIOLATION)) { + printf("unlink of %s failed (%s)\n", fname, smbcli_errstr(cli->tree)); + correct = False; + } } + printf("deferred test finished\n"); if (!torture_close_connection(cli)) { correct = False; } - - printf("locktest2 finished\n"); - return correct; } - /* - This test checks that - - 1) the server supports the full offset range in lock requests +test how many open files this server supports on the one socket */ -static BOOL run_locktest3(int dummy) +static BOOL run_maxfidtest(struct smbcli_state *cli, int dummy) { - struct cli_state *cli1, *cli2; - const char *fname = "\\lockt3.lck"; - int fnum1, fnum2, i; - uint32_t offset; +#define MAXFID_TEMPLATE "\\maxfid\\fid%d\\maxfid.%d.%d" + char *fname; + int fnums[0x11000], i; + int retries=4, maxfid; BOOL correct = True; -#define NEXT_OFFSET offset += (~(uint32_t)0) / torture_numops - - if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) { + if (retries <= 0) { + printf("failed to connect\n"); return False; } - printf("starting locktest3\n"); - - printf("Testing 32 bit offset ranges\n"); - - cli_unlink(cli1->tree, fname); - - fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - if (fnum1 == -1) { - printf("open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + if (smbcli_deltree(cli->tree, "\\maxfid") == -1) { + printf("Failed to deltree \\maxfid - %s\n", + smbcli_errstr(cli->tree)); return False; } - fnum2 = cli_open(cli2->tree, fname, O_RDWR, DENY_NONE); - if (fnum2 == -1) { - printf("open2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree)); + if (NT_STATUS_IS_ERR(smbcli_mkdir(cli->tree, "\\maxfid"))) { + printf("Failed to mkdir \\maxfid, error=%s\n", + smbcli_errstr(cli->tree)); return False; } - printf("Establishing %d locks\n", torture_numops); + printf("Testing maximum number of open files\n"); - for (offset=i=0;itree, fnum1, offset-1, 1, 0, WRITE_LOCK))) { - printf("lock1 %d failed (%s)\n", - i, - cli_errstr(cli1->tree)); - return False; + for (i=0; i<0x11000; i++) { + if (i % 1000 == 0) { + asprintf(&fname, "\\maxfid\\fid%d", i/1000); + if (NT_STATUS_IS_ERR(smbcli_mkdir(cli->tree, fname))) { + printf("Failed to mkdir %s, error=%s\n", + fname, smbcli_errstr(cli->tree)); + return False; + } + free(fname); } - - if (NT_STATUS_IS_ERR(cli_lock(cli2->tree, fnum2, offset-2, 1, 0, WRITE_LOCK))) { - printf("lock2 %d failed (%s)\n", - i, - cli_errstr(cli1->tree)); - return False; + asprintf(&fname, MAXFID_TEMPLATE, i/1000, i,(int)getpid()); + if ((fnums[i] = smbcli_open(cli->tree, fname, + O_RDWR|O_CREAT|O_TRUNC, DENY_NONE)) == + -1) { + printf("open of %s failed (%s)\n", + fname, smbcli_errstr(cli->tree)); + printf("maximum fnum is %d\n", i); + break; } + free(fname); + printf("%6d\r", i); } + printf("%6d\n", i); + i--; - printf("Testing %d locks\n", torture_numops); - - for (offset=i=0;itree, fnum1, offset-2, 1, 0, WRITE_LOCK))) { - printf("error: lock1 %d succeeded!\n", i); - return False; + printf("cleaning up\n"); + for (i=0;itree, fnums[i]))) { + printf("Close of fnum %d failed - %s\n", fnums[i], smbcli_errstr(cli->tree)); } - - if (NT_STATUS_IS_OK(cli_lock(cli2->tree, fnum2, offset-1, 1, 0, WRITE_LOCK))) { - printf("error: lock2 %d succeeded!\n", i); - return False; + if (NT_STATUS_IS_ERR(smbcli_unlink(cli->tree, fname))) { + printf("unlink of %s failed (%s)\n", + fname, smbcli_errstr(cli->tree)); + correct = False; } + free(fname); - if (NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, offset-1, 1, 0, WRITE_LOCK))) { - printf("error: lock3 %d succeeded!\n", i); - return False; + asprintf(&fname, MAXFID_TEMPLATE, (maxfid-i)/1000, maxfid-i,(int)getpid()); + if (NT_STATUS_IS_ERR(smbcli_close(cli->tree, fnums[maxfid-i]))) { + printf("Close of fnum %d failed - %s\n", fnums[maxfid-i], smbcli_errstr(cli->tree)); } - - if (NT_STATUS_IS_OK(cli_lock(cli2->tree, fnum2, offset-2, 1, 0, WRITE_LOCK))) { - printf("error: lock4 %d succeeded!\n", i); - return False; + if (NT_STATUS_IS_ERR(smbcli_unlink(cli->tree, fname))) { + printf("unlink of %s failed (%s)\n", + fname, smbcli_errstr(cli->tree)); + correct = False; } + free(fname); + + printf("%6d %6d\r", i, maxfid-i); + } + printf("%6d\n", 0); + + if (smbcli_deltree(cli->tree, "\\maxfid") == -1) { + printf("Failed to deltree \\maxfid - %s\n", + smbcli_errstr(cli->tree)); + return False; + } + + printf("maxfid test finished\n"); + if (!torture_close_connection(cli)) { + correct = False; } + return correct; +#undef MAXFID_TEMPLATE +} - printf("Removing %d locks\n", torture_numops); +/* send smb negprot commands, not reading the response */ +static BOOL run_negprot_nowait(void) +{ + int i; + struct smbcli_state *cli, *cli2; + BOOL correct = True; - for (offset=i=0;itree, fnum1, offset-1, 1))) { - printf("unlock1 %d failed (%s)\n", - i, - cli_errstr(cli1->tree)); - return False; - } + cli = open_nbt_connection(); + if (!cli) { + return False; + } - if (NT_STATUS_IS_ERR(cli_unlock(cli2->tree, fnum2, offset-2, 1))) { - printf("unlock2 %d failed (%s)\n", - i, - cli_errstr(cli1->tree)); - return False; + printf("Filling send buffer\n"); + + for (i=0;i<10000;i++) { + struct smbcli_request *req; + time_t t1 = time(NULL); + req = smb_raw_negotiate_send(cli->transport, PROTOCOL_NT1); + while (req->state == SMBCLI_REQUEST_SEND && time(NULL) < t1+5) { + smbcli_transport_process(cli->transport); + } + if (req->state == SMBCLI_REQUEST_ERROR) { + printf("Failed to fill pipe - %s\n", nt_errstr(req->status)); + torture_close_connection(cli); + return correct; + } + if (req->state == SMBCLI_REQUEST_SEND) { + break; } } - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("close1 failed (%s)\n", cli_errstr(cli1->tree)); - return False; + if (i == 10000) { + printf("send buffer failed to fill\n"); + if (!torture_close_connection(cli)) { + correct = False; + } + return correct; } - if (NT_STATUS_IS_ERR(cli_close(cli2->tree, fnum2))) { - printf("close2 failed (%s)\n", cli_errstr(cli2->tree)); - return False; - } + printf("send buffer filled after %d requests\n", i); - if (NT_STATUS_IS_ERR(cli_unlink(cli1->tree, fname))) { - printf("unlink failed (%s)\n", cli_errstr(cli1->tree)); + printf("Opening secondary connection\n"); + if (!torture_open_connection(&cli2)) { return False; } - if (!torture_close_connection(cli1)) { + if (!torture_close_connection(cli)) { correct = False; } - + if (!torture_close_connection(cli2)) { correct = False; } - printf("finished locktest3\n"); - - return correct; -} - -#define EXPECTED(ret, v) if ((ret) != (v)) { \ - printf("** "); correct = False; \ - } - -/* - looks at overlapping locks -*/ -static BOOL run_locktest4(int dummy) -{ - struct cli_state *cli1, *cli2; - const char *fname = "\\lockt4.lck"; - int fnum1, fnum2, f; - BOOL ret; - char buf[1000]; - BOOL correct = True; - - if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) { - return False; - } - - printf("starting locktest4\n"); - - cli_unlink(cli1->tree, fname); - - fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - fnum2 = cli_open(cli2->tree, fname, O_RDWR, DENY_NONE); - - memset(buf, 0, sizeof(buf)); - - if (cli_write(cli1->tree, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) { - printf("Failed to create file\n"); - correct = False; - goto fail; - } - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 0, 4, 0, WRITE_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 2, 4, 0, WRITE_LOCK)); - EXPECTED(ret, False); - printf("the same process %s set overlapping write locks\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 10, 4, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 12, 4, 0, READ_LOCK)); - EXPECTED(ret, True); - printf("the same process %s set overlapping read locks\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 20, 4, 0, WRITE_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli2->tree, fnum2, 22, 4, 0, WRITE_LOCK)); - EXPECTED(ret, False); - printf("a different connection %s set overlapping write locks\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 30, 4, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli2->tree, fnum2, 32, 4, 0, READ_LOCK)); - EXPECTED(ret, True); - printf("a different connection %s set overlapping read locks\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK((cli1->session->pid = 1, cli_lock(cli1->tree, fnum1, 40, 4, 0, WRITE_LOCK))) && - NT_STATUS_IS_OK((cli1->session->pid = 2, cli_lock(cli1->tree, fnum1, 42, 4, 0, WRITE_LOCK))); - EXPECTED(ret, False); - printf("a different pid %s set overlapping write locks\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK((cli1->session->pid = 1, cli_lock(cli1->tree, fnum1, 50, 4, 0, READ_LOCK))) && - NT_STATUS_IS_OK((cli1->session->pid = 2, cli_lock(cli1->tree, fnum1, 52, 4, 0, READ_LOCK))); - EXPECTED(ret, True); - printf("a different pid %s set overlapping read locks\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 60, 4, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 60, 4, 0, READ_LOCK)); - EXPECTED(ret, True); - printf("the same process %s set the same read lock twice\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 70, 4, 0, WRITE_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 70, 4, 0, WRITE_LOCK)); - EXPECTED(ret, False); - printf("the same process %s set the same write lock twice\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 80, 4, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 80, 4, 0, WRITE_LOCK)); - EXPECTED(ret, False); - printf("the same process %s overlay a read lock with a write lock\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 90, 4, 0, WRITE_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 90, 4, 0, READ_LOCK)); - EXPECTED(ret, True); - printf("the same process %s overlay a write lock with a read lock\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK((cli1->session->pid = 1, cli_lock(cli1->tree, fnum1, 100, 4, 0, WRITE_LOCK))) && - NT_STATUS_IS_OK((cli1->session->pid = 2, cli_lock(cli1->tree, fnum1, 100, 4, 0, READ_LOCK))); - EXPECTED(ret, False); - printf("a different pid %s overlay a write lock with a read lock\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 110, 4, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 112, 4, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_unlock(cli1->tree, fnum1, 110, 6)); - EXPECTED(ret, False); - printf("the same process %s coalesce read locks\n", ret?"can":"cannot"); - - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 120, 4, 0, WRITE_LOCK)) && - (cli_read(cli2->tree, fnum2, buf, 120, 4) == 4); - EXPECTED(ret, False); - printf("this server %s strict write locking\n", ret?"doesn't do":"does"); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 130, 4, 0, READ_LOCK)) && - (cli_write(cli2->tree, fnum2, 0, buf, 130, 4) == 4); - EXPECTED(ret, False); - printf("this server %s strict read locking\n", ret?"doesn't do":"does"); - - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 140, 4, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 140, 4, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_unlock(cli1->tree, fnum1, 140, 4)) && - NT_STATUS_IS_OK(cli_unlock(cli1->tree, fnum1, 140, 4)); - EXPECTED(ret, True); - printf("this server %s do recursive read locking\n", ret?"does":"doesn't"); - - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 150, 4, 0, WRITE_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 150, 4, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_unlock(cli1->tree, fnum1, 150, 4)) && - (cli_read(cli2->tree, fnum2, buf, 150, 4) == 4) && - !(cli_write(cli2->tree, fnum2, 0, buf, 150, 4) == 4) && - NT_STATUS_IS_OK(cli_unlock(cli1->tree, fnum1, 150, 4)); - EXPECTED(ret, True); - printf("this server %s do recursive lock overlays\n", ret?"does":"doesn't"); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 160, 4, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_unlock(cli1->tree, fnum1, 160, 4)) && - (cli_write(cli2->tree, fnum2, 0, buf, 160, 4) == 4) && - (cli_read(cli2->tree, fnum2, buf, 160, 4) == 4); - EXPECTED(ret, True); - printf("the same process %s remove a read lock using write locking\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 170, 4, 0, WRITE_LOCK)) && - NT_STATUS_IS_OK(cli_unlock(cli1->tree, fnum1, 170, 4)) && - (cli_write(cli2->tree, fnum2, 0, buf, 170, 4) == 4) && - (cli_read(cli2->tree, fnum2, buf, 170, 4) == 4); - EXPECTED(ret, True); - printf("the same process %s remove a write lock using read locking\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 190, 4, 0, WRITE_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 190, 4, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_unlock(cli1->tree, fnum1, 190, 4)) && - !(cli_write(cli2->tree, fnum2, 0, buf, 190, 4) == 4) && - (cli_read(cli2->tree, fnum2, buf, 190, 4) == 4); - EXPECTED(ret, True); - printf("the same process %s remove the first lock first\n", ret?"does":"doesn't"); - - cli_close(cli1->tree, fnum1); - cli_close(cli2->tree, fnum2); - fnum1 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE); - f = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE); - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 0, 8, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, f, 0, 1, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_close(cli1->tree, fnum1)) && - ((fnum1 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE)) != -1) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 7, 1, 0, WRITE_LOCK)); - cli_close(cli1->tree, f); - cli_close(cli1->tree, fnum1); - EXPECTED(ret, True); - printf("the server %s have the NT byte range lock bug\n", !ret?"does":"doesn't"); - - fail: - cli_close(cli1->tree, fnum1); - cli_close(cli2->tree, fnum2); - cli_unlink(cli1->tree, fname); - torture_close_connection(cli1); - torture_close_connection(cli2); - - printf("finished locktest4\n"); - return correct; -} - -/* - looks at lock upgrade/downgrade. -*/ -static BOOL run_locktest5(int dummy) -{ - struct cli_state *cli1, *cli2; - const char *fname = "\\lockt5.lck"; - int fnum1, fnum2, fnum3; - BOOL ret; - char buf[1000]; - BOOL correct = True; - - if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) { - return False; - } - - printf("starting locktest5\n"); - - cli_unlink(cli1->tree, fname); - - fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - fnum2 = cli_open(cli2->tree, fname, O_RDWR, DENY_NONE); - fnum3 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE); - - memset(buf, 0, sizeof(buf)); - - if (cli_write(cli1->tree, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) { - printf("Failed to create file\n"); - correct = False; - goto fail; - } - - /* Check for NT bug... */ - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 0, 8, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum3, 0, 1, 0, READ_LOCK)); - cli_close(cli1->tree, fnum1); - fnum1 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE); - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 7, 1, 0, WRITE_LOCK)); - EXPECTED(ret, True); - printf("this server %s the NT locking bug\n", ret ? "doesn't have" : "has"); - cli_close(cli1->tree, fnum1); - fnum1 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE); - cli_unlock(cli1->tree, fnum3, 0, 1); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 0, 4, 0, WRITE_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 1, 1, 0, READ_LOCK)); - EXPECTED(ret, True); - printf("the same process %s overlay a write with a read lock\n", ret?"can":"cannot"); - - ret = NT_STATUS_IS_OK(cli_lock(cli2->tree, fnum2, 0, 4, 0, READ_LOCK)); - EXPECTED(ret, False); - - printf("a different processs %s get a read lock on the first process lock stack\n", ret?"can":"cannot"); - - /* Unlock the process 2 lock. */ - cli_unlock(cli2->tree, fnum2, 0, 4); - - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum3, 0, 4, 0, READ_LOCK)); - EXPECTED(ret, False); - - printf("the same processs on a different fnum %s get a read lock\n", ret?"can":"cannot"); - - /* Unlock the process 1 fnum3 lock. */ - cli_unlock(cli1->tree, fnum3, 0, 4); - - /* Stack 2 more locks here. */ - ret = NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 0, 4, 0, READ_LOCK)) && - NT_STATUS_IS_OK(cli_lock(cli1->tree, fnum1, 0, 4, 0, READ_LOCK)); - - EXPECTED(ret, True); - printf("the same process %s stack read locks\n", ret?"can":"cannot"); - - /* Unlock the first process lock, then check this was the WRITE lock that was - removed. */ - -ret = NT_STATUS_IS_OK(cli_unlock(cli1->tree, fnum1, 0, 4)) && - NT_STATUS_IS_OK(cli_lock(cli2->tree, fnum2, 0, 4, 0, READ_LOCK)); - - EXPECTED(ret, True); - printf("the first unlock removes the %s lock\n", ret?"WRITE":"READ"); - - /* Unlock the process 2 lock. */ - cli_unlock(cli2->tree, fnum2, 0, 4); - - /* We should have 3 stacked locks here. Ensure we need to do 3 unlocks. */ - - ret = NT_STATUS_IS_OK(cli_unlock(cli1->tree, fnum1, 1, 1)) && - NT_STATUS_IS_OK(cli_unlock(cli1->tree, fnum1, 0, 4)) && - NT_STATUS_IS_OK(cli_unlock(cli1->tree, fnum1, 0, 4)); - - EXPECTED(ret, True); - printf("the same process %s unlock the stack of 4 locks\n", ret?"can":"cannot"); - - /* Ensure the next unlock fails. */ - ret = NT_STATUS_IS_OK(cli_unlock(cli1->tree, fnum1, 0, 4)); - EXPECTED(ret, False); - printf("the same process %s count the lock stack\n", !ret?"can":"cannot"); - - /* Ensure connection 2 can get a write lock. */ - ret = NT_STATUS_IS_OK(cli_lock(cli2->tree, fnum2, 0, 4, 0, WRITE_LOCK)); - EXPECTED(ret, True); - - printf("a different processs %s get a write lock on the unlocked stack\n", ret?"can":"cannot"); - - - fail: - cli_close(cli1->tree, fnum1); - cli_close(cli2->tree, fnum2); - cli_unlink(cli1->tree, fname); - if (!torture_close_connection(cli1)) { - correct = False; - } - if (!torture_close_connection(cli2)) { - correct = False; - } - - printf("finished locktest5\n"); - - return correct; -} - -/* - tries the unusual lockingX locktype bits -*/ -static BOOL run_locktest6(int dummy) -{ - struct cli_state *cli; - const char *fname[1] = { "\\lock6.txt" }; - int i; - int fnum; - NTSTATUS status; - - if (!torture_open_connection(&cli)) { - return False; - } - - printf("starting locktest6\n"); - - for (i=0;i<1;i++) { - printf("Testing %s\n", fname[i]); - - cli_unlink(cli->tree, fname[i]); - - fnum = cli_open(cli->tree, fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - status = cli_locktype(cli->tree, fnum, 0, 8, 0, LOCKING_ANDX_CHANGE_LOCKTYPE); - cli_close(cli->tree, fnum); - printf("CHANGE_LOCKTYPE gave %s\n", nt_errstr(status)); - - fnum = cli_open(cli->tree, fname[i], O_RDWR, DENY_NONE); - status = cli_locktype(cli->tree, fnum, 0, 8, 0, LOCKING_ANDX_CANCEL_LOCK); - cli_close(cli->tree, fnum); - printf("CANCEL_LOCK gave %s\n", nt_errstr(status)); - - cli_unlink(cli->tree, fname[i]); - } - - torture_close_connection(cli); - - printf("finished locktest6\n"); - return True; -} - -static BOOL run_locktest7(int dummy) -{ - struct cli_state *cli1; - const char *fname = "\\lockt7.lck"; - int fnum1; - int fnum2; - size_t size; - char buf[200]; - BOOL correct = False; - - if (!torture_open_connection(&cli1)) { - return False; - } - - printf("starting locktest7\n"); - - cli_unlink(cli1->tree, fname); - - fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - - memset(buf, 0, sizeof(buf)); - - if (cli_write(cli1->tree, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) { - printf("Failed to create file\n"); - goto fail; - } - - cli1->session->pid = 1; - - if (NT_STATUS_IS_ERR(cli_lock(cli1->tree, fnum1, 130, 4, 0, READ_LOCK))) { - printf("Unable to apply read lock on range 130:4, error was %s\n", cli_errstr(cli1->tree)); - goto fail; - } else { - printf("pid1 successfully locked range 130:4 for READ\n"); - } - - if (cli_read(cli1->tree, fnum1, buf, 130, 4) != 4) { - printf("pid1 unable to read the range 130:4, error was %s\n", cli_errstr(cli1->tree)); - goto fail; - } else { - printf("pid1 successfully read the range 130:4\n"); - } - - if (cli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) { - printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1->tree)); - if (NT_STATUS_V(cli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) { - printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n"); - goto fail; - } - } else { - printf("pid1 successfully wrote to the range 130:4 (should be denied)\n"); - goto fail; - } - - cli1->session->pid = 2; - - if (cli_read(cli1->tree, fnum1, buf, 130, 4) != 4) { - printf("pid2 unable to read the range 130:4, error was %s\n", cli_errstr(cli1->tree)); - } else { - printf("pid2 successfully read the range 130:4\n"); - } - - if (cli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) { - printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1->tree)); - if (NT_STATUS_V(cli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) { - printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n"); - goto fail; - } - } else { - printf("pid2 successfully wrote to the range 130:4 (should be denied)\n"); - goto fail; - } - - cli1->session->pid = 1; - cli_unlock(cli1->tree, fnum1, 130, 4); - - if (NT_STATUS_IS_ERR(cli_lock(cli1->tree, fnum1, 130, 4, 0, WRITE_LOCK))) { - printf("Unable to apply write lock on range 130:4, error was %s\n", cli_errstr(cli1->tree)); - goto fail; - } else { - printf("pid1 successfully locked range 130:4 for WRITE\n"); - } - - if (cli_read(cli1->tree, fnum1, buf, 130, 4) != 4) { - printf("pid1 unable to read the range 130:4, error was %s\n", cli_errstr(cli1->tree)); - goto fail; - } else { - printf("pid1 successfully read the range 130:4\n"); - } - - if (cli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) { - printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1->tree)); - goto fail; - } else { - printf("pid1 successfully wrote to the range 130:4\n"); - } - - cli1->session->pid = 2; - - if (cli_read(cli1->tree, fnum1, buf, 130, 4) != 4) { - printf("pid2 unable to read the range 130:4, error was %s\n", cli_errstr(cli1->tree)); - if (NT_STATUS_V(cli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) { - printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n"); - goto fail; - } - } else { - printf("pid2 successfully read the range 130:4 (should be denied)\n"); - goto fail; - } - - if (cli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) { - printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1->tree)); - if (NT_STATUS_V(cli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) { - printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n"); - goto fail; - } - } else { - printf("pid2 successfully wrote to the range 130:4 (should be denied)\n"); - goto fail; - } - - printf("Testing truncate of locked file.\n"); - - fnum2 = cli_open(cli1->tree, fname, O_RDWR|O_TRUNC, DENY_NONE); - - if (fnum2 == -1) { - printf("Unable to truncate locked file.\n"); - correct = False; - goto fail; - } else { - printf("Truncated locked file.\n"); - } - - if (NT_STATUS_IS_ERR(cli_getatr(cli1->tree, fname, NULL, &size, NULL))) { - printf("getatr failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - if (size != 0) { - printf("Unable to truncate locked file. Size was %u\n", size); - correct = False; - goto fail; - } - - cli1->session->pid = 1; - - cli_unlock(cli1->tree, fnum1, 130, 4); - correct = True; - -fail: - cli_close(cli1->tree, fnum1); - cli_close(cli1->tree, fnum2); - cli_unlink(cli1->tree, fname); - torture_close_connection(cli1); - - printf("finished locktest7\n"); - return correct; -} - -/* -test whether fnums and tids open on one VC are available on another (a major -security hole) -*/ -static BOOL run_fdpasstest(int dummy) -{ - struct cli_state *cli1, *cli2; - const char *fname = "\\fdpass.tst"; - int fnum1, oldtid; - pstring buf; - - if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) { - return False; - } - - printf("starting fdpasstest\n"); - - cli_unlink(cli1->tree, fname); - - printf("Opening a file on connection 1\n"); - - fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - if (fnum1 == -1) { - printf("open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - return False; - } - - printf("writing to file on connection 1\n"); - - if (cli_write(cli1->tree, fnum1, 0, "hello world\n", 0, 13) != 13) { - printf("write failed (%s)\n", cli_errstr(cli1->tree)); - return False; - } - - oldtid = cli2->tree->tid; - cli2->session->vuid = cli1->session->vuid; - cli2->tree->tid = cli1->tree->tid; - cli2->session->pid = cli1->session->pid; - - printf("reading from file on connection 2\n"); - - if (cli_read(cli2->tree, fnum1, buf, 0, 13) == 13) { - printf("read succeeded! nasty security hole [%s]\n", - buf); - return False; - } - - cli_close(cli1->tree, fnum1); - cli_unlink(cli1->tree, fname); - - cli2->tree->tid = oldtid; - - torture_close_connection(cli1); - torture_close_connection(cli2); - - printf("finished fdpasstest\n"); - return True; -} - - -/* - This test checks that - - 1) the server does not allow an unlink on a file that is open -*/ -static BOOL run_unlinktest(int dummy) -{ - struct cli_state *cli; - const char *fname = "\\unlink.tst"; - int fnum; - BOOL correct = True; - - if (!torture_open_connection(&cli)) { - return False; - } - - printf("starting unlink test\n"); - - cli_unlink(cli->tree, fname); - - cli->session->pid = 1; - - printf("Opening a file\n"); - - fnum = cli_open(cli->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - if (fnum == -1) { - printf("open of %s failed (%s)\n", fname, cli_errstr(cli->tree)); - return False; - } - - printf("Unlinking a open file\n"); - - if (NT_STATUS_IS_OK(cli_unlink(cli->tree, fname))) { - printf("error: server allowed unlink on an open file\n"); - correct = False; - } else { - correct = check_error(__LINE__, cli, ERRDOS, ERRbadshare, - NT_STATUS_SHARING_VIOLATION); - } - - cli_close(cli->tree, fnum); - cli_unlink(cli->tree, fname); - - if (!torture_close_connection(cli)) { - correct = False; - } - - printf("unlink test finished\n"); - - return correct; -} - - -/* -test how many open files this server supports on the one socket -*/ -static BOOL run_maxfidtest(struct cli_state *cli, int dummy) -{ - const char *template = "\\maxfid.%d.%d"; - char *fname; - int fnums[0x11000], i; - int retries=4; - BOOL correct = True; - - if (retries <= 0) { - printf("failed to connect\n"); - return False; - } - - printf("Testing maximum number of open files\n"); - - for (i=0; i<0x11000; i++) { - asprintf(&fname, template, i,(int)getpid()); - if ((fnums[i] = cli_open(cli->tree, fname, - O_RDWR|O_CREAT|O_TRUNC, DENY_NONE)) == - -1) { - printf("open of %s failed (%s)\n", - fname, cli_errstr(cli->tree)); - printf("maximum fnum is %d\n", i); - break; - } - free(fname); - printf("%6d\r", i); - } - printf("%6d\n", i); - i--; - - printf("cleaning up\n"); - for (;i>=0;i--) { - asprintf(&fname, template, i,(int)getpid()); - if (NT_STATUS_IS_ERR(cli_close(cli->tree, fnums[i]))) { - printf("Close of fnum %d failed - %s\n", fnums[i], cli_errstr(cli->tree)); - } - if (NT_STATUS_IS_ERR(cli_unlink(cli->tree, fname))) { - printf("unlink of %s failed (%s)\n", - fname, cli_errstr(cli->tree)); - correct = False; - } - free(fname); - printf("%6d\r", i); - } - printf("%6d\n", 0); - - printf("maxfid test finished\n"); - if (!torture_close_connection(cli)) { - correct = False; - } - return correct; -} - -/* send smb negprot commands, not reading the response */ -static BOOL run_negprot_nowait(int dummy) -{ - int i; - struct cli_state *cli; - BOOL correct = True; - - printf("starting negprot nowait test\n"); - - cli = open_nbt_connection(); - if (!cli) { - return False; - } - - printf("Establishing protocol negotiations - connect with another client\n"); - - for (i=0;i<50000;i++) { - smb_negprot_send(cli->transport, PROTOCOL_NT1); - } - - if (!torture_close_connection(cli)) { - correct = False; - } - - printf("finished negprot nowait test\n"); + printf("finished negprot nowait test\n"); return correct; } @@ -1847,9 +1088,9 @@ static BOOL run_negprot_nowait(int dummy) /* This checks how the getatr calls works */ -static BOOL run_attrtest(int dummy) +static BOOL run_attrtest(void) { - struct cli_state *cli; + struct smbcli_state *cli; int fnum; time_t t, t2; const char *fname = "\\attrib123456789.tst"; @@ -1861,13 +1102,13 @@ static BOOL run_attrtest(int dummy) return False; } - cli_unlink(cli->tree, fname); - fnum = cli_open(cli->tree, fname, + smbcli_unlink(cli->tree, fname); + fnum = smbcli_open(cli->tree, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); - cli_close(cli->tree, fnum); + smbcli_close(cli->tree, fnum); - if (NT_STATUS_IS_ERR(cli_getatr(cli->tree, fname, NULL, NULL, &t))) { - printf("getatr failed (%s)\n", cli_errstr(cli->tree)); + if (NT_STATUS_IS_ERR(smbcli_getatr(cli->tree, fname, NULL, NULL, &t))) { + printf("getatr failed (%s)\n", smbcli_errstr(cli->tree)); correct = False; } @@ -1884,13 +1125,13 @@ static BOOL run_attrtest(int dummy) printf("Setting file time to %s", ctime(&t2)); - if (NT_STATUS_IS_ERR(cli_setatr(cli->tree, fname, 0, t2))) { - printf("setatr failed (%s)\n", cli_errstr(cli->tree)); + if (NT_STATUS_IS_ERR(smbcli_setatr(cli->tree, fname, 0, t2))) { + printf("setatr failed (%s)\n", smbcli_errstr(cli->tree)); correct = True; } - if (NT_STATUS_IS_ERR(cli_getatr(cli->tree, fname, NULL, NULL, &t))) { - printf("getatr failed (%s)\n", cli_errstr(cli->tree)); + if (NT_STATUS_IS_ERR(smbcli_getatr(cli->tree, fname, NULL, NULL, &t))) { + printf("getatr failed (%s)\n", smbcli_errstr(cli->tree)); correct = True; } @@ -1903,7 +1144,7 @@ static BOOL run_attrtest(int dummy) correct = True; } - cli_unlink(cli->tree, fname); + smbcli_unlink(cli->tree, fname); if (!torture_close_connection(cli)) { correct = False; @@ -1918,9 +1159,9 @@ static BOOL run_attrtest(int dummy) /* This checks a couple of trans2 calls */ -static BOOL run_trans2test(int dummy) +static BOOL run_trans2test(void) { - struct cli_state *cli; + struct smbcli_state *cli; int fnum; size_t size; time_t c_time, a_time, m_time, w_time, m_time2; @@ -1933,618 +1174,151 @@ static BOOL run_trans2test(int dummy) printf("starting trans2 test\n"); if (!torture_open_connection(&cli)) { - return False; - } - - cli_unlink(cli->tree, fname); - - printf("Testing qfileinfo\n"); - - fnum = cli_open(cli->tree, fname, - O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); - if (NT_STATUS_IS_ERR(cli_qfileinfo(cli->tree, fnum, NULL, &size, &c_time, &a_time, &m_time, - NULL, NULL))) { - printf("ERROR: qfileinfo failed (%s)\n", cli_errstr(cli->tree)); - correct = False; - } - - printf("Testing NAME_INFO\n"); - - if (NT_STATUS_IS_ERR(cli_qfilename(cli->tree, fnum, &pname))) { - printf("ERROR: qfilename failed (%s)\n", cli_errstr(cli->tree)); - correct = False; - } - - if (!pname || strcmp(pname, fname)) { - printf("qfilename gave different name? [%s] [%s]\n", - fname, pname); - correct = False; - } - - cli_close(cli->tree, fnum); - cli_unlink(cli->tree, fname); - - fnum = cli_open(cli->tree, fname, - O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); - if (fnum == -1) { - printf("open of %s failed (%s)\n", fname, cli_errstr(cli->tree)); - return False; - } - cli_close(cli->tree, fnum); - - printf("Checking for sticky create times\n"); - - if (NT_STATUS_IS_ERR(cli_qpathinfo(cli->tree, fname, &c_time, &a_time, &m_time, &size, NULL))) { - printf("ERROR: qpathinfo failed (%s)\n", cli_errstr(cli->tree)); - correct = False; - } else { - if (c_time != m_time) { - printf("create time=%s", ctime(&c_time)); - printf("modify time=%s", ctime(&m_time)); - printf("This system appears to have sticky create times\n"); - } - if (a_time % (60*60) == 0) { - printf("access time=%s", ctime(&a_time)); - printf("This system appears to set a midnight access time\n"); - correct = False; - } - - if (abs(m_time - time(NULL)) > 60*60*24*7) { - printf("ERROR: totally incorrect times - maybe word reversed? mtime=%s", ctime(&m_time)); - correct = False; - } - } - - - cli_unlink(cli->tree, fname); - fnum = cli_open(cli->tree, fname, - O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); - cli_close(cli->tree, fnum); - if (NT_STATUS_IS_ERR(cli_qpathinfo2(cli->tree, fname, &c_time, &a_time, &m_time, &w_time, &size, NULL, NULL))) { - printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli->tree)); - correct = False; - } else { - if (w_time < 60*60*24*2) { - printf("write time=%s", ctime(&w_time)); - printf("This system appears to set a initial 0 write time\n"); - correct = False; - } - } - - cli_unlink(cli->tree, fname); - - - /* check if the server updates the directory modification time - when creating a new file */ - if (NT_STATUS_IS_ERR(cli_mkdir(cli->tree, dname))) { - printf("ERROR: mkdir failed (%s)\n", cli_errstr(cli->tree)); - correct = False; - } - sleep(3); - if (NT_STATUS_IS_ERR(cli_qpathinfo2(cli->tree, "\\trans2\\", &c_time, &a_time, &m_time, &w_time, &size, NULL, NULL))) { - printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli->tree)); - correct = False; - } - - fnum = cli_open(cli->tree, fname2, - O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); - cli_write(cli->tree, fnum, 0, (char *)&fnum, 0, sizeof(fnum)); - cli_close(cli->tree, fnum); - if (NT_STATUS_IS_ERR(cli_qpathinfo2(cli->tree, "\\trans2\\", &c_time, &a_time, &m_time2, &w_time, &size, NULL, NULL))) { - printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli->tree)); - correct = False; - } else { - if (m_time2 == m_time) { - printf("This system does not update directory modification times\n"); - correct = False; - } - } - cli_unlink(cli->tree, fname2); - cli_rmdir(cli->tree, dname); - - if (!torture_close_connection(cli)) { - correct = False; - } - - printf("trans2 test finished\n"); - - return correct; -} - -/* - Test delete on close semantics. - */ -static BOOL run_deletetest(int dummy) -{ - struct cli_state *cli1; - struct cli_state *cli2 = NULL; - const char *fname = "\\delete.file"; - int fnum1 = -1; - int fnum2 = -1; - BOOL correct = True; - - printf("starting delete test\n"); - - if (!torture_open_connection(&cli1)) { - return False; - } - - /* Test 1 - this should delete the file on close. */ - - cli_setatr(cli1->tree, fname, 0, 0); - cli_unlink(cli1->tree, fname); - - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL, - NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, - NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0); - - if (fnum1 == -1) { - printf("[1] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("[1] close failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - fnum1 = cli_open(cli1->tree, fname, O_RDWR, DENY_NONE); - if (fnum1 != -1) { - printf("[1] open of %s succeeded (should fail)\n", fname); - correct = False; - goto fail; - } - - printf("first delete on close test succeeded.\n"); - - /* Test 2 - this should delete the file on close. */ - - cli_setatr(cli1->tree, fname, 0, 0); - cli_unlink(cli1->tree, fname); - - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, - FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, - NTCREATEX_DISP_OVERWRITE_IF, 0, 0); - - if (fnum1 == -1) { - printf("[2] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_nt_delete_on_close(cli1->tree, fnum1, True))) { - printf("[2] setting delete_on_close failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("[2] close failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_NONE); - if (fnum1 != -1) { - printf("[2] open of %s succeeded should have been deleted on close !\n", fname); - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("[2] close failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - cli_unlink(cli1->tree, fname); - } else - printf("second delete on close test succeeded.\n"); - - /* Test 3 - ... */ - cli_setatr(cli1->tree, fname, 0, 0); - cli_unlink(cli1->tree, fname); - - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL, - NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); - - if (fnum1 == -1) { - printf("[3] open - 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - /* This should fail with a sharing violation - open for delete is only compatible - with SHARE_DELETE. */ - - fnum2 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL, - NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, - NTCREATEX_DISP_OPEN, 0, 0); - - if (fnum2 != -1) { - printf("[3] open - 2 of %s succeeded - should have failed.\n", fname); - correct = False; - goto fail; - } - - /* This should succeed. */ - - fnum2 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL, - NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN, 0, 0); - - if (fnum2 == -1) { - printf("[3] open - 2 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_nt_delete_on_close(cli1->tree, fnum1, True))) { - printf("[3] setting delete_on_close failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("[3] close 1 failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum2))) { - printf("[3] close 2 failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - /* This should fail - file should no longer be there. */ - - fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_NONE); - if (fnum1 != -1) { - printf("[3] open of %s succeeded should have been deleted on close !\n", fname); - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("[3] close failed (%s)\n", cli_errstr(cli1->tree)); - } - cli_unlink(cli1->tree, fname); - correct = False; - goto fail; - } else - printf("third delete on close test succeeded.\n"); - - /* Test 4 ... */ - cli_setatr(cli1->tree, fname, 0, 0); - cli_unlink(cli1->tree, fname); - - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, - SA_RIGHT_FILE_READ_DATA | - SA_RIGHT_FILE_WRITE_DATA | - STD_RIGHT_DELETE_ACCESS, - FILE_ATTRIBUTE_NORMAL, - NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, - NTCREATEX_DISP_OVERWRITE_IF, 0, 0); - - if (fnum1 == -1) { - printf("[4] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - /* This should succeed. */ - fnum2 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, - FILE_ATTRIBUTE_NORMAL, - NTCREATEX_SHARE_ACCESS_READ | - NTCREATEX_SHARE_ACCESS_WRITE | - NTCREATEX_SHARE_ACCESS_DELETE, - NTCREATEX_DISP_OPEN, 0, 0); - if (fnum2 == -1) { - printf("[4] open - 2 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum2))) { - printf("[4] close - 1 failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_nt_delete_on_close(cli1->tree, fnum1, True))) { - printf("[4] setting delete_on_close failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - /* This should fail - no more opens once delete on close set. */ - fnum2 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, - FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, - NTCREATEX_DISP_OPEN, 0, 0); - if (fnum2 != -1) { - printf("[4] open - 3 of %s succeeded ! Should have failed.\n", fname ); - correct = False; - goto fail; - } else - printf("fourth delete on close test succeeded.\n"); - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("[4] close - 2 failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - /* Test 5 ... */ - cli_setatr(cli1->tree, fname, 0, 0); - cli_unlink(cli1->tree, fname); - - fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT, DENY_NONE); - if (fnum1 == -1) { - printf("[5] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - /* This should fail - only allowed on NT opens with DELETE access. */ - - if (NT_STATUS_IS_OK(cli_nt_delete_on_close(cli1->tree, fnum1, True))) { - printf("[5] setting delete_on_close on OpenX file succeeded - should fail !\n"); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("[5] close - 2 failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - printf("fifth delete on close test succeeded.\n"); - - /* Test 6 ... */ - cli_setatr(cli1->tree, fname, 0, 0); - cli_unlink(cli1->tree, fname); - - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, - SA_RIGHT_FILE_READ_DATA | SA_RIGHT_FILE_WRITE_DATA, - FILE_ATTRIBUTE_NORMAL, - NTCREATEX_SHARE_ACCESS_READ | - NTCREATEX_SHARE_ACCESS_WRITE | - NTCREATEX_SHARE_ACCESS_DELETE, - NTCREATEX_DISP_OVERWRITE_IF, 0, 0); - - if (fnum1 == -1) { - printf("[6] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - /* This should fail - only allowed on NT opens with DELETE access. */ - - if (NT_STATUS_IS_OK(cli_nt_delete_on_close(cli1->tree, fnum1, True))) { - printf("[6] setting delete_on_close on file with no delete access succeeded - should fail !\n"); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("[6] close - 2 failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - printf("sixth delete on close test succeeded.\n"); - - /* Test 7 ... */ - cli_setatr(cli1->tree, fname, 0, 0); - cli_unlink(cli1->tree, fname); - - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, - SA_RIGHT_FILE_READ_DATA | - SA_RIGHT_FILE_WRITE_DATA | - STD_RIGHT_DELETE_ACCESS, - FILE_ATTRIBUTE_NORMAL, 0, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); - - if (fnum1 == -1) { - printf("[7] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_nt_delete_on_close(cli1->tree, fnum1, True))) { - printf("[7] setting delete_on_close on file failed !\n"); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_nt_delete_on_close(cli1->tree, fnum1, False))) { - printf("[7] unsetting delete_on_close on file failed !\n"); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("[7] close - 2 failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - /* This next open should succeed - we reset the flag. */ - - fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_NONE); - if (fnum1 == -1) { - printf("[5] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("[7] close - 2 failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - goto fail; - } - - printf("seventh delete on close test succeeded.\n"); - - /* Test 7 ... */ - cli_setatr(cli1->tree, fname, 0, 0); - cli_unlink(cli1->tree, fname); - - if (!torture_open_connection(&cli2)) { - printf("[8] failed to open second connection.\n"); - correct = False; - goto fail; + return False; } - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS, - FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, - NTCREATEX_DISP_OVERWRITE_IF, 0, 0); - - if (fnum1 == -1) { - printf("[8] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); - correct = False; - goto fail; - } + smbcli_unlink(cli->tree, fname); - fnum2 = cli_nt_create_full(cli2->tree, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS, - FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, - NTCREATEX_DISP_OPEN, 0, 0); + printf("Testing qfileinfo\n"); - if (fnum2 == -1) { - printf("[8] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + fnum = smbcli_open(cli->tree, fname, + O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); + if (NT_STATUS_IS_ERR(smbcli_qfileinfo(cli->tree, fnum, NULL, &size, &c_time, &a_time, &m_time, + NULL, NULL))) { + printf("ERROR: qfileinfo failed (%s)\n", smbcli_errstr(cli->tree)); correct = False; - goto fail; } - if (NT_STATUS_IS_ERR(cli_nt_delete_on_close(cli1->tree, fnum1, True))) { - printf("[8] setting delete_on_close on file failed !\n"); - correct = False; - goto fail; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("[8] close - 1 failed (%s)\n", cli_errstr(cli1->tree)); + printf("Testing NAME_INFO\n"); + + if (NT_STATUS_IS_ERR(smbcli_qfilename(cli->tree, fnum, &pname))) { + printf("ERROR: qfilename failed (%s)\n", smbcli_errstr(cli->tree)); correct = False; - goto fail; } - if (NT_STATUS_IS_ERR(cli_close(cli2->tree, fnum2))) { - printf("[8] close - 2 failed (%s)\n", cli_errstr(cli2->tree)); + if (!pname || strcmp(pname, fname)) { + printf("qfilename gave different name? [%s] [%s]\n", + fname, pname); correct = False; - goto fail; } - /* This should fail.. */ - fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_NONE); - if (fnum1 != -1) { - printf("[8] open of %s succeeded should have been deleted on close !\n", fname); - goto fail; - correct = False; - } else - printf("eighth delete on close test succeeded.\n"); + smbcli_close(cli->tree, fnum); + smbcli_unlink(cli->tree, fname); - /* This should fail - we need to set DELETE_ACCESS. */ - fnum1 = cli_nt_create_full(cli1->tree, fname, 0,SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA, - FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0); - - if (fnum1 != -1) { - printf("[9] open of %s succeeded should have failed!\n", fname); - correct = False; - goto fail; + fnum = smbcli_open(cli->tree, fname, + O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); + if (fnum == -1) { + printf("open of %s failed (%s)\n", fname, smbcli_errstr(cli->tree)); + return False; } + smbcli_close(cli->tree, fnum); - printf("ninth delete on close test succeeded.\n"); + printf("Checking for sticky create times\n"); - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|STD_RIGHT_DELETE_ACCESS, - FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, NTCREATEX_OPTIONS_DELETE_ON_CLOSE, 0); - if (fnum1 == -1) { - printf("[10] open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_qpathinfo(cli->tree, fname, &c_time, &a_time, &m_time, &size, NULL))) { + printf("ERROR: qpathinfo failed (%s)\n", smbcli_errstr(cli->tree)); correct = False; - goto fail; + } else { + if (c_time != m_time) { + printf("create time=%s", ctime(&c_time)); + printf("modify time=%s", ctime(&m_time)); + printf("This system appears to have sticky create times\n"); + } + if (a_time % (60*60) == 0) { + printf("access time=%s", ctime(&a_time)); + printf("This system appears to set a midnight access time\n"); + correct = False; + } + + if (abs(m_time - time(NULL)) > 60*60*24*7) { + printf("ERROR: totally incorrect times - maybe word reversed? mtime=%s", ctime(&m_time)); + correct = False; + } } - /* This should delete the file. */ - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("[10] close failed (%s)\n", cli_errstr(cli1->tree)); + + smbcli_unlink(cli->tree, fname); + fnum = smbcli_open(cli->tree, fname, + O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); + smbcli_close(cli->tree, fnum); + if (NT_STATUS_IS_ERR(smbcli_qpathinfo2(cli->tree, fname, &c_time, &a_time, &m_time, &w_time, &size, NULL, NULL))) { + printf("ERROR: qpathinfo2 failed (%s)\n", smbcli_errstr(cli->tree)); correct = False; - goto fail; + } else { + if (w_time < 60*60*24*2) { + printf("write time=%s", ctime(&w_time)); + printf("This system appears to set a initial 0 write time\n"); + correct = False; + } } - /* This should fail.. */ - fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_NONE); - if (fnum1 != -1) { - printf("[10] open of %s succeeded should have been deleted on close !\n", fname); - goto fail; - correct = False; - } else - printf("tenth delete on close test succeeded.\n"); - printf("finished delete test\n"); - - fail: - /* FIXME: This will crash if we aborted before cli2 got - * intialized, because these functions don't handle - * uninitialized connections. */ - - cli_close(cli1->tree, fnum1); - cli_close(cli1->tree, fnum2); - cli_setatr(cli1->tree, fname, 0, 0); - cli_unlink(cli1->tree, fname); + smbcli_unlink(cli->tree, fname); - if (!torture_close_connection(cli1)) { + + /* check if the server updates the directory modification time + when creating a new file */ + if (NT_STATUS_IS_ERR(smbcli_mkdir(cli->tree, dname))) { + printf("ERROR: mkdir failed (%s)\n", smbcli_errstr(cli->tree)); correct = False; } - if (!torture_close_connection(cli2)) { + sleep(3); + if (NT_STATUS_IS_ERR(smbcli_qpathinfo2(cli->tree, "\\trans2\\", &c_time, &a_time, &m_time, &w_time, &size, NULL, NULL))) { + printf("ERROR: qpathinfo2 failed (%s)\n", smbcli_errstr(cli->tree)); correct = False; } - return correct; -} - - -/* - print out server properties - */ -static BOOL run_properties(int dummy) -{ - struct cli_state *cli; - BOOL correct = True; - - printf("starting properties test\n"); - - ZERO_STRUCT(cli); - if (!torture_open_connection(&cli)) { - return False; + fnum = smbcli_open(cli->tree, fname2, + O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); + smbcli_write(cli->tree, fnum, 0, &fnum, 0, sizeof(fnum)); + smbcli_close(cli->tree, fnum); + if (NT_STATUS_IS_ERR(smbcli_qpathinfo2(cli->tree, "\\trans2\\", &c_time, &a_time, &m_time2, &w_time, &size, NULL, NULL))) { + printf("ERROR: qpathinfo2 failed (%s)\n", smbcli_errstr(cli->tree)); + correct = False; + } else { + if (m_time2 == m_time) { + printf("This system does not update directory modification times\n"); + correct = False; + } } - - d_printf("Capabilities 0x%08x\n", cli->transport->negotiate.capabilities); + smbcli_unlink(cli->tree, fname2); + smbcli_rmdir(cli->tree, dname); if (!torture_close_connection(cli)) { correct = False; } + printf("trans2 test finished\n"); + return correct; } /* FIRST_DESIRED_ACCESS 0xf019f */ -#define FIRST_DESIRED_ACCESS SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA|SA_RIGHT_FILE_APPEND_DATA|\ - SA_RIGHT_FILE_READ_EA| /* 0xf */ \ - SA_RIGHT_FILE_WRITE_EA|SA_RIGHT_FILE_READ_ATTRIBUTES| /* 0x90 */ \ - SA_RIGHT_FILE_WRITE_ATTRIBUTES| /* 0x100 */ \ - STD_RIGHT_DELETE_ACCESS|STD_RIGHT_READ_CONTROL_ACCESS|\ - STD_RIGHT_WRITE_DAC_ACCESS|STD_RIGHT_WRITE_OWNER_ACCESS /* 0xf0000 */ +#define FIRST_DESIRED_ACCESS SEC_FILE_READ_DATA|SEC_FILE_WRITE_DATA|SEC_FILE_APPEND_DATA|\ + SEC_FILE_READ_EA| /* 0xf */ \ + SEC_FILE_WRITE_EA|SEC_FILE_READ_ATTRIBUTE| /* 0x90 */ \ + SEC_FILE_WRITE_ATTRIBUTE| /* 0x100 */ \ + SEC_STD_DELETE|SEC_STD_READ_CONTROL|\ + SEC_STD_WRITE_DAC|SEC_STD_WRITE_OWNER /* 0xf0000 */ /* SECOND_DESIRED_ACCESS 0xe0080 */ -#define SECOND_DESIRED_ACCESS SA_RIGHT_FILE_READ_ATTRIBUTES| /* 0x80 */ \ - STD_RIGHT_READ_CONTROL_ACCESS|STD_RIGHT_WRITE_DAC_ACCESS|\ - STD_RIGHT_WRITE_OWNER_ACCESS /* 0xe0000 */ +#define SECOND_DESIRED_ACCESS SEC_FILE_READ_ATTRIBUTE| /* 0x80 */ \ + SEC_STD_READ_CONTROL|SEC_STD_WRITE_DAC|\ + SEC_STD_WRITE_OWNER /* 0xe0000 */ #if 0 -#define THIRD_DESIRED_ACCESS FILE_READ_ATTRIBUTES| /* 0x80 */ \ - READ_CONTROL_ACCESS|WRITE_DAC_ACCESS|\ - SA_RIGHT_FILE_READ_DATA|\ - WRITE_OWNER_ACCESS /* */ +#define THIRD_DESIRED_ACCESS FILE_READ_ATTRIBUTE| /* 0x80 */ \ + READ_CONTROL|WRITE_DAC|\ + SEC_FILE_READ_DATA|\ + WRITE_OWNER /* */ #endif /* Test ntcreate calls made by xcopy */ -static BOOL run_xcopy(int dummy) +static BOOL run_xcopy(void) { - struct cli_state *cli1; + struct smbcli_state *cli1; const char *fname = "\\test.txt"; BOOL correct = True; int fnum1, fnum2; @@ -2555,22 +1329,24 @@ static BOOL run_xcopy(int dummy) return False; } - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, - FIRST_DESIRED_ACCESS, FILE_ATTRIBUTE_ARCHIVE, - NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, - 0x4044, 0); + fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, + FIRST_DESIRED_ACCESS, + FILE_ATTRIBUTE_ARCHIVE, + NTCREATEX_SHARE_ACCESS_NONE, + NTCREATEX_DISP_OVERWRITE_IF, + 0x4044, 0); if (fnum1 == -1) { - printf("First open failed - %s\n", cli_errstr(cli1->tree)); + printf("First open failed - %s\n", smbcli_errstr(cli1->tree)); return False; } - fnum2 = cli_nt_create_full(cli1->tree, fname, 0, + fnum2 = smbcli_nt_create_full(cli1->tree, fname, 0, SECOND_DESIRED_ACCESS, 0, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE|NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN, 0x200000, 0); if (fnum2 == -1) { - printf("second open failed - %s\n", cli_errstr(cli1->tree)); + printf("second open failed - %s\n", smbcli_errstr(cli1->tree)); return False; } @@ -2581,131 +1357,13 @@ static BOOL run_xcopy(int dummy) return correct; } -/* - Test rename on files open with share delete and no share delete. - */ -static BOOL run_rename(int dummy) -{ - struct cli_state *cli1; - const char *fname = "\\test.txt"; - const char *fname1 = "\\test1.txt"; - BOOL correct = True; - int fnum1; - - printf("starting rename test\n"); - - if (!torture_open_connection(&cli1)) { - return False; - } - - cli_unlink(cli1->tree, fname); - cli_unlink(cli1->tree, fname1); - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL, - NTCREATEX_SHARE_ACCESS_READ, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); - - if (fnum1 == -1) { - printf("First open failed - %s\n", cli_errstr(cli1->tree)); - return False; - } - - if (NT_STATUS_IS_ERR(cli_rename(cli1->tree, fname, fname1))) { - printf("First rename failed (this is correct) - %s\n", cli_errstr(cli1->tree)); - } else { - printf("First rename succeeded - this should have failed !\n"); - correct = False; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("close - 1 failed (%s)\n", cli_errstr(cli1->tree)); - return False; - } - - cli_unlink(cli1->tree, fname); - cli_unlink(cli1->tree, fname1); - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL, -#if 0 - NTCREATEX_SHARE_ACCESS_DELETE|NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); -#else - NTCREATEX_SHARE_ACCESS_DELETE|NTCREATEX_SHARE_ACCESS_READ, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); -#endif - - if (fnum1 == -1) { - printf("Second open failed - %s\n", cli_errstr(cli1->tree)); - return False; - } - - if (NT_STATUS_IS_ERR(cli_rename(cli1->tree, fname, fname1))) { - printf("Second rename failed - this should have succeeded - %s\n", cli_errstr(cli1->tree)); - correct = False; - } else { - printf("Second rename succeeded\n"); - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("close - 2 failed (%s)\n", cli_errstr(cli1->tree)); - return False; - } - - cli_unlink(cli1->tree, fname); - cli_unlink(cli1->tree, fname1); - - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, STD_RIGHT_READ_CONTROL_ACCESS, FILE_ATTRIBUTE_NORMAL, - NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); - - if (fnum1 == -1) { - printf("Third open failed - %s\n", cli_errstr(cli1->tree)); - return False; - } - - -#if 0 - { - int fnum2; - - fnum2 = cli_nt_create_full(cli1->tree, fname, 0, DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL, - NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); - - if (fnum2 == -1) { - printf("Fourth open failed - %s\n", cli_errstr(cli1->tree)); - return False; - } - if (!cli_nt_delete_on_close(cli1->tree, fnum2, True)) { - printf("[8] setting delete_on_close on file failed !\n"); - return False; - } - - if (!cli_close(cli1->tree, fnum2)) { - printf("close - 4 failed (%s)\n", cli_errstr(cli1->tree)); - return False; - } - } -#endif - - if (NT_STATUS_IS_ERR(cli_rename(cli1->tree, fname, fname1))) { - printf("Third rename failed - this should have succeeded - %s\n", cli_errstr(cli1->tree)); - correct = False; - } else { - printf("Third rename succeeded\n"); - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("close - 3 failed (%s)\n", cli_errstr(cli1->tree)); - return False; - } - cli_unlink(cli1->tree, fname); - cli_unlink(cli1->tree, fname1); - - if (!torture_close_connection(cli1)) { - correct = False; - } - - return correct; -} - -static BOOL run_pipe_number(int dummy) +/* + see how many RPC pipes we can open at once +*/ +static BOOL run_pipe_number(void) { - struct cli_state *cli1; + struct smbcli_state *cli1; const char *pipe_name = "\\WKSSVC"; int fnum; int num_pipes = 0; @@ -2716,14 +1374,16 @@ static BOOL run_pipe_number(int dummy) } while(1) { - fnum = cli_nt_create_full(cli1->tree, pipe_name, 0, SA_RIGHT_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, + fnum = smbcli_nt_create_full(cli1->tree, pipe_name, 0, SEC_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum == -1) { - printf("Open of pipe %s failed with error (%s)\n", pipe_name, cli_errstr(cli1->tree)); + printf("Open of pipe %s failed with error (%s)\n", pipe_name, smbcli_errstr(cli1->tree)); break; } num_pipes++; + printf("%d\r", num_pipes); + fflush(stdout); } printf("pipe_number test - we can open %d %s pipes.\n", num_pipes, pipe_name ); @@ -2739,15 +1399,15 @@ static BOOL run_pipe_number(int dummy) used for testing performance when there are N idle users already connected */ - static BOOL torture_holdcon(int dummy) + static BOOL torture_holdcon(void) { int i; - struct cli_state **cli; + struct smbcli_state **cli; int num_dead = 0; printf("Opening %d connections\n", torture_numops); - cli = malloc(sizeof(struct cli_state *) * torture_numops); + cli = malloc_array_p(struct smbcli_state *, torture_numops); for (i=0;itree, "\\"); + status = smbcli_chkpath(cli[i]->tree, "\\"); if (!NT_STATUS_IS_OK(status)) { printf("Connection %d is dead\n", i); cli[i] = NULL; @@ -2789,13 +1449,13 @@ static BOOL run_pipe_number(int dummy) Try with a wrong vuid and check error message. */ -static BOOL run_vuidtest(int dummy) +static BOOL run_vuidtest(void) { - struct cli_state *cli; + struct smbcli_state *cli; const char *fname = "\\vuid.tst"; int fnum; size_t size; - time_t c_time, a_time, m_time, w_time, m_time2; + time_t c_time, a_time, m_time; BOOL correct = True; uint16_t orig_vuid; @@ -2807,9 +1467,9 @@ static BOOL run_vuidtest(int dummy) return False; } - cli_unlink(cli->tree, fname); + smbcli_unlink(cli->tree, fname); - fnum = cli_open(cli->tree, fname, + fnum = smbcli_open(cli->tree, fname, O_RDWR | O_CREAT | O_TRUNC, DENY_NONE); orig_vuid = cli->session->vuid; @@ -2818,7 +1478,7 @@ static BOOL run_vuidtest(int dummy) printf("Testing qfileinfo with wrong vuid\n"); - if (NT_STATUS_IS_OK(result = cli_qfileinfo(cli->tree, fnum, NULL, + if (NT_STATUS_IS_OK(result = smbcli_qfileinfo(cli->tree, fnum, NULL, &size, &c_time, &a_time, &m_time, NULL, NULL))) { printf("ERROR: qfileinfo passed with wrong vuid\n"); @@ -2830,18 +1490,18 @@ static BOOL run_vuidtest(int dummy) (cli->transport->error.e.dos.ecode != ERRbaduid) ) { printf("ERROR: qfileinfo should have returned DOS error " "ERRSRV:ERRbaduid\n but returned %s\n", - cli_errstr(cli->tree)); + smbcli_errstr(cli->tree)); correct = False; } cli->session->vuid -= 1234; - if (NT_STATUS_IS_ERR(cli_close(cli->tree, fnum))) { - printf("close failed (%s)\n", cli_errstr(cli->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli->tree, fnum))) { + printf("close failed (%s)\n", smbcli_errstr(cli->tree)); correct = False; } - cli_unlink(cli->tree, fname); + smbcli_unlink(cli->tree, fname); if (!torture_close_connection(cli)) { correct = False; @@ -2855,13 +1515,13 @@ static BOOL run_vuidtest(int dummy) /* Test open mode returns on read-only files. */ - static BOOL run_opentest(int dummy) + static BOOL run_opentest(void) { - static struct cli_state *cli1; - static struct cli_state *cli2; + static struct smbcli_state *cli1; + static struct smbcli_state *cli2; const char *fname = "\\readonly.file"; int fnum1, fnum2; - char buf[20]; + uint8_t buf[20]; size_t fsize; BOOL correct = True; char *tmp_path; @@ -2873,77 +1533,77 @@ static BOOL run_vuidtest(int dummy) return False; } - cli_setatr(cli1->tree, fname, 0, 0); - cli_unlink(cli1->tree, fname); + smbcli_setatr(cli1->tree, fname, 0, 0); + smbcli_unlink(cli1->tree, fname); - fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); + fnum1 = smbcli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); if (fnum1 == -1) { - printf("open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + printf("open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return False; } - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("close2 failed (%s)\n", cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { + printf("close2 failed (%s)\n", smbcli_errstr(cli1->tree)); return False; } - if (NT_STATUS_IS_ERR(cli_setatr(cli1->tree, fname, FILE_ATTRIBUTE_READONLY, 0))) { - printf("cli_setatr failed (%s)\n", cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_setatr(cli1->tree, fname, FILE_ATTRIBUTE_READONLY, 0))) { + printf("smbcli_setatr failed (%s)\n", smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test1); return False; } - fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_WRITE); + fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY, DENY_WRITE); if (fnum1 == -1) { - printf("open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + printf("open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test1); return False; } /* This will fail - but the error should be ERRnoaccess, not ERRbadshare. */ - fnum2 = cli_open(cli1->tree, fname, O_RDWR, DENY_ALL); + fnum2 = smbcli_open(cli1->tree, fname, O_RDWR, DENY_ALL); - if (check_error(__LINE__, cli1, ERRDOS, ERRnoaccess, + if (check_error(__location__, cli1, ERRDOS, ERRnoaccess, NT_STATUS_ACCESS_DENIED)) { printf("correct error code ERRDOS/ERRnoaccess returned\n"); } printf("finished open test 1\n"); error_test1: - cli_close(cli1->tree, fnum1); + smbcli_close(cli1->tree, fnum1); /* Now try not readonly and ensure ERRbadshare is returned. */ - cli_setatr(cli1->tree, fname, 0, 0); + smbcli_setatr(cli1->tree, fname, 0, 0); - fnum1 = cli_open(cli1->tree, fname, O_RDONLY, DENY_WRITE); + fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY, DENY_WRITE); if (fnum1 == -1) { - printf("open of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + printf("open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return False; } /* This will fail - but the error should be ERRshare. */ - fnum2 = cli_open(cli1->tree, fname, O_RDWR, DENY_ALL); + fnum2 = smbcli_open(cli1->tree, fname, O_RDWR, DENY_ALL); - if (check_error(__LINE__, cli1, ERRDOS, ERRbadshare, + if (check_error(__location__, cli1, ERRDOS, ERRbadshare, NT_STATUS_SHARING_VIOLATION)) { printf("correct error code ERRDOS/ERRbadshare returned\n"); } - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("close2 failed (%s)\n", cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { + printf("close2 failed (%s)\n", smbcli_errstr(cli1->tree)); return False; } - cli_unlink(cli1->tree, fname); + smbcli_unlink(cli1->tree, fname); printf("finished open test 2\n"); /* Test truncate open disposition on file opened for read. */ - fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); + fnum1 = smbcli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); if (fnum1 == -1) { - printf("(3) open (1) of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + printf("(3) open (1) of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return False; } @@ -2951,19 +1611,19 @@ error_test1: memset(buf, '\0', 20); - if (cli_write(cli1->tree, fnum1, 0, buf, 0, 20) != 20) { - printf("write failed (%s)\n", cli_errstr(cli1->tree)); + if (smbcli_write(cli1->tree, fnum1, 0, buf, 0, 20) != 20) { + printf("write failed (%s)\n", smbcli_errstr(cli1->tree)); correct = False; } - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("(3) close1 failed (%s)\n", cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { + printf("(3) close1 failed (%s)\n", smbcli_errstr(cli1->tree)); return False; } /* Ensure size == 20. */ - if (NT_STATUS_IS_ERR(cli_getatr(cli1->tree, fname, NULL, &fsize, NULL))) { - printf("(3) getatr failed (%s)\n", cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_getatr(cli1->tree, fname, NULL, &fsize, NULL))) { + printf("(3) getatr failed (%s)\n", smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test3); return False; } @@ -2976,21 +1636,21 @@ error_test1: /* Now test if we can truncate a file opened for readonly. */ - fnum1 = cli_open(cli1->tree, fname, O_RDONLY|O_TRUNC, DENY_NONE); + fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY|O_TRUNC, DENY_NONE); if (fnum1 == -1) { - printf("(3) open (2) of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + printf("(3) open (2) of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test3); return False; } - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("close2 failed (%s)\n", cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { + printf("close2 failed (%s)\n", smbcli_errstr(cli1->tree)); return False; } /* Ensure size == 0. */ - if (NT_STATUS_IS_ERR(cli_getatr(cli1->tree, fname, NULL, &fsize, NULL))) { - printf("(3) getatr failed (%s)\n", cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_getatr(cli1->tree, fname, NULL, &fsize, NULL))) { + printf("(3) getatr failed (%s)\n", smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test3); return False; } @@ -3002,22 +1662,22 @@ error_test1: } printf("finished open test 3\n"); error_test3: - cli_unlink(cli1->tree, fname); + smbcli_unlink(cli1->tree, fname); printf("testing ctemp\n"); - fnum1 = cli_ctemp(cli1->tree, "\\", &tmp_path); + fnum1 = smbcli_ctemp(cli1->tree, "\\", &tmp_path); if (fnum1 == -1) { - printf("ctemp failed (%s)\n", cli_errstr(cli1->tree)); + printf("ctemp failed (%s)\n", smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test4); return False; } printf("ctemp gave path %s\n", tmp_path); - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("close of temp failed (%s)\n", cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { + printf("close of temp failed (%s)\n", smbcli_errstr(cli1->tree)); } - if (NT_STATUS_IS_ERR(cli_unlink(cli1->tree, tmp_path))) { - printf("unlink of temp failed (%s)\n", cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_unlink(cli1->tree, tmp_path))) { + printf("unlink of temp failed (%s)\n", smbcli_errstr(cli1->tree)); } error_test4: /* Test the non-io opens... */ @@ -3026,165 +1686,165 @@ error_test4: return False; } - cli_setatr(cli2->tree, fname, 0, 0); - cli_unlink(cli2->tree, fname); + smbcli_setatr(cli2->tree, fname, 0, 0); + smbcli_unlink(cli2->tree, fname); printf("TEST #1 testing 2 non-io opens (no delete)\n"); - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - printf("test 1 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + printf("test 1 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test10); return False; } - fnum2 = cli_nt_create_full(cli2->tree, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + fnum2 = smbcli_nt_create_full(cli2->tree, fname, 0, SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 == -1) { - printf("test 1 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree)); + printf("test 1 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test10); return False; } - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { + printf("test 1 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return False; } - if (NT_STATUS_IS_ERR(cli_close(cli2->tree, fnum2))) { - printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) { + printf("test 1 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); return False; } printf("non-io open test #1 passed.\n"); error_test10: - cli_unlink(cli1->tree, fname); + smbcli_unlink(cli1->tree, fname); printf("TEST #2 testing 2 non-io opens (first with delete)\n"); - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_STD_DELETE|SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - printf("test 2 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + printf("test 2 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test20); return False; } - fnum2 = cli_nt_create_full(cli2->tree, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + fnum2 = smbcli_nt_create_full(cli2->tree, fname, 0, SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 == -1) { - printf("test 2 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree)); + printf("test 2 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test20); return False; } - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { + printf("test 1 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return False; } - if (NT_STATUS_IS_ERR(cli_close(cli2->tree, fnum2))) { - printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) { + printf("test 1 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return False; } printf("non-io open test #2 passed.\n"); error_test20: - cli_unlink(cli1->tree, fname); + smbcli_unlink(cli1->tree, fname); printf("TEST #3 testing 2 non-io opens (second with delete)\n"); - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - printf("test 3 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + printf("test 3 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test30); return False; } - fnum2 = cli_nt_create_full(cli2->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + fnum2 = smbcli_nt_create_full(cli2->tree, fname, 0, SEC_STD_DELETE|SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 == -1) { - printf("test 3 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree)); + printf("test 3 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test30); return False; } - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("test 3 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { + printf("test 3 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return False; } - if (NT_STATUS_IS_ERR(cli_close(cli2->tree, fnum2))) { - printf("test 3 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) { + printf("test 3 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); return False; } printf("non-io open test #3 passed.\n"); error_test30: - cli_unlink(cli1->tree, fname); + smbcli_unlink(cli1->tree, fname); printf("TEST #4 testing 2 non-io opens (both with delete)\n"); - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_STD_DELETE|SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - printf("test 4 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + printf("test 4 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test40); return False; } - fnum2 = cli_nt_create_full(cli2->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + fnum2 = smbcli_nt_create_full(cli2->tree, fname, 0, SEC_STD_DELETE|SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 != -1) { - printf("test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2->tree)); + printf("test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test40); return False; } - printf("test 4 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2->tree), "sharing violation"); + printf("test 4 open 2 of %s gave %s (correct error should be %s)\n", fname, smbcli_errstr(cli2->tree), "sharing violation"); - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("test 4 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { + printf("test 4 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return False; } printf("non-io open test #4 passed.\n"); error_test40: - cli_unlink(cli1->tree, fname); + smbcli_unlink(cli1->tree, fname); printf("TEST #5 testing 2 non-io opens (both with delete - both with file share delete)\n"); - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_STD_DELETE|SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - printf("test 5 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + printf("test 5 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test50); return False; } - fnum2 = cli_nt_create_full(cli2->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + fnum2 = smbcli_nt_create_full(cli2->tree, fname, 0, SEC_STD_DELETE|SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 == -1) { - printf("test 5 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree)); + printf("test 5 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test50); return False; } - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("test 5 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { + printf("test 5 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return False; } - if (NT_STATUS_IS_ERR(cli_close(cli2->tree, fnum2))) { - printf("test 5 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) { + printf("test 5 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); return False; } @@ -3192,33 +1852,33 @@ error_test40: error_test50: printf("TEST #6 testing 1 non-io open, one io open\n"); - cli_unlink(cli1->tree, fname); + smbcli_unlink(cli1->tree, fname); - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, + fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - printf("test 6 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + printf("test 6 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test60); return False; } - fnum2 = cli_nt_create_full(cli2->tree, fname, 0, SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + fnum2 = smbcli_nt_create_full(cli2->tree, fname, 0, SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 == -1) { - printf("test 6 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree)); + printf("test 6 open 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test60); return False; } - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("test 6 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { + printf("test 6 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return False; } - if (NT_STATUS_IS_ERR(cli_close(cli2->tree, fnum2))) { - printf("test 6 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) { + printf("test 6 close 2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree)); return False; } @@ -3226,30 +1886,30 @@ error_test50: error_test60: printf("TEST #7 testing 1 non-io open, one io open with delete\n"); - cli_unlink(cli1->tree, fname); + smbcli_unlink(cli1->tree, fname); - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, + fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SEC_FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { - printf("test 7 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + printf("test 7 open 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); CHECK_MAX_FAILURES(error_test70); return False; } - fnum2 = cli_nt_create_full(cli2->tree, fname, 0, STD_RIGHT_DELETE_ACCESS|SA_RIGHT_FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + fnum2 = smbcli_nt_create_full(cli2->tree, fname, 0, SEC_STD_DELETE|SEC_FILE_READ_ATTRIBUTE, FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_DELETE, NTCREATEX_DISP_OPEN_IF, 0, 0); if (fnum2 != -1) { - printf("test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2->tree)); + printf("test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, smbcli_errstr(cli2->tree)); CHECK_MAX_FAILURES(error_test70); return False; } - printf("test 7 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2->tree), "sharing violation"); + printf("test 7 open 2 of %s gave %s (correct error should be %s)\n", fname, smbcli_errstr(cli2->tree), "sharing violation"); - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("test 7 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { + printf("test 7 close 1 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return False; } @@ -3259,11 +1919,11 @@ error_test70: printf("TEST #8 testing one normal open, followed by lock, followed by open with truncate\n"); - cli_unlink(cli1->tree, fname); + smbcli_unlink(cli1->tree, fname); - fnum1 = cli_open(cli1->tree, fname, O_RDWR|O_CREAT, DENY_NONE); + fnum1 = smbcli_open(cli1->tree, fname, O_RDWR|O_CREAT, DENY_NONE); if (fnum1 == -1) { - printf("(8) open (1) of %s failed (%s)\n", fname, cli_errstr(cli1->tree)); + printf("(8) open (1) of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree)); return False; } @@ -3271,331 +1931,83 @@ error_test70: memset(buf, '\0', 20); - if (cli_write(cli1->tree, fnum1, 0, buf, 0, 20) != 20) { - printf("(8) write failed (%s)\n", cli_errstr(cli1->tree)); - correct = False; - } - - /* Ensure size == 20. */ - if (NT_STATUS_IS_ERR(cli_getatr(cli1->tree, fname, NULL, &fsize, NULL))) { - printf("(8) getatr (1) failed (%s)\n", cli_errstr(cli1->tree)); - CHECK_MAX_FAILURES(error_test80); - return False; - } - - if (fsize != 20) { - printf("(8) file size != 20\n"); - CHECK_MAX_FAILURES(error_test80); - return False; - } - - /* Get an exclusive lock on the open file. */ - if (NT_STATUS_IS_ERR(cli_lock(cli1->tree, fnum1, 0, 4, 0, WRITE_LOCK))) { - printf("(8) lock1 failed (%s)\n", cli_errstr(cli1->tree)); - CHECK_MAX_FAILURES(error_test80); - return False; - } - - fnum2 = cli_open(cli1->tree, fname, O_RDWR|O_TRUNC, DENY_NONE); - if (fnum1 == -1) { - printf("(8) open (2) of %s with truncate failed (%s)\n", fname, cli_errstr(cli1->tree)); - return False; - } - - /* Ensure size == 0. */ - if (NT_STATUS_IS_ERR(cli_getatr(cli1->tree, fname, NULL, &fsize, NULL))) { - printf("(8) getatr (2) failed (%s)\n", cli_errstr(cli1->tree)); - CHECK_MAX_FAILURES(error_test80); - return False; - } - - if (fsize != 0) { - printf("(8) file size != 0\n"); - CHECK_MAX_FAILURES(error_test80); - return False; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("(8) close1 failed (%s)\n", cli_errstr(cli1->tree)); - return False; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum2))) { - printf("(8) close1 failed (%s)\n", cli_errstr(cli1->tree)); - return False; - } - -error_test80: - - printf("open test #8 passed.\n"); - - cli_unlink(cli1->tree, fname); - - if (!torture_close_connection(cli1)) { - correct = False; - } - if (!torture_close_connection(cli2)) { - correct = False; - } - - return correct; -} - - -static uint32_t open_attrs_table[] = { - FILE_ATTRIBUTE_NORMAL, - FILE_ATTRIBUTE_ARCHIVE, - FILE_ATTRIBUTE_READONLY, - FILE_ATTRIBUTE_HIDDEN, - FILE_ATTRIBUTE_SYSTEM, - - FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, - FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN, - FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM, - FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN, - FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM, - FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM, - - FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN, - FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM, - FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM, - FILE_ATTRIBUTE_HIDDEN,FILE_ATTRIBUTE_SYSTEM, -}; - -struct trunc_open_results { - uint_t num; - uint32_t init_attr; - uint32_t trunc_attr; - uint32_t result_attr; -}; - -static struct trunc_open_results attr_results[] = { - { 0, FILE_ATTRIBUTE_NORMAL, FILE_ATTRIBUTE_NORMAL, FILE_ATTRIBUTE_ARCHIVE }, - { 1, FILE_ATTRIBUTE_NORMAL, FILE_ATTRIBUTE_ARCHIVE, FILE_ATTRIBUTE_ARCHIVE }, - { 2, FILE_ATTRIBUTE_NORMAL, FILE_ATTRIBUTE_READONLY, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY }, - { 16, FILE_ATTRIBUTE_ARCHIVE, FILE_ATTRIBUTE_NORMAL, FILE_ATTRIBUTE_ARCHIVE }, - { 17, FILE_ATTRIBUTE_ARCHIVE, FILE_ATTRIBUTE_ARCHIVE, FILE_ATTRIBUTE_ARCHIVE }, - { 18, FILE_ATTRIBUTE_ARCHIVE, FILE_ATTRIBUTE_READONLY, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY }, - { 51, FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN }, - { 54, FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN }, - { 56, FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN }, - { 68, FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM }, - { 71, FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM }, - { 73, FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM }, - { 99, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_HIDDEN,FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN }, - { 102, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN }, - { 104, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN }, - { 116, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM }, - { 119, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM }, - { 121, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM }, - { 170, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_HIDDEN }, - { 173, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM }, - { 227, FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN }, - { 230, FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN }, - { 232, FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_HIDDEN }, - { 244, FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM }, - { 247, FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_SYSTEM }, - { 249, FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM } -}; - -static BOOL run_openattrtest(int dummy) -{ - struct cli_state *cli1; - const char *fname = "\\openattr.file"; - int fnum1; - BOOL correct = True; - uint16_t attr; - uint_t i, j, k, l; - int failures = 0; - - printf("starting open attr test\n"); - - if (!torture_open_connection(&cli1)) { - return False; - } - - for (k = 0, i = 0; i < sizeof(open_attrs_table)/sizeof(uint32_t); i++) { - cli_setatr(cli1->tree, fname, 0, 0); - cli_unlink(cli1->tree, fname); - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_WRITE_DATA, open_attrs_table[i], - NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); - - if (fnum1 == -1) { - printf("open %d (1) of %s failed (%s)\n", i, fname, cli_errstr(cli1->tree)); - return False; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("close %d (1) of %s failed (%s)\n", i, fname, cli_errstr(cli1->tree)); - return False; - } - - for (j = 0; j < ARRAY_SIZE(open_attrs_table); j++) { - fnum1 = cli_nt_create_full(cli1->tree, fname, 0, - SA_RIGHT_FILE_READ_DATA|SA_RIGHT_FILE_WRITE_DATA, - open_attrs_table[j], - NTCREATEX_SHARE_ACCESS_NONE, - NTCREATEX_DISP_OVERWRITE, 0, 0); - - if (fnum1 == -1) { - for (l = 0; l < ARRAY_SIZE(attr_results); l++) { - if (attr_results[l].num == k) { - printf("[%d] trunc open 0x%x -> 0x%x of %s failed - should have succeeded !(0x%x:%s)\n", - k, open_attrs_table[i], - open_attrs_table[j], - fname, NT_STATUS_V(cli_nt_error(cli1->tree)), cli_errstr(cli1->tree)); - correct = False; - CHECK_MAX_FAILURES(error_exit); - } - } - if (NT_STATUS_V(cli_nt_error(cli1->tree)) != NT_STATUS_V(NT_STATUS_ACCESS_DENIED)) { - printf("[%d] trunc open 0x%x -> 0x%x failed with wrong error code %s\n", - k, open_attrs_table[i], open_attrs_table[j], - cli_errstr(cli1->tree)); - correct = False; - CHECK_MAX_FAILURES(error_exit); - } -#if 0 - printf("[%d] trunc open 0x%x -> 0x%x failed\n", k, open_attrs_table[i], open_attrs_table[j]); -#endif - k++; - continue; - } - - if (NT_STATUS_IS_ERR(cli_close(cli1->tree, fnum1))) { - printf("close %d (2) of %s failed (%s)\n", j, fname, cli_errstr(cli1->tree)); - return False; - } - - if (NT_STATUS_IS_ERR(cli_getatr(cli1->tree, fname, &attr, NULL, NULL))) { - printf("getatr(2) failed (%s)\n", cli_errstr(cli1->tree)); - return False; - } - -#if 0 - printf("[%d] getatr check [0x%x] trunc [0x%x] got attr 0x%x\n", - k, open_attrs_table[i], open_attrs_table[j], attr ); -#endif - - for (l = 0; l < ARRAY_SIZE(attr_results); l++) { - if (attr_results[l].num == k) { - if (attr != attr_results[l].result_attr || - open_attrs_table[i] != attr_results[l].init_attr || - open_attrs_table[j] != attr_results[l].trunc_attr) { - printf("[%d] getatr check failed. [0x%x] trunc [0x%x] got attr 0x%x, should be 0x%x\n", - k, open_attrs_table[i], - open_attrs_table[j], - (uint_t)attr, - attr_results[l].result_attr); - correct = False; - CHECK_MAX_FAILURES(error_exit); - } - break; - } - } - k++; - } - } -error_exit: - cli_setatr(cli1->tree, fname, 0, 0); - cli_unlink(cli1->tree, fname); - - printf("open attr test %s.\n", correct ? "passed" : "failed"); - - if (!torture_close_connection(cli1)) { + if (smbcli_write(cli1->tree, fnum1, 0, buf, 0, 20) != 20) { + printf("(8) write failed (%s)\n", smbcli_errstr(cli1->tree)); correct = False; } - return correct; -} -static void list_fn(file_info *finfo, const char *name, void *state) -{ + /* Ensure size == 20. */ + if (NT_STATUS_IS_ERR(smbcli_getatr(cli1->tree, fname, NULL, &fsize, NULL))) { + printf("(8) getatr (1) failed (%s)\n", smbcli_errstr(cli1->tree)); + CHECK_MAX_FAILURES(error_test80); + return False; + } -} - -/* - test directory listing speed - */ -static BOOL run_dirtest(int dummy) -{ - int i; - struct cli_state *cli; - int fnum; - double t1; - BOOL correct = True; - - printf("starting directory test\n"); + if (fsize != 20) { + printf("(8) file size != 20\n"); + CHECK_MAX_FAILURES(error_test80); + return False; + } - if (!torture_open_connection(&cli)) { + /* Get an exclusive lock on the open file. */ + if (NT_STATUS_IS_ERR(smbcli_lock(cli1->tree, fnum1, 0, 4, 0, WRITE_LOCK))) { + printf("(8) lock1 failed (%s)\n", smbcli_errstr(cli1->tree)); + CHECK_MAX_FAILURES(error_test80); return False; } - printf("Creating %d random filenames\n", torture_numops); + fnum2 = smbcli_open(cli1->tree, fname, O_RDWR|O_TRUNC, DENY_NONE); + if (fnum1 == -1) { + printf("(8) open (2) of %s with truncate failed (%s)\n", fname, smbcli_errstr(cli1->tree)); + return False; + } - srandom(0); - for (i=0;itree, fname, O_RDWR|O_CREAT, DENY_NONE); - if (fnum == -1) { - fprintf(stderr,"Failed to open %s\n", fname); - return False; - } - cli_close(cli->tree, fnum); - free(fname); + /* Ensure size == 0. */ + if (NT_STATUS_IS_ERR(smbcli_getatr(cli1->tree, fname, NULL, &fsize, NULL))) { + printf("(8) getatr (2) failed (%s)\n", smbcli_errstr(cli1->tree)); + CHECK_MAX_FAILURES(error_test80); + return False; + } + + if (fsize != 0) { + printf("(8) file size != 0\n"); + CHECK_MAX_FAILURES(error_test80); + return False; } - t1 = end_timer(); + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) { + printf("(8) close1 failed (%s)\n", smbcli_errstr(cli1->tree)); + return False; + } + + if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum2))) { + printf("(8) close1 failed (%s)\n", smbcli_errstr(cli1->tree)); + return False; + } + +error_test80: - printf("Matched %d\n", cli_list(cli->tree, "a*.*", 0, list_fn, NULL)); - printf("Matched %d\n", cli_list(cli->tree, "b*.*", 0, list_fn, NULL)); - printf("Matched %d\n", cli_list(cli->tree, "xyzabc", 0, list_fn, NULL)); + printf("open test #8 passed.\n"); - printf("dirtest core %g seconds\n", end_timer() - t1); + smbcli_unlink(cli1->tree, fname); - srandom(0); - for (i=0;itree, fname); - free(fname); + if (!torture_close_connection(cli1)) { + correct = False; } - - if (!torture_close_connection(cli)) { + if (!torture_close_connection(cli2)) { correct = False; } - - printf("finished dirtest\n"); - + return correct; } -static void del_fn(file_info *finfo, const char *mask, void *state) -{ - struct cli_state *pcli = (struct cli_state *)state; - char *fname; - asprintf(&fname, "\\LISTDIR\\%s", finfo->name); - - if (strcmp(finfo->name, ".") == 0 || strcmp(finfo->name, "..") == 0) - return; - - if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) { - if (NT_STATUS_IS_ERR(cli_rmdir(pcli->tree, fname))) - printf("del_fn: failed to rmdir %s, error=%s\n", fname, cli_errstr(pcli->tree) ); - } else { - if (NT_STATUS_IS_ERR(cli_unlink(pcli->tree, fname))) - printf("del_fn: failed to unlink %s, error=%s\n", fname, cli_errstr(pcli->tree) ); - } - free(fname); -} - /* sees what IOCTLs are supported */ -BOOL torture_ioctl_test(int dummy) +BOOL torture_ioctl_test(void) { - struct cli_state *cli; + struct smbcli_state *cli; uint16_t device, function; int fnum; const char *fname = "\\ioctl.dat"; @@ -3611,18 +2023,19 @@ BOOL torture_ioctl_test(int dummy) printf("starting ioctl test\n"); - cli_unlink(cli->tree, fname); + smbcli_unlink(cli->tree, fname); - fnum = cli_open(cli->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); + fnum = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); if (fnum == -1) { - printf("open of %s failed (%s)\n", fname, cli_errstr(cli->tree)); + printf("open of %s failed (%s)\n", fname, smbcli_errstr(cli->tree)); return False; } parms.ioctl.level = RAW_IOCTL_IOCTL; + parms.ioctl.in.fnum = fnum; parms.ioctl.in.request = IOCTL_QUERY_JOB_INFO; status = smb_raw_ioctl(cli->tree, mem_ctx, &parms); - printf("ioctl job info: %s\n", cli_errstr(cli->tree)); + printf("ioctl job info: %s\n", smbcli_errstr(cli->tree)); for (device=0;device<0x100;device++) { printf("testing device=0x%x\n", device); @@ -3648,9 +2061,9 @@ BOOL torture_ioctl_test(int dummy) /* tries variants of chkpath */ -BOOL torture_chkpath_test(int dummy) +BOOL torture_chkpath_test(void) { - struct cli_state *cli; + struct smbcli_state *cli; int fnum; BOOL ret; @@ -3663,64 +2076,64 @@ BOOL torture_chkpath_test(int dummy) printf("Testing valid and invalid paths\n"); /* cleanup from an old run */ - cli_rmdir(cli->tree, "\\chkpath.dir\\dir2"); - cli_unlink(cli->tree, "\\chkpath.dir\\*"); - cli_rmdir(cli->tree, "\\chkpath.dir"); + smbcli_rmdir(cli->tree, "\\chkpath.dir\\dir2"); + smbcli_unlink(cli->tree, "\\chkpath.dir\\*"); + smbcli_rmdir(cli->tree, "\\chkpath.dir"); - if (NT_STATUS_IS_ERR(cli_mkdir(cli->tree, "\\chkpath.dir"))) { - printf("mkdir1 failed : %s\n", cli_errstr(cli->tree)); + if (NT_STATUS_IS_ERR(smbcli_mkdir(cli->tree, "\\chkpath.dir"))) { + printf("mkdir1 failed : %s\n", smbcli_errstr(cli->tree)); return False; } - if (NT_STATUS_IS_ERR(cli_mkdir(cli->tree, "\\chkpath.dir\\dir2"))) { - printf("mkdir2 failed : %s\n", cli_errstr(cli->tree)); + if (NT_STATUS_IS_ERR(smbcli_mkdir(cli->tree, "\\chkpath.dir\\dir2"))) { + printf("mkdir2 failed : %s\n", smbcli_errstr(cli->tree)); return False; } - fnum = cli_open(cli->tree, "\\chkpath.dir\\foo.txt", O_RDWR|O_CREAT|O_EXCL, DENY_NONE); + fnum = smbcli_open(cli->tree, "\\chkpath.dir\\foo.txt", O_RDWR|O_CREAT|O_EXCL, DENY_NONE); if (fnum == -1) { - printf("open1 failed (%s)\n", cli_errstr(cli->tree)); + printf("open1 failed (%s)\n", smbcli_errstr(cli->tree)); return False; } - cli_close(cli->tree, fnum); + smbcli_close(cli->tree, fnum); - if (NT_STATUS_IS_ERR(cli_chkpath(cli->tree, "\\chkpath.dir"))) { - printf("chkpath1 failed: %s\n", cli_errstr(cli->tree)); + if (NT_STATUS_IS_ERR(smbcli_chkpath(cli->tree, "\\chkpath.dir"))) { + printf("chkpath1 failed: %s\n", smbcli_errstr(cli->tree)); ret = False; } - if (NT_STATUS_IS_ERR(cli_chkpath(cli->tree, "\\chkpath.dir\\dir2"))) { - printf("chkpath2 failed: %s\n", cli_errstr(cli->tree)); + if (NT_STATUS_IS_ERR(smbcli_chkpath(cli->tree, "\\chkpath.dir\\dir2"))) { + printf("chkpath2 failed: %s\n", smbcli_errstr(cli->tree)); ret = False; } - if (NT_STATUS_IS_ERR(cli_chkpath(cli->tree, "\\chkpath.dir\\foo.txt"))) { - ret = check_error(__LINE__, cli, ERRDOS, ERRbadpath, + if (NT_STATUS_IS_ERR(smbcli_chkpath(cli->tree, "\\chkpath.dir\\foo.txt"))) { + ret = check_error(__location__, cli, ERRDOS, ERRbadpath, NT_STATUS_NOT_A_DIRECTORY); } else { printf("* chkpath on a file should fail\n"); ret = False; } - if (NT_STATUS_IS_ERR(cli_chkpath(cli->tree, "\\chkpath.dir\\bar.txt"))) { - ret = check_error(__LINE__, cli, ERRDOS, ERRbadfile, + if (NT_STATUS_IS_ERR(smbcli_chkpath(cli->tree, "\\chkpath.dir\\bar.txt"))) { + ret = check_error(__location__, cli, ERRDOS, ERRbadfile, NT_STATUS_OBJECT_NAME_NOT_FOUND); } else { printf("* chkpath on a non existent file should fail\n"); ret = False; } - if (NT_STATUS_IS_ERR(cli_chkpath(cli->tree, "\\chkpath.dir\\dirxx\\bar.txt"))) { - ret = check_error(__LINE__, cli, ERRDOS, ERRbadpath, + if (NT_STATUS_IS_ERR(smbcli_chkpath(cli->tree, "\\chkpath.dir\\dirxx\\bar.txt"))) { + ret = check_error(__location__, cli, ERRDOS, ERRbadpath, NT_STATUS_OBJECT_PATH_NOT_FOUND); } else { printf("* chkpath on a non existent component should fail\n"); ret = False; } - cli_rmdir(cli->tree, "\\chkpath.dir\\dir2"); - cli_unlink(cli->tree, "\\chkpath.dir\\*"); - cli_rmdir(cli->tree, "\\chkpath.dir"); + smbcli_rmdir(cli->tree, "\\chkpath.dir\\dir2"); + smbcli_unlink(cli->tree, "\\chkpath.dir\\*"); + smbcli_rmdir(cli->tree, "\\chkpath.dir"); if (!torture_close_connection(cli)) { return False; @@ -3729,183 +2142,12 @@ BOOL torture_chkpath_test(int dummy) return ret; } -static BOOL run_dirtest1(int dummy) -{ - int i; - struct cli_state *cli; - int fnum, num_seen; - BOOL correct = True; - - printf("starting directory test\n"); - - if (!torture_open_connection(&cli)) { - return False; - } - - cli_list(cli->tree, "\\LISTDIR\\*", 0, del_fn, cli); - cli_list(cli->tree, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, del_fn, cli); - if (cli_deltree(cli->tree, "\\LISTDIR") == -1) { - fprintf(stderr,"Failed to deltree %s, error=%s\n", "\\LISTDIR", cli_errstr(cli->tree)); - return False; - } - if (NT_STATUS_IS_ERR(cli_mkdir(cli->tree, "\\LISTDIR"))) { - fprintf(stderr,"Failed to mkdir %s, error=%s\n", "\\LISTDIR", cli_errstr(cli->tree)); - return False; - } - - printf("Creating %d files\n", torture_entries); - - /* Create torture_entries files and torture_entries directories. */ - for (i=0;itree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS, FILE_ATTRIBUTE_ARCHIVE, - NTCREATEX_SHARE_ACCESS_READ|NTCREATEX_SHARE_ACCESS_WRITE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); - if (fnum == -1) { - fprintf(stderr,"Failed to open %s, error=%s\n", fname, cli_errstr(cli->tree)); - return False; - } - free(fname); - cli_close(cli->tree, fnum); - } - for (i=0;itree, fname))) { - fprintf(stderr,"Failed to open %s, error=%s\n", fname, cli_errstr(cli->tree)); - return False; - } - free(fname); - } - - /* Now ensure that doing an old list sees both files and directories. */ - num_seen = cli_list_old(cli->tree, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, list_fn, NULL); - printf("num_seen = %d\n", num_seen ); - /* We should see (torture_entries) each of files & directories + . and .. */ - if (num_seen != (2*torture_entries)+2) { - correct = False; - fprintf(stderr,"entry count mismatch, should be %d, was %d\n", - (2*torture_entries)+2, num_seen); - } - - - /* Ensure if we have the "must have" bits we only see the - * relevant entries. - */ - num_seen = cli_list_old(cli->tree, "\\LISTDIR\\*", (FILE_ATTRIBUTE_DIRECTORY<<8)|FILE_ATTRIBUTE_DIRECTORY, list_fn, NULL); - printf("num_seen = %d\n", num_seen ); - if (num_seen != torture_entries+2) { - correct = False; - fprintf(stderr,"entry count mismatch, should be %d, was %d\n", - torture_entries+2, num_seen); - } - - num_seen = cli_list_old(cli->tree, "\\LISTDIR\\*", (FILE_ATTRIBUTE_ARCHIVE<<8)|FILE_ATTRIBUTE_DIRECTORY, list_fn, NULL); - printf("num_seen = %d\n", num_seen ); - if (num_seen != torture_entries) { - correct = False; - fprintf(stderr,"entry count mismatch, should be %d, was %d\n", - torture_entries, num_seen); - } - - /* Delete everything. */ - cli_list(cli->tree, "\\LISTDIR\\*", 0, del_fn, cli); - cli_list(cli->tree, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, del_fn, cli); - cli_rmdir(cli->tree, "\\LISTDIR"); - -#if 0 - printf("Matched %d\n", cli_list(cli->tree, "a*.*", 0, list_fn, NULL)); - printf("Matched %d\n", cli_list(cli->tree, "b*.*", 0, list_fn, NULL)); - printf("Matched %d\n", cli_list(cli->tree, "xyzabc", 0, list_fn, NULL)); -#endif - - if (!torture_close_connection(cli)) { - correct = False; - } - - printf("finished dirtest1\n"); - - return correct; -} - - -/* - simple test harness for playing with deny modes - */ -static BOOL run_deny3test(int dummy) -{ - struct cli_state *cli1, *cli2; - int fnum1, fnum2; - const char *fname; - - printf("starting deny3 test\n"); - - printf("Testing simple deny modes\n"); - - if (!torture_open_connection(&cli1)) { - return False; - } - if (!torture_open_connection(&cli2)) { - return False; - } - - fname = "\\deny_dos1.dat"; - - cli_unlink(cli1->tree, fname); - fnum1 = cli_open(cli1->tree, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS); - fnum2 = cli_open(cli1->tree, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS); - if (fnum1 != -1) cli_close(cli1->tree, fnum1); - if (fnum2 != -1) cli_close(cli1->tree, fnum2); - cli_unlink(cli1->tree, fname); - printf("fnum1=%d fnum2=%d\n", fnum1, fnum2); - - - fname = "\\deny_dos2.dat"; - - cli_unlink(cli1->tree, fname); - fnum1 = cli_open(cli1->tree, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS); - fnum2 = cli_open(cli2->tree, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS); - if (fnum1 != -1) cli_close(cli1->tree, fnum1); - if (fnum2 != -1) cli_close(cli2->tree, fnum2); - cli_unlink(cli1->tree, fname); - printf("fnum1=%d fnum2=%d\n", fnum1, fnum2); - - - torture_close_connection(cli1); - torture_close_connection(cli2); - - return True; -} - -/* - parse a //server/share type UNC name -*/ -static BOOL parse_unc(const char *unc_name, char **hostname, char **sharename) -{ - char *p; - - if (strncmp(unc_name, "//", 2)) { - return False; - } - - *hostname = strdup(&unc_name[2]); - p = strchr_m(&(*hostname)[2],'/'); - if (!p) { - return False; - } - *p = 0; - *sharename = strdup(p+1); - - return True; -} - - -static void sigcont(void) +static void sigcont(int sig) { } -double torture_create_procs(BOOL (*fn)(struct cli_state *, int), BOOL *result) +double torture_create_procs(BOOL (*fn)(struct smbcli_state *, int), BOOL *result) { int i, status; volatile pid_t *child_status; @@ -3914,8 +2156,11 @@ double torture_create_procs(BOOL (*fn)(struct cli_state *, int), BOOL *result) int tries = 8; double start_time_limit = 10 + (torture_nprocs * 1.5); char **unc_list = NULL; - char *p; + const char *p; int num_unc_names = 0; + struct timeval tv; + + *result = True; synccount = 0; @@ -3937,7 +2182,7 @@ double torture_create_procs(BOOL (*fn)(struct cli_state *, int), BOOL *result) if (p) { unc_list = file_lines_load(p, &num_unc_names); if (!unc_list || num_unc_names <= 0) { - printf("Failed to load unc names list from %s\n", p); + printf("Failed to load unc names list from '%s'\n", p); exit(1); } } @@ -3947,16 +2192,16 @@ double torture_create_procs(BOOL (*fn)(struct cli_state *, int), BOOL *result) child_status_out[i] = True; } - start_timer(); + tv = timeval_current(); for (i=0;i TEST1 TEST2 ...\n"); - - printf("\t-d debuglevel\n"); - printf("\t-U user%%pass\n"); - printf("\t-k use kerberos\n"); - printf("\t-N numprocs\n"); - printf("\t-n my_netbios_name\n"); - printf("\t-W workgroup\n"); - printf("\t-o num_operations\n"); - printf("\t-e num files(entries)\n"); - printf("\t-O socket_options\n"); - printf("\t-m maximum protocol\n"); - printf("\t-L use oplocks\n"); - printf("\t-c CLIENT.TXT specify client load file for NBENCH\n"); - printf("\t-t timelimit specify NBENCH time limit (seconds)\n"); - printf("\t-C filename specifies file with list of UNCs for connections\n"); - printf("\t-A showall\n"); - printf("\t-p port\n"); - printf("\t-s seed\n"); - printf("\t-f max failures\n"); - printf("\t-b bypass I/O (NBENCH)\n"); - printf("\t-X enable dangerous tests\n"); - printf("\n\n"); + poptPrintUsage(pc, stdout, 0); + printf("\n"); + + printf("The binding format is:\n\n"); + + printf(" TRANSPORT:host[flags]\n\n"); + + printf(" where TRANSPORT is either ncacn_np for SMB or ncacn_ip_tcp for RPC/TCP\n\n"); + + printf(" 'host' is an IP or hostname or netbios name. If the binding string\n"); + printf(" identifies the server side of an endpoint, 'host' may be an empty\n"); + printf(" string.\n\n"); + + printf(" 'flags' can include a SMB pipe name if using the ncacn_np transport or\n"); + printf(" a TCP port number if using the ncacn_ip_tcp transport, otherwise they\n"); + printf(" will be auto-determined.\n\n"); + + printf(" other recognised flags are:\n\n"); + + printf(" sign : enable ntlmssp signing\n"); + printf(" seal : enable ntlmssp sealing\n"); + printf(" connect : enable rpc connect level auth (auth, but no sign or seal)\n"); + printf(" validate: enable the NDR validator\n"); + printf(" print: enable debugging of the packets\n"); + printf(" bigendian: use bigendian RPC\n"); + printf(" padcheck: check reply data for non-zero pad bytes\n\n"); + + printf(" For example, these all connect to the samr pipe:\n\n"); + + printf(" ncacn_np:myserver\n"); + printf(" ncacn_np:myserver[samr]\n"); + printf(" ncacn_np:myserver[\\pipe\\samr]\n"); + printf(" ncacn_np:myserver[/pipe/samr]\n"); + printf(" ncacn_np:myserver[samr,sign,print]\n"); + printf(" ncacn_np:myserver[\\pipe\\samr,sign,seal,bigendian]\n"); + printf(" ncacn_np:myserver[/pipe/samr,seal,validate]\n"); + printf(" ncacn_np:\n"); + printf(" ncacn_np:[/pipe/samr]\n\n"); + + printf(" ncacn_ip_tcp:myserver\n"); + printf(" ncacn_ip_tcp:myserver[1024]\n"); + printf(" ncacn_ip_tcp:myserver[1024,sign,seal]\n\n"); + + printf("The unc format is:\n\n"); + + printf(" //server/share\n\n"); printf("tests are:"); for (i=0;torture_ops[i].name;i++) { - printf(" %s", torture_ops[i].name); + if ((i%perline)==0) { + printf("\n"); + } + printf("%s ", torture_ops[i].name); } - printf("\n"); + printf("\n\n"); printf("default test is ALL\n"); - + exit(1); } +static BOOL is_binding_string(const char *binding_string) +{ + TALLOC_CTX *mem_ctx = talloc_init("is_binding_string"); + struct dcerpc_binding binding_struct; + NTSTATUS status; + + status = dcerpc_parse_binding(mem_ctx, binding_string, &binding_struct); + + talloc_free(mem_ctx); + return NT_STATUS_IS_OK(status); +} + /**************************************************************************** main program ****************************************************************************/ @@ -4270,7 +2618,31 @@ static void usage(void) int opt, i; char *p; BOOL correct = True; - char *host, *share, *username; + int argc_new; + char **argv_new; + poptContext pc; + enum {OPT_LOADFILE=1000,OPT_UNCLIST,OPT_TIMELIMIT,OPT_DNS,OPT_DANGEROUS}; + struct poptOption long_options[] = { + POPT_AUTOHELP + {"smb-ports", 'p', POPT_ARG_STRING, NULL, 0, "SMB ports", NULL}, + {"seed", 0, POPT_ARG_INT, &torture_seed, 0, "seed", NULL}, + {"num-progs", 0, POPT_ARG_INT, &torture_nprocs, 0, "num progs", NULL}, + {"num-ops", 0, POPT_ARG_INT, &torture_numops, 0, "num ops", NULL}, + {"entries", 0, POPT_ARG_INT, &torture_entries, 0, "entries", NULL}, + {"use-oplocks", 'L', POPT_ARG_NONE, &use_oplocks, 0, "use oplocks", NULL}, + {"show-all", 0, POPT_ARG_NONE, &torture_showall, 0, "show all", NULL}, + {"loadfile", 0, POPT_ARG_STRING, NULL, OPT_LOADFILE, "loadfile", NULL}, + {"unclist", 0, POPT_ARG_STRING, NULL, OPT_UNCLIST, "unclist", NULL}, + {"timelimit", 't', POPT_ARG_STRING, NULL, OPT_TIMELIMIT, "timelimit", NULL}, + {"failures", 'f', POPT_ARG_INT, &torture_failures, 0, "failures", NULL}, + {"parse-dns", 'D', POPT_ARG_STRING, NULL, OPT_DNS, "parse-dns", NULL}, + {"dangerous", 'X', POPT_ARG_NONE, NULL, OPT_DANGEROUS, "dangerous", NULL}, + POPT_COMMON_SAMBA + POPT_COMMON_CONNECTION + POPT_COMMON_CREDENTIALS + POPT_COMMON_VERSION + POPT_TABLEEND + }; setup_logging("smbtorture", DEBUG_STDOUT); @@ -4278,128 +2650,110 @@ static void usage(void) setbuffer(stdout, NULL, 0); #endif + pc = poptGetContext("smbtorture", argc, (const char **) argv, long_options, + POPT_CONTEXT_KEEP_FIRST); + + poptSetOtherOptionHelp(pc, "| TEST1 TEST2 ..."); + + while((opt = poptGetNextOpt(pc)) != -1) { + switch (opt) { + case OPT_LOADFILE: + lp_set_cmdline("torture:loadfile", poptGetOptArg(pc)); + break; + case OPT_UNCLIST: + lp_set_cmdline("torture:unclist", poptGetOptArg(pc)); + break; + case OPT_TIMELIMIT: + lp_set_cmdline("torture:timelimit", poptGetOptArg(pc)); + break; + case OPT_DNS: + parse_dns(poptGetOptArg(pc)); + break; + case OPT_DANGEROUS: + lp_set_cmdline("torture:dangerous", "Yes"); + break; + default: + d_printf("Invalid option %s: %s\n", + poptBadOption(pc, 0), poptStrerror(opt)); + usage(pc); + exit(1); + } + } + lp_load(dyn_CONFIGFILE,True,False,False); load_interfaces(); - if (argc < 2) { - usage(); + smbtorture_init_subsystems; + + + if (torture_seed == 0) { + torture_seed = time(NULL); + } + printf("Using seed %d\n", torture_seed); + srandom(torture_seed); + + argv_new = discard_const_p(char *, poptGetArgs(pc)); + + argc_new = argc; + for (i=0; i