*/
#include "includes.h"
+#include "dynconfig.h"
+#include "client.h"
+#include "lib/cmdline/popt_common.h"
+#include "libcli/raw/libcliraw.h"
+#include "system/time.h"
+#include "system/wait.h"
+#include "ioctl.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 smbcli_state *current_cli;
static BOOL use_oplocks;
/* check if the server produced the expected error code */
-static BOOL check_error(int line, struct smbcli_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 (smbcli_is_dos_error(c->tree)) {
uint8_t class;
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;
}
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;
}
}
static BOOL wait_lock(struct smbcli_state *c, int fnum, uint32_t offset, uint32_t len)
{
while (NT_STATUS_IS_ERR(smbcli_lock(c->tree, fnum, offset, len, -1, WRITE_LOCK))) {
- if (!check_error(__LINE__, c, ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED)) return False;
+ if (!check_error(__location__, c, ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED)) return False;
}
return True;
}
ssize_t sent = 0;
BOOL correct = True;
- srandom(1);
for (i = 0; i < sizeof(buf); i += sizeof(uint32_t))
{
SIVAL(buf, i, sys_random());
return correct;
}
-static BOOL run_readwritetest(int dummy)
+static BOOL run_readwritetest(void)
{
struct smbcli_state *cli1, *cli2;
BOOL test1, test2 = True;
}
-/*
- 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 smbcli_state *cli1, *cli2;
- const char *fname = "\\lockt1.lck";
- int fnum1, fnum2, fnum3;
- time_t t1, t2;
- uint_t lock_timeout;
-
- if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
- return False;
- }
-
- printf("starting locktest1\n");
-
- smbcli_unlink(cli1->tree, fname);
-
- 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, smbcli_errstr(cli1->tree));
- return False;
- }
- fnum2 = smbcli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
- if (fnum2 == -1) {
- printf("open2 of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
- return False;
- }
- fnum3 = smbcli_open(cli2->tree, fname, O_RDWR, DENY_NONE);
- if (fnum3 == -1) {
- printf("open3 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
- return False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_lock(cli1->tree, fnum1, 0, 4, 0, WRITE_LOCK))) {
- printf("lock1 failed (%s)\n", smbcli_errstr(cli1->tree));
- return False;
- }
-
-
- if (NT_STATUS_IS_OK(smbcli_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(smbcli_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(smbcli_close(cli1->tree, fnum2))) {
- printf("close1 failed (%s)\n", smbcli_errstr(cli1->tree));
- return False;
- }
-
- if (NT_STATUS_IS_OK(smbcli_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(smbcli_close(cli1->tree, fnum1))) {
- printf("close2 failed (%s)\n", smbcli_errstr(cli1->tree));
- return False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum3))) {
- printf("close3 failed (%s)\n", smbcli_errstr(cli2->tree));
- return False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_unlink(cli1->tree, fname))) {
- printf("unlink failed (%s)\n", smbcli_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 smbcli_state *cli;
const char *fname = "\\tcontest.tmp";
/*
checks for correct tconX support
*/
-static BOOL run_tcon_devtype_test(int dummy)
+static BOOL run_tcon_devtype_test(void)
{
struct smbcli_state *cli1 = NULL;
BOOL retry;
}
-/*
- 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
-*/
-static BOOL run_locktest2(int dummy)
-{
- struct smbcli_state *cli;
- const char *fname = "\\lockt2.lck";
- int fnum1, fnum2, fnum3;
- BOOL correct = True;
-
- if (!torture_open_connection(&cli)) {
- return False;
- }
-
- printf("starting locktest2\n");
-
- smbcli_unlink(cli->tree, fname);
-
- printf("Testing pid context\n");
-
- cli->session->pid = 1;
-
- 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, smbcli_errstr(cli->tree));
- return False;
- }
-
- fnum2 = smbcli_open(cli->tree, fname, O_RDWR, DENY_NONE);
- if (fnum2 == -1) {
- printf("open2 of %s failed (%s)\n", fname, smbcli_errstr(cli->tree));
- return False;
- }
-
- cli->session->pid = 2;
-
- fnum3 = smbcli_open(cli->tree, fname, O_RDWR, DENY_NONE);
- if (fnum3 == -1) {
- printf("open3 of %s failed (%s)\n", fname, smbcli_errstr(cli->tree));
- return False;
- }
-
- cli->session->pid = 1;
-
- if (NT_STATUS_IS_ERR(smbcli_lock(cli->tree, fnum1, 0, 4, 0, WRITE_LOCK))) {
- printf("lock1 failed (%s)\n", smbcli_errstr(cli->tree));
- return False;
- }
-
- if (NT_STATUS_IS_OK(smbcli_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;
- }
-
- if (NT_STATUS_IS_OK(smbcli_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;
- }
-
- if (NT_STATUS_IS_OK(smbcli_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;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_lock(cli->tree, fnum1, 100, 4, 0, WRITE_LOCK))) {
- printf("lock at 100 failed (%s)\n", smbcli_errstr(cli->tree));
- }
-
- cli->session->pid = 2;
-
- if (NT_STATUS_IS_OK(smbcli_unlock(cli->tree, fnum1, 100, 4))) {
- printf("unlock at 100 succeeded! This is a locking bug\n");
- correct = False;
- }
-
- if (NT_STATUS_IS_OK(smbcli_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 (NT_STATUS_IS_OK(smbcli_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;
- }
-
- if (NT_STATUS_IS_OK(smbcli_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;
- }
-
- cli->session->pid = 1;
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli->tree, fnum1))) {
- printf("close1 failed (%s)\n", smbcli_errstr(cli->tree));
- return False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli->tree, fnum2))) {
- printf("close2 failed (%s)\n", smbcli_errstr(cli->tree));
- return False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli->tree, fnum3))) {
- printf("close3 failed (%s)\n", smbcli_errstr(cli->tree));
- return False;
- }
-
- 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
-*/
-static BOOL run_locktest3(int dummy)
-{
- struct smbcli_state *cli1, *cli2;
- const char *fname = "\\lockt3.lck";
- int fnum1, fnum2, i;
- uint32_t offset;
- BOOL correct = True;
-
-#define NEXT_OFFSET offset += (~(uint32_t)0) / torture_numops
-
- if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
- return False;
- }
-
- printf("starting locktest3\n");
-
- printf("Testing 32 bit offset ranges\n");
-
- smbcli_unlink(cli1->tree, fname);
-
- 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, smbcli_errstr(cli1->tree));
- return False;
- }
- fnum2 = smbcli_open(cli2->tree, fname, O_RDWR, DENY_NONE);
- if (fnum2 == -1) {
- printf("open2 of %s failed (%s)\n", fname, smbcli_errstr(cli2->tree));
- return False;
- }
-
- printf("Establishing %d locks\n", torture_numops);
-
- for (offset=i=0;i<torture_numops;i++) {
- NEXT_OFFSET;
- if (NT_STATUS_IS_ERR(smbcli_lock(cli1->tree, fnum1, offset-1, 1, 0, WRITE_LOCK))) {
- printf("lock1 %d failed (%s)\n",
- i,
- smbcli_errstr(cli1->tree));
- return False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_lock(cli2->tree, fnum2, offset-2, 1, 0, WRITE_LOCK))) {
- printf("lock2 %d failed (%s)\n",
- i,
- smbcli_errstr(cli1->tree));
- return False;
- }
- }
-
- printf("Testing %d locks\n", torture_numops);
-
- for (offset=i=0;i<torture_numops;i++) {
- NEXT_OFFSET;
-
- if (NT_STATUS_IS_OK(smbcli_lock(cli1->tree, fnum1, offset-2, 1, 0, WRITE_LOCK))) {
- printf("error: lock1 %d succeeded!\n", i);
- return False;
- }
-
- if (NT_STATUS_IS_OK(smbcli_lock(cli2->tree, fnum2, offset-1, 1, 0, WRITE_LOCK))) {
- printf("error: lock2 %d succeeded!\n", i);
- return False;
- }
-
- if (NT_STATUS_IS_OK(smbcli_lock(cli1->tree, fnum1, offset-1, 1, 0, WRITE_LOCK))) {
- printf("error: lock3 %d succeeded!\n", i);
- return False;
- }
-
- if (NT_STATUS_IS_OK(smbcli_lock(cli2->tree, fnum2, offset-2, 1, 0, WRITE_LOCK))) {
- printf("error: lock4 %d succeeded!\n", i);
- return False;
- }
- }
-
- printf("Removing %d locks\n", torture_numops);
-
- for (offset=i=0;i<torture_numops;i++) {
- NEXT_OFFSET;
-
- if (NT_STATUS_IS_ERR(smbcli_unlock(cli1->tree, fnum1, offset-1, 1))) {
- printf("unlock1 %d failed (%s)\n",
- i,
- smbcli_errstr(cli1->tree));
- return False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_unlock(cli2->tree, fnum2, offset-2, 1))) {
- printf("unlock2 %d failed (%s)\n",
- i,
- smbcli_errstr(cli1->tree));
- return False;
- }
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
- printf("close1 failed (%s)\n", smbcli_errstr(cli1->tree));
- return False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) {
- printf("close2 failed (%s)\n", smbcli_errstr(cli2->tree));
- return False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_unlink(cli1->tree, fname))) {
- printf("unlink failed (%s)\n", smbcli_errstr(cli1->tree));
- return False;
- }
-
- if (!torture_close_connection(cli1)) {
- 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 smbcli_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");
-
- smbcli_unlink(cli1->tree, fname);
-
- fnum1 = smbcli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
- fnum2 = smbcli_open(cli2->tree, fname, O_RDWR, DENY_NONE);
-
- memset(buf, 0, sizeof(buf));
-
- if (smbcli_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(smbcli_lock(cli1->tree, fnum1, 0, 4, 0, WRITE_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_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(smbcli_lock(cli1->tree, fnum1, 10, 4, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_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(smbcli_lock(cli1->tree, fnum1, 20, 4, 0, WRITE_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_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(smbcli_lock(cli1->tree, fnum1, 30, 4, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_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, smbcli_lock(cli1->tree, fnum1, 40, 4, 0, WRITE_LOCK))) &&
- NT_STATUS_IS_OK((cli1->session->pid = 2, smbcli_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, smbcli_lock(cli1->tree, fnum1, 50, 4, 0, READ_LOCK))) &&
- NT_STATUS_IS_OK((cli1->session->pid = 2, smbcli_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(smbcli_lock(cli1->tree, fnum1, 60, 4, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_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(smbcli_lock(cli1->tree, fnum1, 70, 4, 0, WRITE_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_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(smbcli_lock(cli1->tree, fnum1, 80, 4, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_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(smbcli_lock(cli1->tree, fnum1, 90, 4, 0, WRITE_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_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, smbcli_lock(cli1->tree, fnum1, 100, 4, 0, WRITE_LOCK))) &&
- NT_STATUS_IS_OK((cli1->session->pid = 2, smbcli_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(smbcli_lock(cli1->tree, fnum1, 110, 4, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_lock(cli1->tree, fnum1, 112, 4, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_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(smbcli_lock(cli1->tree, fnum1, 120, 4, 0, WRITE_LOCK)) &&
- (smbcli_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(smbcli_lock(cli1->tree, fnum1, 130, 4, 0, READ_LOCK)) &&
- (smbcli_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(smbcli_lock(cli1->tree, fnum1, 140, 4, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_lock(cli1->tree, fnum1, 140, 4, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_unlock(cli1->tree, fnum1, 140, 4)) &&
- NT_STATUS_IS_OK(smbcli_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(smbcli_lock(cli1->tree, fnum1, 150, 4, 0, WRITE_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_lock(cli1->tree, fnum1, 150, 4, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_unlock(cli1->tree, fnum1, 150, 4)) &&
- (smbcli_read(cli2->tree, fnum2, buf, 150, 4) == 4) &&
- !(smbcli_write(cli2->tree, fnum2, 0, buf, 150, 4) == 4) &&
- NT_STATUS_IS_OK(smbcli_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(smbcli_lock(cli1->tree, fnum1, 160, 4, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_unlock(cli1->tree, fnum1, 160, 4)) &&
- (smbcli_write(cli2->tree, fnum2, 0, buf, 160, 4) == 4) &&
- (smbcli_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(smbcli_lock(cli1->tree, fnum1, 170, 4, 0, WRITE_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_unlock(cli1->tree, fnum1, 170, 4)) &&
- (smbcli_write(cli2->tree, fnum2, 0, buf, 170, 4) == 4) &&
- (smbcli_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(smbcli_lock(cli1->tree, fnum1, 190, 4, 0, WRITE_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_lock(cli1->tree, fnum1, 190, 4, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_unlock(cli1->tree, fnum1, 190, 4)) &&
- !(smbcli_write(cli2->tree, fnum2, 0, buf, 190, 4) == 4) &&
- (smbcli_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");
-
- smbcli_close(cli1->tree, fnum1);
- smbcli_close(cli2->tree, fnum2);
- fnum1 = smbcli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
- f = smbcli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
- ret = NT_STATUS_IS_OK(smbcli_lock(cli1->tree, fnum1, 0, 8, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_lock(cli1->tree, f, 0, 1, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_close(cli1->tree, fnum1)) &&
- ((fnum1 = smbcli_open(cli1->tree, fname, O_RDWR, DENY_NONE)) != -1) &&
- NT_STATUS_IS_OK(smbcli_lock(cli1->tree, fnum1, 7, 1, 0, WRITE_LOCK));
- smbcli_close(cli1->tree, f);
- smbcli_close(cli1->tree, fnum1);
- EXPECTED(ret, True);
- printf("the server %s have the NT byte range lock bug\n", !ret?"does":"doesn't");
-
- fail:
- smbcli_close(cli1->tree, fnum1);
- smbcli_close(cli2->tree, fnum2);
- smbcli_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 smbcli_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");
-
- smbcli_unlink(cli1->tree, fname);
-
- fnum1 = smbcli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
- fnum2 = smbcli_open(cli2->tree, fname, O_RDWR, DENY_NONE);
- fnum3 = smbcli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
-
- memset(buf, 0, sizeof(buf));
-
- if (smbcli_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(smbcli_lock(cli1->tree, fnum1, 0, 8, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_lock(cli1->tree, fnum3, 0, 1, 0, READ_LOCK));
- smbcli_close(cli1->tree, fnum1);
- fnum1 = smbcli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
- ret = NT_STATUS_IS_OK(smbcli_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");
- smbcli_close(cli1->tree, fnum1);
- fnum1 = smbcli_open(cli1->tree, fname, O_RDWR, DENY_NONE);
- smbcli_unlock(cli1->tree, fnum3, 0, 1);
-
- ret = NT_STATUS_IS_OK(smbcli_lock(cli1->tree, fnum1, 0, 4, 0, WRITE_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_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(smbcli_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. */
- smbcli_unlock(cli2->tree, fnum2, 0, 4);
-
- ret = NT_STATUS_IS_OK(smbcli_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. */
- smbcli_unlock(cli1->tree, fnum3, 0, 4);
-
- /* Stack 2 more locks here. */
- ret = NT_STATUS_IS_OK(smbcli_lock(cli1->tree, fnum1, 0, 4, 0, READ_LOCK)) &&
- NT_STATUS_IS_OK(smbcli_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(smbcli_unlock(cli1->tree, fnum1, 0, 4)) &&
- NT_STATUS_IS_OK(smbcli_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. */
- smbcli_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(smbcli_unlock(cli1->tree, fnum1, 1, 1)) &&
- NT_STATUS_IS_OK(smbcli_unlock(cli1->tree, fnum1, 0, 4)) &&
- NT_STATUS_IS_OK(smbcli_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(smbcli_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(smbcli_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:
- smbcli_close(cli1->tree, fnum1);
- smbcli_close(cli2->tree, fnum2);
- smbcli_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 smbcli_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]);
-
- smbcli_unlink(cli->tree, fname[i]);
-
- fnum = smbcli_open(cli->tree, fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
- status = smbcli_locktype(cli->tree, fnum, 0, 8, 0, LOCKING_ANDX_CHANGE_LOCKTYPE);
- smbcli_close(cli->tree, fnum);
- printf("CHANGE_LOCKTYPE gave %s\n", nt_errstr(status));
-
- fnum = smbcli_open(cli->tree, fname[i], O_RDWR, DENY_NONE);
- status = smbcli_locktype(cli->tree, fnum, 0, 8, 0, LOCKING_ANDX_CANCEL_LOCK);
- smbcli_close(cli->tree, fnum);
- printf("CANCEL_LOCK gave %s\n", nt_errstr(status));
-
- smbcli_unlink(cli->tree, fname[i]);
- }
-
- torture_close_connection(cli);
-
- printf("finished locktest6\n");
- return True;
-}
-
-static BOOL run_locktest7(int dummy)
-{
- struct smbcli_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");
-
- smbcli_unlink(cli1->tree, fname);
-
- fnum1 = smbcli_open(cli1->tree, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
-
- memset(buf, 0, sizeof(buf));
-
- if (smbcli_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(smbcli_lock(cli1->tree, fnum1, 130, 4, 0, READ_LOCK))) {
- printf("Unable to apply read lock on range 130:4, error was %s\n", smbcli_errstr(cli1->tree));
- goto fail;
- } else {
- printf("pid1 successfully locked range 130:4 for READ\n");
- }
-
- if (smbcli_read(cli1->tree, fnum1, buf, 130, 4) != 4) {
- printf("pid1 unable to read the range 130:4, error was %s\n", smbcli_errstr(cli1->tree));
- goto fail;
- } else {
- printf("pid1 successfully read the range 130:4\n");
- }
-
- if (smbcli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) {
- printf("pid1 unable to write to the range 130:4, error was %s\n", smbcli_errstr(cli1->tree));
- if (NT_STATUS_V(smbcli_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 (smbcli_read(cli1->tree, fnum1, buf, 130, 4) != 4) {
- printf("pid2 unable to read the range 130:4, error was %s\n", smbcli_errstr(cli1->tree));
- } else {
- printf("pid2 successfully read the range 130:4\n");
- }
-
- if (smbcli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) {
- printf("pid2 unable to write to the range 130:4, error was %s\n", smbcli_errstr(cli1->tree));
- if (NT_STATUS_V(smbcli_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;
- smbcli_unlock(cli1->tree, fnum1, 130, 4);
-
- if (NT_STATUS_IS_ERR(smbcli_lock(cli1->tree, fnum1, 130, 4, 0, WRITE_LOCK))) {
- printf("Unable to apply write lock on range 130:4, error was %s\n", smbcli_errstr(cli1->tree));
- goto fail;
- } else {
- printf("pid1 successfully locked range 130:4 for WRITE\n");
- }
-
- if (smbcli_read(cli1->tree, fnum1, buf, 130, 4) != 4) {
- printf("pid1 unable to read the range 130:4, error was %s\n", smbcli_errstr(cli1->tree));
- goto fail;
- } else {
- printf("pid1 successfully read the range 130:4\n");
- }
-
- if (smbcli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) {
- printf("pid1 unable to write to the range 130:4, error was %s\n", smbcli_errstr(cli1->tree));
- goto fail;
- } else {
- printf("pid1 successfully wrote to the range 130:4\n");
- }
-
- cli1->session->pid = 2;
-
- if (smbcli_read(cli1->tree, fnum1, buf, 130, 4) != 4) {
- printf("pid2 unable to read the range 130:4, error was %s\n", smbcli_errstr(cli1->tree));
- if (NT_STATUS_V(smbcli_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 (smbcli_write(cli1->tree, fnum1, 0, buf, 130, 4) != 4) {
- printf("pid2 unable to write to the range 130:4, error was %s\n", smbcli_errstr(cli1->tree));
- if (NT_STATUS_V(smbcli_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 = smbcli_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(smbcli_getatr(cli1->tree, fname, NULL, &size, NULL))) {
- printf("getatr failed (%s)\n", smbcli_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;
-
- smbcli_unlock(cli1->tree, fnum1, 130, 4);
- correct = True;
-
-fail:
- smbcli_close(cli1->tree, fnum1);
- smbcli_close(cli1->tree, fnum2);
- smbcli_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)
+static BOOL run_fdpasstest(void)
{
struct smbcli_state *cli1, *cli2;
const char *fname = "\\fdpass.tst";
}
-/*
- 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 smbcli_state *cli;
- const char *fname = "\\unlink.tst";
- int fnum;
- BOOL correct = True;
-
- if (!torture_open_connection(&cli)) {
- return False;
- }
-
- printf("starting unlink test\n");
-
- smbcli_unlink(cli->tree, fname);
-
- cli->session->pid = 1;
-
- printf("Opening a file\n");
-
- 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, smbcli_errstr(cli->tree));
- return False;
- }
-
- printf("Unlinking a open file\n");
-
- if (NT_STATUS_IS_OK(smbcli_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);
- }
-
- smbcli_close(cli->tree, fnum);
- smbcli_unlink(cli->tree, fname);
-
- if (!torture_close_connection(cli)) {
- correct = False;
- }
-
- printf("unlink test finished\n");
-
- return correct;
-}
-
-
/*
test the timing of deferred open requests
*/
int fnum = -1;
do {
- struct timeval tv_start, tv_end;
- GetTimeOfDay(&tv_start);
+ struct timeval tv;
+ tv = timeval_current();
fnum = smbcli_nt_create_full(cli->tree, fname, 0, GENERIC_RIGHTS_FILE_ALL_ACCESS,
FILE_ATTRIBUTE_NORMAL, NTCREATEX_SHARE_ACCESS_NONE,
NTCREATEX_DISP_OPEN_IF, 0, 0);
if (fnum != -1) {
break;
}
- GetTimeOfDay(&tv_end);
if (NT_STATUS_EQUAL(smbcli_nt_error(cli->tree),NT_STATUS_SHARING_VIOLATION)) {
- /* Sharing violation errors need to be 1 second apart. */
- int64_t tdif = usec_time_diff(&tv_end, &tv_start);
- if (tdif < 500000 || tdif > 1500000) {
- fprintf(stderr,"Timing incorrect %lld.%lld for share violation\n",
- tdif / (int64_t)1000000,
- tdif % (int64_t)1000000);
+ 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));
*/
static BOOL run_maxfidtest(struct smbcli_state *cli, int dummy)
{
-#define MAXFID_TEMPLATE "\\maxfid.%d.%d"
+#define MAXFID_TEMPLATE "\\maxfid\\fid%d\\maxfid.%d.%d"
char *fname;
int fnums[0x11000], i;
- int retries=4;
+ int retries=4, maxfid;
BOOL correct = True;
if (retries <= 0) {
return False;
}
+ if (smbcli_deltree(cli->tree, "\\maxfid") == -1) {
+ printf("Failed to deltree \\maxfid - %s\n",
+ smbcli_errstr(cli->tree));
+ return False;
+ }
+ 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("Testing maximum number of open files\n");
for (i=0; i<0x11000; i++) {
- asprintf(&fname, MAXFID_TEMPLATE, i,(int)getpid());
+ 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);
+ }
+ 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("%6d\n", i);
i--;
+ maxfid = i;
+
printf("cleaning up\n");
- for (;i>=0;i--) {
- asprintf(&fname, MAXFID_TEMPLATE, i,(int)getpid());
+ for (i=0;i<maxfid/2;i++) {
+ asprintf(&fname, MAXFID_TEMPLATE, i/1000, i,(int)getpid());
if (NT_STATUS_IS_ERR(smbcli_close(cli->tree, fnums[i]))) {
printf("Close of fnum %d failed - %s\n", fnums[i], smbcli_errstr(cli->tree));
}
correct = False;
}
free(fname);
- printf("%6d\r", i);
+
+ 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_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;
}
/* send smb negprot commands, not reading the response */
-static BOOL run_negprot_nowait(int dummy)
+static BOOL run_negprot_nowait(void)
{
int i;
struct smbcli_state *cli, *cli2;
/*
This checks how the getatr calls works
*/
-static BOOL run_attrtest(int dummy)
+static BOOL run_attrtest(void)
{
struct smbcli_state *cli;
int fnum;
/*
This checks a couple of trans2 calls
*/
-static BOOL run_trans2test(int dummy)
+static BOOL run_trans2test(void)
{
struct smbcli_state *cli;
int fnum;
}
}
smbcli_unlink(cli->tree, fname2);
- smbcli_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 smbcli_state *cli1;
- struct smbcli_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. */
-
- smbcli_setatr(cli1->tree, fname, 0, 0);
- smbcli_unlink(cli1->tree, fname);
-
- fnum1 = smbcli_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, smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
- printf("[1] close failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- fnum1 = smbcli_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. */
-
- smbcli_setatr(cli1->tree, fname, 0, 0);
- smbcli_unlink(cli1->tree, fname);
-
- fnum1 = smbcli_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, smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
- printf("[2] setting delete_on_close failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
- printf("[2] close failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- fnum1 = smbcli_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(smbcli_close(cli1->tree, fnum1))) {
- printf("[2] close failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
- smbcli_unlink(cli1->tree, fname);
- } else
- printf("second delete on close test succeeded.\n");
-
- /* Test 3 - ... */
- smbcli_setatr(cli1->tree, fname, 0, 0);
- smbcli_unlink(cli1->tree, fname);
-
- fnum1 = smbcli_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, smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- /* This should fail with a sharing violation - open for delete is only compatible
- with SHARE_DELETE. */
-
- fnum2 = smbcli_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 = smbcli_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, smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
- printf("[3] setting delete_on_close failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
- printf("[3] close 1 failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum2))) {
- printf("[3] close 2 failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- /* This should fail - file should no longer be there. */
-
- fnum1 = smbcli_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(smbcli_close(cli1->tree, fnum1))) {
- printf("[3] close failed (%s)\n", smbcli_errstr(cli1->tree));
- }
- smbcli_unlink(cli1->tree, fname);
- correct = False;
- goto fail;
- } else
- printf("third delete on close test succeeded.\n");
-
- /* Test 4 ... */
- smbcli_setatr(cli1->tree, fname, 0, 0);
- smbcli_unlink(cli1->tree, fname);
-
- fnum1 = smbcli_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, smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- /* This should succeed. */
- fnum2 = smbcli_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, smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum2))) {
- printf("[4] close - 1 failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_nt_delete_on_close(cli1->tree, fnum1, True))) {
- printf("[4] setting delete_on_close failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- /* This should fail - no more opens once delete on close set. */
- fnum2 = smbcli_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(smbcli_close(cli1->tree, fnum1))) {
- printf("[4] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- /* Test 5 ... */
- smbcli_setatr(cli1->tree, fname, 0, 0);
- smbcli_unlink(cli1->tree, fname);
-
- fnum1 = smbcli_open(cli1->tree, fname, O_RDWR|O_CREAT, DENY_NONE);
- if (fnum1 == -1) {
- printf("[5] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- /* This should fail - only allowed on NT opens with DELETE access. */
-
- if (NT_STATUS_IS_OK(smbcli_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(smbcli_close(cli1->tree, fnum1))) {
- printf("[5] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- printf("fifth delete on close test succeeded.\n");
-
- /* Test 6 ... */
- smbcli_setatr(cli1->tree, fname, 0, 0);
- smbcli_unlink(cli1->tree, fname);
-
- fnum1 = smbcli_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, smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- /* This should fail - only allowed on NT opens with DELETE access. */
-
- if (NT_STATUS_IS_OK(smbcli_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(smbcli_close(cli1->tree, fnum1))) {
- printf("[6] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- printf("sixth delete on close test succeeded.\n");
-
- /* Test 7 ... */
- smbcli_setatr(cli1->tree, fname, 0, 0);
- smbcli_unlink(cli1->tree, fname);
-
- fnum1 = smbcli_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, smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_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(smbcli_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(smbcli_close(cli1->tree, fnum1))) {
- printf("[7] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- /* This next open should succeed - we reset the flag. */
-
- fnum1 = smbcli_open(cli1->tree, fname, O_RDONLY, DENY_NONE);
- if (fnum1 == -1) {
- printf("[5] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
- printf("[7] close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- printf("seventh delete on close test succeeded.\n");
-
- /* Test 7 ... */
- smbcli_setatr(cli1->tree, fname, 0, 0);
- smbcli_unlink(cli1->tree, fname);
-
- if (!torture_open_connection(&cli2)) {
- printf("[8] failed to open second connection.\n");
- correct = False;
- goto fail;
- }
-
- fnum1 = smbcli_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, smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- fnum2 = smbcli_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);
-
- if (fnum2 == -1) {
- printf("[8] open of %s failed (%s)\n", fname, smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_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(smbcli_close(cli1->tree, fnum1))) {
- printf("[8] close - 1 failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli2->tree, fnum2))) {
- printf("[8] close - 2 failed (%s)\n", smbcli_errstr(cli2->tree));
- correct = False;
- goto fail;
- }
-
- /* This should fail.. */
- fnum1 = smbcli_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");
-
- /* This should fail - we need to set DELETE_ACCESS. */
- fnum1 = smbcli_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;
- }
-
- printf("ninth delete on close test succeeded.\n");
-
- fnum1 = smbcli_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, smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- /* This should delete the file. */
- if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
- printf("[10] close failed (%s)\n", smbcli_errstr(cli1->tree));
- correct = False;
- goto fail;
- }
-
- /* This should fail.. */
- fnum1 = smbcli_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. */
-
- smbcli_close(cli1->tree, fnum1);
- smbcli_close(cli1->tree, fnum2);
- smbcli_setatr(cli1->tree, fname, 0, 0);
- smbcli_unlink(cli1->tree, fname);
-
- if (!torture_close_connection(cli1)) {
- correct = False;
- }
- if (!torture_close_connection(cli2)) {
+ smbcli_rmdir(cli->tree, dname);
+
+ if (!torture_close_connection(cli)) {
correct = False;
}
+
+ printf("trans2 test finished\n");
+
return correct;
}
/*
print out server properties
*/
-static BOOL run_properties(int dummy)
+static BOOL run_properties(void)
{
struct smbcli_state *cli;
BOOL correct = True;
/*
Test ntcreate calls made by xcopy
*/
-static BOOL run_xcopy(int dummy)
+static BOOL run_xcopy(void)
{
struct smbcli_state *cli1;
const char *fname = "\\test.txt";
return correct;
}
-/*
- Test rename on files open with share delete and no share delete.
- */
-static BOOL run_rename(int dummy)
-{
- struct smbcli_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;
- }
-
- smbcli_unlink(cli1->tree, fname);
- smbcli_unlink(cli1->tree, fname1);
- fnum1 = smbcli_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", smbcli_errstr(cli1->tree));
- return False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_rename(cli1->tree, fname, fname1))) {
- printf("First rename failed (this is correct) - %s\n", smbcli_errstr(cli1->tree));
- } else {
- printf("First rename succeeded - this should have failed !\n");
- correct = False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
- printf("close - 1 failed (%s)\n", smbcli_errstr(cli1->tree));
- return False;
- }
-
- smbcli_unlink(cli1->tree, fname);
- smbcli_unlink(cli1->tree, fname1);
- fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, GENERIC_RIGHTS_FILE_READ, FILE_ATTRIBUTE_NORMAL,
- NTCREATEX_SHARE_ACCESS_DELETE|NTCREATEX_SHARE_ACCESS_READ, NTCREATEX_DISP_OVERWRITE_IF, 0, 0);
-
- if (fnum1 == -1) {
- printf("Second open failed - %s\n", smbcli_errstr(cli1->tree));
- return False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_rename(cli1->tree, fname, fname1))) {
- printf("Second rename failed - this should have succeeded - %s\n", smbcli_errstr(cli1->tree));
- correct = False;
- } else {
- printf("Second rename succeeded\n");
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
- printf("close - 2 failed (%s)\n", smbcli_errstr(cli1->tree));
- return False;
- }
-
- smbcli_unlink(cli1->tree, fname);
- smbcli_unlink(cli1->tree, fname1);
-
- fnum1 = smbcli_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", smbcli_errstr(cli1->tree));
- return False;
- }
-
-
- if (NT_STATUS_IS_ERR(smbcli_rename(cli1->tree, fname, fname1))) {
- printf("Third rename failed - this should have succeeded - %s\n", smbcli_errstr(cli1->tree));
- correct = False;
- } else {
- printf("Third rename succeeded\n");
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
- printf("close - 3 failed (%s)\n", smbcli_errstr(cli1->tree));
- return False;
- }
-
- smbcli_unlink(cli1->tree, fname);
- smbcli_unlink(cli1->tree, fname1);
-
- if (!torture_close_connection(cli1)) {
- correct = False;
- }
-
- return correct;
-}
-
/*
see how many RPC pipes we can open at once
*/
-static BOOL run_pipe_number(int dummy)
+static BOOL run_pipe_number(void)
{
struct smbcli_state *cli1;
const char *pipe_name = "\\WKSSVC";
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 smbcli_state **cli;
Try with a wrong vuid and check error message.
*/
-static BOOL run_vuidtest(int dummy)
+static BOOL run_vuidtest(void)
{
struct smbcli_state *cli;
const char *fname = "\\vuid.tst";
/*
Test open mode returns on read-only files.
*/
- static BOOL run_opentest(int dummy)
+ static BOOL run_opentest(void)
{
static struct smbcli_state *cli1;
static struct smbcli_state *cli2;
/* This will fail - but the error should be ERRnoaccess, not ERRbadshare. */
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");
}
/* This will fail - but the error should be ERRshare. */
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");
}
}
-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 smbcli_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++) {
- smbcli_setatr(cli1->tree, fname, 0, 0);
- smbcli_unlink(cli1->tree, fname);
- fnum1 = smbcli_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, smbcli_errstr(cli1->tree));
- return False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_close(cli1->tree, fnum1))) {
- printf("close %d (1) of %s failed (%s)\n", i, fname, smbcli_errstr(cli1->tree));
- return False;
- }
-
- for (j = 0; j < ARRAY_SIZE(open_attrs_table); j++) {
- fnum1 = smbcli_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(smbcli_nt_error(cli1->tree)), smbcli_errstr(cli1->tree));
- correct = False;
- CHECK_MAX_FAILURES(error_exit);
- }
- }
- if (NT_STATUS_V(smbcli_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],
- smbcli_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(smbcli_close(cli1->tree, fnum1))) {
- printf("close %d (2) of %s failed (%s)\n", j, fname, smbcli_errstr(cli1->tree));
- return False;
- }
-
- if (NT_STATUS_IS_ERR(smbcli_getatr(cli1->tree, fname, &attr, NULL, NULL))) {
- printf("getatr(2) failed (%s)\n", smbcli_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:
- smbcli_setatr(cli1->tree, fname, 0, 0);
- smbcli_unlink(cli1->tree, fname);
-
- printf("open attr test %s.\n", correct ? "passed" : "failed");
-
- if (!torture_close_connection(cli1)) {
- correct = False;
- }
- return correct;
-}
-
-static void list_fn(file_info *finfo, const char *name, void *state)
-{
-
-}
-
-/*
- test directory listing speed
- */
-static BOOL run_dirtest(int dummy)
-{
- int i;
- struct smbcli_state *cli;
- int fnum;
- double t1;
- BOOL correct = True;
-
- printf("starting directory test\n");
-
- if (!torture_open_connection(&cli)) {
- return False;
- }
-
- printf("Creating %d random filenames\n", torture_numops);
-
- srandom(0);
- for (i=0;i<torture_numops;i++) {
- char *fname;
- asprintf(&fname, "\\%x", (int)random());
- fnum = smbcli_open(cli->tree, fname, O_RDWR|O_CREAT, DENY_NONE);
- if (fnum == -1) {
- fprintf(stderr,"Failed to open %s\n", fname);
- return False;
- }
- smbcli_close(cli->tree, fnum);
- free(fname);
- }
-
- t1 = end_timer();
-
- printf("Matched %d\n", smbcli_list(cli->tree, "a*.*", 0, list_fn, NULL));
- printf("Matched %d\n", smbcli_list(cli->tree, "b*.*", 0, list_fn, NULL));
- printf("Matched %d\n", smbcli_list(cli->tree, "xyzabc", 0, list_fn, NULL));
-
- printf("dirtest core %g seconds\n", end_timer() - t1);
-
- srandom(0);
- for (i=0;i<torture_numops;i++) {
- char *fname;
- asprintf(&fname, "\\%x", (int)random());
- smbcli_unlink(cli->tree, fname);
- free(fname);
- }
-
- if (!torture_close_connection(cli)) {
- correct = False;
- }
-
- printf("finished dirtest\n");
-
- return correct;
-}
-
/*
sees what IOCTLs are supported
*/
-BOOL torture_ioctl_test(int dummy)
+BOOL torture_ioctl_test(void)
{
struct smbcli_state *cli;
uint16_t device, function;
/*
tries variants of chkpath
*/
-BOOL torture_chkpath_test(int dummy)
+BOOL torture_chkpath_test(void)
{
struct smbcli_state *cli;
int fnum;
}
if (NT_STATUS_IS_ERR(smbcli_chkpath(cli->tree, "\\chkpath.dir\\foo.txt"))) {
- ret = check_error(__LINE__, cli, ERRDOS, ERRbadpath,
+ ret = check_error(__location__, cli, ERRDOS, ERRbadpath,
NT_STATUS_NOT_A_DIRECTORY);
} else {
printf("* chkpath on a file should fail\n");
}
if (NT_STATUS_IS_ERR(smbcli_chkpath(cli->tree, "\\chkpath.dir\\bar.txt"))) {
- ret = check_error(__LINE__, cli, ERRDOS, ERRbadfile,
+ ret = check_error(__location__, cli, ERRDOS, ERRbadfile,
NT_STATUS_OBJECT_NAME_NOT_FOUND);
} else {
printf("* chkpath on a non existent file should fail\n");
}
if (NT_STATUS_IS_ERR(smbcli_chkpath(cli->tree, "\\chkpath.dir\\dirxx\\bar.txt"))) {
- ret = check_error(__LINE__, cli, ERRDOS, ERRbadpath,
+ ret = check_error(__location__, cli, ERRDOS, ERRbadpath,
NT_STATUS_OBJECT_PATH_NOT_FOUND);
} else {
printf("* chkpath on a non existent component should fail\n");
return ret;
}
-static BOOL run_dirtest1(int dummy)
-{
- int i;
- struct smbcli_state *cli;
- int fnum, num_seen;
- BOOL correct = True;
-
- printf("starting directory test\n");
-
- if (!torture_open_connection(&cli)) {
- return False;
- }
-
- if (smbcli_deltree(cli->tree, "\\LISTDIR") == -1) {
- fprintf(stderr,"Failed to deltree %s, error=%s\n", "\\LISTDIR", smbcli_errstr(cli->tree));
- return False;
- }
- if (NT_STATUS_IS_ERR(smbcli_mkdir(cli->tree, "\\LISTDIR"))) {
- fprintf(stderr,"Failed to mkdir %s, error=%s\n", "\\LISTDIR", smbcli_errstr(cli->tree));
- return False;
- }
-
- printf("Creating %d files\n", torture_entries);
-
- /* Create torture_entries files and torture_entries directories. */
- for (i=0;i<torture_entries;i++) {
- char *fname;
- asprintf(&fname, "\\LISTDIR\\f%d", i);
- fnum = smbcli_nt_create_full(cli->tree, 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, smbcli_errstr(cli->tree));
- return False;
- }
- free(fname);
- smbcli_close(cli->tree, fnum);
- }
- for (i=0;i<torture_entries;i++) {
- char *fname;
- asprintf(&fname, "\\LISTDIR\\d%d", i);
- if (NT_STATUS_IS_ERR(smbcli_mkdir(cli->tree, fname))) {
- fprintf(stderr,"Failed to open %s, error=%s\n", fname, smbcli_errstr(cli->tree));
- return False;
- }
- free(fname);
- }
-
- /* Now ensure that doing an old list sees both files and directories. */
- num_seen = smbcli_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 = smbcli_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 = smbcli_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. */
- if (smbcli_deltree(cli->tree, "\\LISTDIR") == -1) {
- fprintf(stderr,"Failed to deltree %s, error=%s\n", "\\LISTDIR", smbcli_errstr(cli->tree));
- return False;
- }
-
-#if 0
- printf("Matched %d\n", smbcli_list(cli->tree, "a*.*", 0, list_fn, NULL));
- printf("Matched %d\n", smbcli_list(cli->tree, "b*.*", 0, list_fn, NULL));
- printf("Matched %d\n", smbcli_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 smbcli_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";
-
- smbcli_unlink(cli1->tree, fname);
- fnum1 = smbcli_open(cli1->tree, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS);
- fnum2 = smbcli_open(cli1->tree, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS);
- if (fnum1 != -1) smbcli_close(cli1->tree, fnum1);
- if (fnum2 != -1) smbcli_close(cli1->tree, fnum2);
- smbcli_unlink(cli1->tree, fname);
- printf("fnum1=%d fnum2=%d\n", fnum1, fnum2);
-
-
- fname = "\\deny_dos2.dat";
-
- smbcli_unlink(cli1->tree, fname);
- fnum1 = smbcli_open(cli1->tree, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS);
- fnum2 = smbcli_open(cli2->tree, fname, O_CREAT|O_TRUNC|O_WRONLY, DENY_DOS);
- if (fnum1 != -1) smbcli_close(cli1->tree, fnum1);
- if (fnum2 != -1) smbcli_close(cli2->tree, fnum2);
- smbcli_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 void sigcont(void)
+static void sigcont(int sig)
{
}
char **unc_list = NULL;
const char *p;
int num_unc_names = 0;
+ struct timeval tv;
synccount = 0;
child_status_out[i] = True;
}
- start_timer();
+ tv = timeval_current();
for (i=0;i<torture_nprocs;i++) {
procnum = i;
}
if (synccount == torture_nprocs) break;
msleep(100);
- } while (end_timer() < start_time_limit);
+ } while (timeval_elapsed(&tv) < start_time_limit);
if (synccount != torture_nprocs) {
printf("FAILED TO START %d CLIENTS (started %d)\n", torture_nprocs, synccount);
*result = False;
- return end_timer();
+ return timeval_elapsed(&tv);
}
printf("Starting %d clients\n", torture_nprocs);
/* start the client load */
- start_timer();
+ tv = timeval_current();
for (i=0;i<torture_nprocs;i++) {
child_status[i] = 0;
}
for (i=0;i<torture_nprocs;i++) {
int ret;
- while ((ret=waitpid(0, &status, 0)) == -1 && errno == EINTR) /* noop */ ;
+ while ((ret=sys_waitpid(0, &status, 0)) == -1 && errno == EINTR) /* noop */ ;
if (ret == -1 || WEXITSTATUS(status) != 0) {
*result = False;
}
*result = False;
}
}
- return end_timer();
+ return timeval_elapsed(&tv);
}
#define FLAG_MULTIPROC 1
static struct {
const char *name;
- BOOL (*fn)(int);
- uint_t flags;
+ BOOL (*fn)(void);
+ BOOL (*multi_fn)(struct smbcli_state *, int );
} torture_ops[] = {
/* base tests */
{"BASE-FDPASS", run_fdpasstest, 0},
- {"BASE-LOCK1", run_locktest1, 0},
- {"BASE-LOCK2", run_locktest2, 0},
- {"BASE-LOCK3", run_locktest3, 0},
- {"BASE-LOCK4", run_locktest4, 0},
- {"BASE-LOCK5", run_locktest5, 0},
- {"BASE-LOCK6", run_locktest6, 0},
- {"BASE-LOCK7", run_locktest7, 0},
- {"BASE-UNLINK", run_unlinktest, 0},
+ {"BASE-LOCK1", torture_locktest1, 0},
+ {"BASE-LOCK2", torture_locktest2, 0},
+ {"BASE-LOCK3", torture_locktest3, 0},
+ {"BASE-LOCK4", torture_locktest4, 0},
+ {"BASE-LOCK5", torture_locktest5, 0},
+ {"BASE-LOCK6", torture_locktest6, 0},
+ {"BASE-LOCK7", torture_locktest7, 0},
+ {"BASE-UNLINK", torture_unlinktest, 0},
{"BASE-ATTR", run_attrtest, 0},
{"BASE-TRANS2", run_trans2test, 0},
{"BASE-NEGNOWAIT", run_negprot_nowait, 0},
- {"BASE-DIR", run_dirtest, 0},
- {"BASE-DIR1", run_dirtest1, 0},
+ {"BASE-DIR1", torture_dirtest1, 0},
+ {"BASE-DIR2", torture_dirtest2, 0},
{"BASE-DENY1", torture_denytest1, 0},
{"BASE-DENY2", torture_denytest2, 0},
+ {"BASE-DENY3", torture_denytest3, 0},
+ {"BASE-NTDENY1", NULL, torture_ntdenytest1},
+ {"BASE-NTDENY2", torture_ntdenytest2, 0},
{"BASE-TCON", run_tcon_test, 0},
{"BASE-TCONDEV", run_tcon_devtype_test, 0},
{"BASE-VUID", run_vuidtest, 0},
{"BASE-RW1", run_readwritetest, 0},
- {"BASE-RW2", run_readwritemulti, FLAG_MULTIPROC},
+ {"BASE-RW2", NULL, run_readwritemulti},
{"BASE-OPEN", run_opentest, 0},
- {"BASE-DENY3", run_deny3test, 0},
- {"BASE-DEFER_OPEN", run_deferopen, FLAG_MULTIPROC},
+ {"BASE-DEFER_OPEN", NULL, run_deferopen},
{"BASE-XCOPY", run_xcopy, 0},
- {"BASE-RENAME", run_rename, 0},
- {"BASE-DELETE", run_deletetest, 0},
+ {"BASE-RENAME", torture_test_rename, 0},
+ {"BASE-DELETE", torture_test_delete, 0},
{"BASE-PROPERTIES", run_properties, 0},
{"BASE-MANGLE", torture_mangle, 0},
- {"BASE-OPENATTR", run_openattrtest, 0},
+ {"BASE-OPENATTR", torture_openattrtest, 0},
{"BASE-CHARSET", torture_charset, 0},
{"BASE-CHKPATH", torture_chkpath_test, 0},
{"BASE-SECLEAK", torture_sec_leak, 0},
/* benchmarking tests */
{"BENCH-HOLDCON", torture_holdcon, 0},
{"BENCH-NBENCH", torture_nbench, 0},
- {"BENCH-TORTURE",run_torture, FLAG_MULTIPROC},
+ {"BENCH-TORTURE", NULL, run_torture},
/* RAW smb tests */
{"RAW-QFSINFO", torture_raw_qfsinfo, 0},
{"SCAN-NTTRANS", torture_nttrans_scan, 0},
{"SCAN-ALIASES", torture_trans2_aliases, 0},
{"SCAN-SMB", torture_smb_scan, 0},
- {"SCAN-MAXFID", run_maxfidtest, FLAG_MULTIPROC},
+ {"SCAN-MAXFID", NULL, run_maxfidtest},
{"SCAN-UTABLE", torture_utable, 0},
{"SCAN-CASETABLE", torture_casetable, 0},
{"SCAN-PIPE_NUMBER", run_pipe_number, 0},
{"RPC-EVENTLOG", torture_rpc_eventlog, 0},
{"RPC-EPMAPPER", torture_rpc_epmapper, 0},
{"RPC-WINREG", torture_rpc_winreg, 0},
+ {"RPC-OXIDRESOLVE", torture_rpc_oxidresolve, 0},
+ {"RPC-REMACT", torture_rpc_remact, 0},
{"RPC-MGMT", torture_rpc_mgmt, 0},
{"RPC-SCANNER", torture_rpc_scanner, 0},
{"RPC-AUTOIDL", torture_rpc_autoidl, 0},
+ {"RPC-COUNTCALLS", torture_rpc_countcalls, 0},
{"RPC-MULTIBIND", torture_multi_bind, 0},
{"RPC-DRSUAPI", torture_rpc_drsuapi, 0},
+ /* Distributed COM testers */
+ {"DCOM-SIMPLE", torture_dcom_simple, 0},
+
/* local (no server) testers */
{"LOCAL-NTLMSSP", torture_ntlmssp_self_check, 0},
{"LOCAL-ICONV", torture_local_iconv, 0},
{"LOCAL-TALLOC", torture_local_talloc, 0},
+ {"LOCAL-MESSAGING", torture_local_messaging, 0},
+ {"LOCAL-BINDING", torture_local_binding_string, 0},
+ {"LOCAL-IDTREE", torture_local_idtree, 0},
/* ldap testers */
{"LDAP-BASIC", torture_ldap_basic, 0},
if (gen_fnmatch(name, torture_ops[i].name) == 0) {
double t;
matched = True;
+ init_iconv();
printf("Running %s\n", torture_ops[i].name);
- if (torture_ops[i].flags & FLAG_MULTIPROC) {
+ if (torture_ops[i].multi_fn) {
BOOL result;
- t = torture_create_procs(torture_ops[i].fn, &result);
+ t = torture_create_procs(torture_ops[i].multi_fn,
+ &result);
if (!result) {
ret = False;
printf("TEST %s FAILED!\n", torture_ops[i].name);
}
} else {
- start_timer();
- if (!torture_ops[i].fn(0)) {
+ struct timeval tv = timeval_current();
+ if (!torture_ops[i].fn()) {
ret = False;
printf("TEST %s FAILED!\n", torture_ops[i].name);
}
- t = end_timer();
+ t = timeval_elapsed(&tv);
}
printf("%s took %g secs\n\n", torture_ops[i].name, t);
}
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_destroy(mem_ctx);
+ return NT_STATUS_IS_OK(status);
+}
+
/****************************************************************************
main program
****************************************************************************/
struct poptOption long_options[] = {
POPT_AUTOHELP
{"smb-ports", 'p', POPT_ARG_STRING, NULL, 0, "SMB ports", NULL},
- {"seed", 0, POPT_ARG_STRING, NULL, 0, "seed", 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},
POPT_TABLEEND
};
+ smbtorture_init_subsystems;
+
setup_logging("smbtorture", DEBUG_STDOUT);
#ifdef HAVE_SETBUFFER
lp_load(dyn_CONFIGFILE,True,False,False);
load_interfaces();
- srandom(time(NULL));
+ if (torture_seed == 0) {
+ torture_seed = time(NULL);
+ }
+ printf("Using seed %d\n", torture_seed);
+ srandom(torture_seed);
- argv_new = (const char **)poptGetArgs(pc);
+ argv_new = discard_const_p(char *, poptGetArgs(pc));
argc_new = argc;
for (i=0; i<argc; i++) {
}
/* see if its a RPC transport specifier */
- if (strncmp(argv_new[1], "ncacn_", 6) == 0) {
+ if (is_binding_string(argv_new[1])) {
lp_set_cmdline("torture:binding", argv_new[1]);
} else {
char *binding = NULL;
char *host = NULL, *share = NULL;
if (!parse_unc(argv_new[1], &host, &share)) {
+ d_printf("Invalid option: %s is not a valid torture target (share or binding string)\n\n", argv_new[1]);
usage(pc);
}
git.samba.org / bbaumbach / samba-autobuild / .git / blobdiff