/*
- Unix SMB/Netbios implementation.
- Version 1.9.
+ Unix SMB/CIFS implementation.
SMB torture tester
Copyright (C) Andrew Tridgell 1997-1998
static fstring host, workgroup, share, password, username, myname;
static int max_protocol = PROTOCOL_NT1;
-static char *sockops="TCP_NODELAY";
-static int nprocs=1, numops=100;
+static const char *sockops="TCP_NODELAY";
+static int nprocs=1;
+int torture_numops=100;
static int procnum; /* records process count number when forking */
static struct cli_state current_cli;
static fstring randomfname;
static BOOL use_oplocks;
static BOOL use_level_II_oplocks;
+static const char *client_txt = "client_oplocks.txt";
+static BOOL use_kerberos;
+
+BOOL torture_showall = False;
static double create_procs(BOOL (*fn)(int), BOOL *result);
static struct timeval tp1,tp2;
-static void start_timer(void)
+void start_timer(void)
{
gettimeofday(&tp1,NULL);
}
-static double end_timer(void)
+double end_timer(void)
{
gettimeofday(&tp2,NULL);
return((tp2.tv_sec - tp1.tv_sec) +
This function uses system5 shared memory. It takes advantage of a property
that the memory is not destroyed if it is attached when the id is removed
*/
-static void *shm_setup(int size)
+void *shm_setup(int size)
{
int shmid;
void *ret;
{
struct nmb_name called, calling;
struct in_addr ip;
- extern struct in_addr ipzero;
ZERO_STRUCTP(c);
make_nmb_name(&calling, myname, 0x0);
make_nmb_name(&called , host, 0x20);
- ip = ipzero;
+ zero_ip(&ip);
if (!cli_initialise(c) || !cli_connect(c, host, &ip)) {
printf("Failed to connect with %s\n", host);
return False;
}
+ c->use_kerberos = use_kerberos;
+
c->timeout = 120000; /* set a really long timeout (2 minutes) */
if (use_oplocks) c->use_oplocks = True;
if (use_level_II_oplocks) c->use_level_II_oplocks = True;
return True;
}
-static BOOL open_connection(struct cli_state *c)
+BOOL torture_open_connection(struct cli_state *c)
{
ZERO_STRUCTP(c);
}
-static BOOL close_connection(struct cli_state *c)
+BOOL torture_close_connection(struct cli_state *c)
{
BOOL ret = True;
if (!cli_tdis(c)) {
/* check if the server produced the expected error code */
-static BOOL check_error(struct cli_state *c,
- uint8 eclass, uint32 ecode, uint32 nterr)
+static BOOL check_error(int line, struct cli_state *c,
+ uint8 eclass, uint32 ecode, NTSTATUS nterr)
{
- uint8 class;
- uint32 num;
- (void)cli_error(c, &class, &num, NULL);
- if ((eclass != class || ecode != num) &&
- num != (nterr&0xFFFFFF)) {
- printf("unexpected error code class=%d code=%d\n",
- (int)class, (int)num);
- printf(" expected %d/%d %d\n",
- (int)eclass, (int)ecode, (int)nterr);
- return False;
- }
+ if (cli_is_dos_error(c)) {
+ uint8 class;
+ uint32 num;
+
+ /* Check DOS error */
+
+ cli_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);
+ return False;
+ }
+
+ } else {
+ NTSTATUS status;
+
+ /* Check NT error */
+
+ status = cli_nt_error(c);
+
+ 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);
+ return False;
+ }
+ }
+
return True;
}
static BOOL wait_lock(struct cli_state *c, int fnum, uint32 offset, uint32 len)
{
while (!cli_lock(c, fnum, offset, len, -1, WRITE_LOCK)) {
- if (!check_error(c, ERRDOS, ERRlock, 0)) return False;
+ if (!check_error(__LINE__, c, ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED)) return False;
}
return True;
}
static BOOL rw_torture(struct cli_state *c)
{
- char *lockfname = "\\torture.lck";
+ const char *lockfname = "\\torture.lck";
fstring fname;
int fnum;
int fnum2;
}
- for (i=0;i<numops;i++) {
+ for (i=0;i<torture_numops;i++) {
unsigned n = (unsigned)sys_random()%10;
if (i % 10 == 0) {
printf("%d\r", i); fflush(stdout);
ret = rw_torture(&cli);
- if (!close_connection(&cli)) {
+ if (!torture_close_connection(&cli)) {
ret = False;
}
char buf_rd[131072];
unsigned count;
unsigned countprev = 0;
- unsigned sent = 0;
+ ssize_t sent = 0;
BOOL correct = True;
srandom(1);
sent = sizeof(buf) - count;
}
- if (cli_write(c, fnum, 0, buf+count, count, sent) != sent) {
+ if (cli_write(c, fnum, 0, buf+count, count, (size_t)sent) != sent) {
printf("write failed (%s)\n", cli_errstr(c));
correct = False;
}
static BOOL rw_torture2(struct cli_state *c1, struct cli_state *c2)
{
- char *lockfname = "\\torture.lck";
+ const char *lockfname = "\\torture2.lck";
int fnum1;
int fnum2;
int i;
- char buf[131072];
- char buf_rd[131072];
+ uchar buf[131072];
+ uchar buf_rd[131072];
BOOL correct = True;
ssize_t bytes_read;
return False;
}
- for (i=0;i<numops;i++)
+ for (i=0;i<torture_numops;i++)
{
size_t buf_size = ((unsigned)sys_random()%(sizeof(buf)-1))+ 1;
if (i % 10 == 0) {
static struct cli_state cli1, cli2;
BOOL test1, test2;
- if (!open_connection(&cli1) || !open_connection(&cli2)) {
+ if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
return False;
}
cli_sockopt(&cli1, sockops);
test2 = rw_torture2(&cli1, &cli1);
printf("Passed readwritetest v2: %s\n", BOOLSTR(test2));
- if (!close_connection(&cli1)) {
+ if (!torture_close_connection(&cli1)) {
test1 = False;
}
- if (!close_connection(&cli2)) {
+ if (!torture_close_connection(&cli2)) {
test2 = False;
}
printf("run_readwritemulti: fname %s\n", randomfname);
test = rw_torture3(&cli, randomfname);
- if (!close_connection(&cli)) {
+ if (!torture_close_connection(&cli)) {
test = False;
}
{
static struct cli_state cli1;
int fnum1;
- char *lockfname = "\\large.dat";
+ const char *lockfname = "\\large.dat";
size_t fsize;
- char buf[0x10000];
+ char buf[126*1024];
BOOL correct = True;
- if (!open_connection(&cli1)) {
+ if (!torture_open_connection(&cli1)) {
return False;
}
cli_sockopt(&cli1, sockops);
memset(buf,'\0',sizeof(buf));
- cli1.max_xmit = 0x11000;
+ cli1.max_xmit = 128*1024;
printf("starting readwritelarge\n");
cli_write(&cli1, fnum1, 0, buf, 0, sizeof(buf));
- if (!cli_close(&cli1, fnum1)) {
- printf("close failed (%s)\n", cli_errstr(&cli1));
- correct = False;
- }
-
- if (!cli_qpathinfo(&cli1, lockfname, NULL, NULL, NULL, &fsize, NULL)) {
- printf("qpathinfo failed (%s)\n", cli_errstr(&cli1));
+ if (!cli_qfileinfo(&cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+ printf("qfileinfo failed (%s)\n", cli_errstr(&cli1));
correct = False;
}
correct = False;
}
+ if (!cli_close(&cli1, fnum1)) {
+ printf("close failed (%s)\n", cli_errstr(&cli1));
+ correct = False;
+ }
+
if (!cli_unlink(&cli1, lockfname)) {
printf("unlink failed (%s)\n", cli_errstr(&cli1));
correct = False;
return False;
}
+ cli1.max_xmit = 4*1024;
+
cli_smbwrite(&cli1, fnum1, buf, 0, sizeof(buf));
+ if (!cli_qfileinfo(&cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+ printf("qfileinfo failed (%s)\n", cli_errstr(&cli1));
+ correct = False;
+ }
+
+ if (fsize == sizeof(buf))
+ printf("readwritelarge test 2 succeeded (size = %x)\n", fsize);
+ else {
+ printf("readwritelarge test 2 failed (size = %x)\n", fsize);
+ correct = False;
+ }
+
+#if 0
+ /* ToDo - set allocation. JRA */
+ if(!cli_set_allocation_size(&cli1, fnum1, 0)) {
+ printf("set allocation size to zero failed (%s)\n", cli_errstr(&cli1));
+ return False;
+ }
+ if (!cli_qfileinfo(&cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+ printf("qfileinfo failed (%s)\n", cli_errstr(&cli1));
+ correct = False;
+ }
+ if (fsize != 0)
+ printf("readwritelarge test 3 (truncate test) succeeded (size = %x)\n", fsize);
+#endif
+
if (!cli_close(&cli1, fnum1)) {
printf("close failed (%s)\n", cli_errstr(&cli1));
correct = False;
}
- if (!close_connection(&cli1)) {
+ if (!torture_close_connection(&cli1)) {
correct = False;
}
return correct;
}
int line_count = 0;
+int nbio_id;
+
+#define ival(s) strtol(s, NULL, 0)
/* run a test that simulates an approximate netbench client load */
static BOOL run_netbench(int client)
cli = current_cli;
+ nbio_id = client;
+
cli_sockopt(&cli, sockops);
nb_setup(&cli);
- slprintf(cname,sizeof(fname), "CLIENT%d", client);
+ slprintf(cname,sizeof(fname), "client%d", client);
- f = fopen("client.txt", "r");
+ f = fopen(client_txt, "r");
if (!f) {
- perror("client.txt");
+ perror(client_txt);
return False;
}
/* printf("[%d] %s\n", line_count, line); */
- all_string_sub(line,"CLIENT1", cname, sizeof(line));
+ all_string_sub(line,"client1", cname, sizeof(line));
- for (i=0;i<20;i++) params[i] = "";
-
/* parse the command parameters */
params[0] = strtok(line," ");
i = 0;
if (i < 2) continue;
- if (strcmp(params[1],"REQUEST") == 0) {
- if (!strcmp(params[0],"SMBopenX")) {
- fstrcpy(fname, params[5]);
- } else if (!strcmp(params[0],"SMBclose")) {
- nb_close(atoi(params[3]));
- } else if (!strcmp(params[0],"SMBmkdir")) {
- nb_mkdir(params[3]);
- } else if (!strcmp(params[0],"CREATE")) {
- nb_create(params[3], atoi(params[5]));
- } else if (!strcmp(params[0],"SMBrmdir")) {
- nb_rmdir(params[3]);
- } else if (!strcmp(params[0],"SMBunlink")) {
- fstrcpy(fname, params[3]);
- } else if (!strcmp(params[0],"SMBmv")) {
- nb_rename(params[3], params[5]);
- } else if (!strcmp(params[0],"SMBgetatr")) {
- fstrcpy(fname, params[3]);
- } else if (!strcmp(params[0],"SMBwrite")) {
- nb_write(atoi(params[3]),
- atoi(params[5]), atoi(params[7]));
- } else if (!strcmp(params[0],"SMBwritebraw")) {
- nb_write(atoi(params[3]),
- atoi(params[7]), atoi(params[5]));
- } else if (!strcmp(params[0],"SMBreadbraw")) {
- nb_read(atoi(params[3]),
- atoi(params[7]), atoi(params[5]));
- } else if (!strcmp(params[0],"SMBread")) {
- nb_read(atoi(params[3]),
- atoi(params[5]), atoi(params[7]));
- }
+ if (!strncmp(params[0],"SMB", 3)) {
+ printf("ERROR: You are using a dbench 1 load file\n");
+ exit(1);
+ }
+
+ if (!strcmp(params[0],"NTCreateX")) {
+ nb_createx(params[1], ival(params[2]), ival(params[3]),
+ ival(params[4]));
+ } else if (!strcmp(params[0],"Close")) {
+ nb_close(ival(params[1]));
+ } else if (!strcmp(params[0],"Rename")) {
+ nb_rename(params[1], params[2]);
+ } else if (!strcmp(params[0],"Unlink")) {
+ nb_unlink(params[1]);
+ } else if (!strcmp(params[0],"Deltree")) {
+ nb_deltree(params[1]);
+ } else if (!strcmp(params[0],"Rmdir")) {
+ nb_rmdir(params[1]);
+ } else if (!strcmp(params[0],"QUERY_PATH_INFORMATION")) {
+ nb_qpathinfo(params[1]);
+ } else if (!strcmp(params[0],"QUERY_FILE_INFORMATION")) {
+ nb_qfileinfo(ival(params[1]));
+ } else if (!strcmp(params[0],"QUERY_FS_INFORMATION")) {
+ nb_qfsinfo(ival(params[1]));
+ } else if (!strcmp(params[0],"FIND_FIRST")) {
+ nb_findfirst(params[1]);
+ } else if (!strcmp(params[0],"WriteX")) {
+ nb_writex(ival(params[1]),
+ ival(params[2]), ival(params[3]), ival(params[4]));
+ } else if (!strcmp(params[0],"ReadX")) {
+ nb_readx(ival(params[1]),
+ ival(params[2]), ival(params[3]), ival(params[4]));
+ } else if (!strcmp(params[0],"Flush")) {
+ nb_flush(ival(params[1]));
} else {
- if (!strcmp(params[0],"SMBopenX")) {
- if (!strncmp(params[2], "ERR", 3)) continue;
- nb_open(fname, atoi(params[3]), atoi(params[5]));
- } else if (!strcmp(params[0],"SMBgetatr")) {
- if (!strncmp(params[2], "ERR", 3)) continue;
- nb_stat(fname, atoi(params[3]));
- } else if (!strcmp(params[0],"SMBunlink")) {
- if (!strncmp(params[2], "ERR", 3)) continue;
- nb_unlink(fname);
- }
+ printf("Unknown operation %s\n", params[0]);
+ exit(1);
}
}
fclose(f);
- slprintf(fname,sizeof(fname), "CLIENTS/CLIENT%d", client);
- rmdir(fname);
- rmdir("CLIENTS");
+ nb_cleanup();
- printf("+");
-
- if (!close_connection(&cli)) {
+ if (!torture_close_connection(&cli)) {
correct = False;
}
}
-/* run a test that simulates an approximate netbench w9X client load */
-static BOOL run_nbw95(int dummy)
+/* run a test that simulates an approximate netbench client load */
+static BOOL run_nbench(int dummy)
{
double t;
BOOL correct = True;
- t = create_procs(run_netbench, &correct);
- /* to produce a netbench result we scale accoding to the
- netbench measured throughput for the run that produced the
- sniff that was used to produce client.txt. That run used 2
- clients and ran for 660 seconds to produce a result of
- 4MBit/sec. */
- printf("Throughput %g MB/sec (NB=%g MB/sec %g MBit/sec)\n",
- 132*nprocs/t, 0.5*0.5*nprocs*660/t, 2*nprocs*660/t);
- return correct;
-}
-/* run a test that simulates an approximate netbench wNT client load */
-static BOOL run_nbwnt(int dummy)
-{
- double t;
- BOOL correct = True;
+ nbio_shmem(nprocs);
+
+ nbio_id = -1;
+
+ signal(SIGALRM, nb_alarm);
+ alarm(1);
t = create_procs(run_netbench, &correct);
- printf("Throughput %g MB/sec (NB=%g MB/sec %g MBit/sec)\n",
- 132*nprocs/t, 0.5*0.5*nprocs*660/t, 2*nprocs*660/t);
+ alarm(0);
+
+ printf("\nThroughput %g MB/sec\n",
+ 1.0e-6 * nbio_total() / t);
return correct;
}
-
/*
This test checks for two things:
static BOOL run_locktest1(int dummy)
{
static struct cli_state cli1, cli2;
- char *fname = "\\lockt1.lck";
+ const char *fname = "\\lockt1.lck";
int fnum1, fnum2, fnum3;
time_t t1, t2;
+ unsigned lock_timeout;
- if (!open_connection(&cli1) || !open_connection(&cli2)) {
+ if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
return False;
}
cli_sockopt(&cli1, sockops);
printf("lock2 succeeded! This is a locking bug\n");
return False;
} else {
- if (!check_error(&cli2, ERRDOS, ERRlock, 0)) return False;
+ if (!check_error(__LINE__, &cli2, ERRDOS, ERRlock,
+ NT_STATUS_LOCK_NOT_GRANTED)) return False;
}
- printf("Testing lock timeouts\n");
+ lock_timeout = (1 + (random() % 20));
+ printf("Testing lock timeout with timeout=%u\n", lock_timeout);
t1 = time(NULL);
- if (cli_lock(&cli2, fnum3, 0, 4, 10*1000, WRITE_LOCK)) {
+ if (cli_lock(&cli2, fnum3, 0, 4, lock_timeout * 1000, WRITE_LOCK)) {
printf("lock3 succeeded! This is a locking bug\n");
return False;
} else {
- if (!check_error(&cli2, ERRDOS, ERRlock, 0)) return False;
+ 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",
+ (unsigned int)(t2-t1), lock_timeout);
if (!cli_close(&cli1, fnum2)) {
printf("close1 failed (%s)\n", cli_errstr(&cli1));
printf("lock4 succeeded! This is a locking bug\n");
return False;
} else {
- if (!check_error(&cli2, ERRDOS, ERRlock, 0)) return False;
+ if (!check_error(__LINE__, &cli2, ERRDOS, ERRlock,
+ NT_STATUS_FILE_LOCK_CONFLICT)) return False;
}
if (!cli_close(&cli1, fnum1)) {
}
- if (!close_connection(&cli1)) {
+ if (!torture_close_connection(&cli1)) {
return False;
}
- if (!close_connection(&cli2)) {
+ if (!torture_close_connection(&cli2)) {
return False;
}
static BOOL run_tcon_test(int dummy)
{
static struct cli_state cli1;
- char *fname = "\\tcontest.tmp";
+ const char *fname = "\\tcontest.tmp";
int fnum1;
uint16 cnum;
char buf[4];
- if (!open_connection(&cli1)) {
+ if (!torture_open_connection(&cli1)) {
return False;
}
cli_sockopt(&cli1, sockops);
return False;
}
- if (!close_connection(&cli1)) {
+ if (!torture_close_connection(&cli1)) {
return False;
}
static BOOL run_locktest2(int dummy)
{
static struct cli_state cli;
- char *fname = "\\lockt2.lck";
+ const char *fname = "\\lockt2.lck";
int fnum1, fnum2, fnum3;
BOOL correct = True;
- if (!open_connection(&cli)) {
+ if (!torture_open_connection(&cli)) {
return False;
}
printf("WRITE lock1 succeeded! This is a locking bug\n");
correct = False;
} else {
- if (!check_error(&cli, ERRDOS, ERRlock, 0)) return False;
+ if (!check_error(__LINE__, &cli, ERRDOS, ERRlock,
+ NT_STATUS_LOCK_NOT_GRANTED)) return False;
}
if (cli_lock(&cli, fnum2, 0, 4, 0, WRITE_LOCK)) {
printf("WRITE lock2 succeeded! This is a locking bug\n");
correct = False;
} else {
- if (!check_error(&cli, ERRDOS, ERRlock, 0)) return False;
+ if (!check_error(__LINE__, &cli, ERRDOS, ERRlock,
+ NT_STATUS_LOCK_NOT_GRANTED)) return False;
}
if (cli_lock(&cli, fnum2, 0, 4, 0, READ_LOCK)) {
printf("READ lock2 succeeded! This is a locking bug\n");
correct = False;
} else {
- if (!check_error(&cli, ERRDOS, ERRlock, 0)) return False;
+ if (!check_error(__LINE__, &cli, ERRDOS, ERRlock,
+ NT_STATUS_FILE_LOCK_CONFLICT)) return False;
}
if (!cli_lock(&cli, fnum1, 100, 4, 0, WRITE_LOCK)) {
printf("unlock1 succeeded! This is a locking bug\n");
correct = False;
} else {
- if (!check_error(&cli, ERRDOS, ERRnotlocked, 0)) return False;
+ if (!check_error(__LINE__, &cli,
+ ERRDOS, ERRlock,
+ NT_STATUS_RANGE_NOT_LOCKED)) return False;
}
if (cli_unlock(&cli, fnum1, 0, 8)) {
printf("unlock2 succeeded! This is a locking bug\n");
correct = False;
} else {
- if (!check_error(&cli, ERRDOS, ERRnotlocked, 0)) return False;
+ if (!check_error(__LINE__, &cli,
+ ERRDOS, ERRlock,
+ NT_STATUS_RANGE_NOT_LOCKED)) return False;
}
if (cli_lock(&cli, fnum3, 0, 4, 0, WRITE_LOCK)) {
printf("lock3 succeeded! This is a locking bug\n");
correct = False;
} else {
- if (!check_error(&cli, ERRDOS, ERRlock, 0)) return False;
+ if (!check_error(__LINE__, &cli, ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED)) return False;
}
cli_setpid(&cli, 1);
return False;
}
- if (!close_connection(&cli)) {
+ if (!torture_close_connection(&cli)) {
correct = False;
}
static BOOL run_locktest3(int dummy)
{
static struct cli_state cli1, cli2;
- char *fname = "\\lockt3.lck";
+ const char *fname = "\\lockt3.lck";
int fnum1, fnum2, i;
uint32 offset;
BOOL correct = True;
-#define NEXT_OFFSET offset += (~(uint32)0) / numops
+#define NEXT_OFFSET offset += (~(uint32)0) / torture_numops
- if (!open_connection(&cli1) || !open_connection(&cli2)) {
+ if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
return False;
}
cli_sockopt(&cli1, sockops);
return False;
}
- for (offset=i=0;i<numops;i++) {
+ for (offset=i=0;i<torture_numops;i++) {
NEXT_OFFSET;
if (!cli_lock(&cli1, fnum1, offset-1, 1, 0, WRITE_LOCK)) {
printf("lock1 %d failed (%s)\n",
}
}
- for (offset=i=0;i<numops;i++) {
+ for (offset=i=0;i<torture_numops;i++) {
NEXT_OFFSET;
if (cli_lock(&cli1, fnum1, offset-2, 1, 0, WRITE_LOCK)) {
}
}
- for (offset=i=0;i<numops;i++) {
+ for (offset=i=0;i<torture_numops;i++) {
NEXT_OFFSET;
if (!cli_unlock(&cli1, fnum1, offset-1, 1)) {
return False;
}
- if (!close_connection(&cli1)) {
+ if (!torture_close_connection(&cli1)) {
correct = False;
}
- if (!close_connection(&cli2)) {
+ if (!torture_close_connection(&cli2)) {
correct = False;
}
static BOOL run_locktest4(int dummy)
{
static struct cli_state cli1, cli2;
- char *fname = "\\lockt4.lck";
+ const char *fname = "\\lockt4.lck";
int fnum1, fnum2, f;
BOOL ret;
char buf[1000];
BOOL correct = True;
- if (!open_connection(&cli1) || !open_connection(&cli2)) {
+ if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
return False;
}
((fnum1 = cli_open(&cli1, fname, O_RDWR, DENY_NONE)) != -1) &&
cli_lock(&cli1, fnum1, 7, 1, 0, WRITE_LOCK);
cli_close(&cli1, f);
+ cli_close(&cli1, fnum1);
EXPECTED(ret, True);
printf("the server %s have the NT byte range lock bug\n", !ret?"does":"doesn't");
-
+
fail:
cli_close(&cli1, fnum1);
cli_close(&cli2, fnum2);
cli_unlink(&cli1, fname);
- close_connection(&cli1);
- close_connection(&cli2);
+ torture_close_connection(&cli1);
+ torture_close_connection(&cli2);
printf("finished locktest4\n");
return correct;
static BOOL run_locktest5(int dummy)
{
static struct cli_state cli1, cli2;
- char *fname = "\\lockt5.lck";
+ const char *fname = "\\lockt5.lck";
int fnum1, fnum2, fnum3;
BOOL ret;
char buf[1000];
BOOL correct = True;
- if (!open_connection(&cli1) || !open_connection(&cli2)) {
+ if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
return False;
}
cli_close(&cli1, fnum1);
cli_close(&cli2, fnum2);
cli_unlink(&cli1, fname);
- if (!close_connection(&cli1)) {
+ if (!torture_close_connection(&cli1)) {
correct = False;
}
- if (!close_connection(&cli2)) {
+ if (!torture_close_connection(&cli2)) {
correct = False;
}
return correct;
}
-
/*
- this produces a matrix of deny mode behaviour
- */
-static BOOL run_denytest1(int dummy)
+ tries the unusual lockingX locktype bits
+*/
+static BOOL run_locktest6(int dummy)
{
- static struct cli_state cli1, cli2;
- int fnum1, fnum2;
- int f, d1, d2, o1, o2, x=0;
- char *fnames[] = {"\\denytest1.exe", "\\denytest1.dat", NULL};
- struct {
- int v;
- char *name;
- } deny_modes[] = {
- {DENY_DOS, "DENY_DOS"},
- {DENY_ALL, "DENY_ALL"},
- {DENY_WRITE, "DENY_WRITE"},
- {DENY_READ, "DENY_READ"},
- {DENY_NONE, "DENY_NONE"},
- {DENY_FCB, "DENY_FCB"},
- {-1, NULL}};
- struct {
- int v;
- char *name;
- } open_modes[] = {
- {O_RDWR, "O_RDWR"},
- {O_RDONLY, "O_RDONLY"},
- {O_WRONLY, "O_WRONLY"},
- {-1, NULL}};
- BOOL correct = True;
+ static struct cli_state cli;
+ const char *fname[1] = { "\\lock6.txt" };
+ int i;
+ int fnum;
+ NTSTATUS status;
- if (!open_connection(&cli1) || !open_connection(&cli2)) {
+ if (!torture_open_connection(&cli)) {
return False;
}
- cli_sockopt(&cli1, sockops);
- cli_sockopt(&cli2, sockops);
-
- printf("starting denytest1\n");
-
- for (f=0;fnames[f];f++) {
- cli_unlink(&cli1, fnames[f]);
- fnum1 = cli_open(&cli1, fnames[f], O_RDWR|O_CREAT, DENY_NONE);
- cli_write(&cli1, fnum1, 0, fnames[f], 0, strlen(fnames[f]));
- cli_close(&cli1, fnum1);
+ cli_sockopt(&cli, sockops);
- for (d1=0;deny_modes[d1].name;d1++)
- for (o1=0;open_modes[o1].name;o1++)
- for (d2=0;deny_modes[d2].name;d2++)
- for (o2=0;open_modes[o2].name;o2++) {
- fnum1 = cli_open(&cli1, fnames[f],
- open_modes[o1].v,
- deny_modes[d1].v);
- fnum2 = cli_open(&cli2, fnames[f],
- open_modes[o2].v,
- deny_modes[d2].v);
-
- printf("%s %8s %10s %8s %10s ",
- fnames[f],
- open_modes[o1].name,
- deny_modes[d1].name,
- open_modes[o2].name,
- deny_modes[d2].name);
-
- if (fnum1 == -1) {
- printf("X");
- } else if (fnum2 == -1) {
- printf("-");
- } else {
- if (cli_read(&cli2, fnum2, (void *)&x, 0, 1) == 1) {
- printf("R");
- }
- if (cli_write(&cli2, fnum2, 0, (void *)&x, 0, 1) == 1) {
- printf("W");
- }
- }
+ printf("starting locktest6\n");
- printf("\n");
- cli_close(&cli1, fnum1);
- cli_close(&cli2, fnum2);
- }
-
- cli_unlink(&cli1, fnames[f]);
- }
+ for (i=0;i<1;i++) {
+ printf("Testing %s\n", fname[i]);
- if (!close_connection(&cli1)) {
- correct = False;
- }
- if (!close_connection(&cli2)) {
- correct = False;
- }
-
- printf("finshed denytest1\n");
- return correct;
-}
+ cli_unlink(&cli, fname[i]);
+ fnum = cli_open(&cli, fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+ status = cli_locktype(&cli, fnum, 0, 8, 0, LOCKING_ANDX_CHANGE_LOCKTYPE);
+ cli_close(&cli, fnum);
+ printf("CHANGE_LOCKTYPE gave %s\n", nt_errstr(status));
-/*
- this produces a matrix of deny mode behaviour for two opens on the
- same connection
- */
-static BOOL run_denytest2(int dummy)
-{
- static struct cli_state cli1;
- int fnum1, fnum2;
- int f, d1, d2, o1, o2, x=0;
- char *fnames[] = {"\\denytest2.exe", "\\denytest2.dat", NULL};
- struct {
- int v;
- char *name;
- } deny_modes[] = {
- {DENY_DOS, "DENY_DOS"},
- {DENY_ALL, "DENY_ALL"},
- {DENY_WRITE, "DENY_WRITE"},
- {DENY_READ, "DENY_READ"},
- {DENY_NONE, "DENY_NONE"},
- {DENY_FCB, "DENY_FCB"},
- {-1, NULL}};
- struct {
- int v;
- char *name;
- } open_modes[] = {
- {O_RDWR, "O_RDWR"},
- {O_RDONLY, "O_RDONLY"},
- {O_WRONLY, "O_WRONLY"},
- {-1, NULL}};
- BOOL correct = True;
+ fnum = cli_open(&cli, fname[i], O_RDWR, DENY_NONE);
+ status = cli_locktype(&cli, fnum, 0, 8, 0, LOCKING_ANDX_CANCEL_LOCK);
+ cli_close(&cli, fnum);
+ printf("CANCEL_LOCK gave %s\n", nt_errstr(status));
- if (!open_connection(&cli1)) {
- return False;
+ cli_unlink(&cli, fname[i]);
}
- cli_sockopt(&cli1, sockops);
-
- printf("starting denytest2\n");
-
- for (f=0;fnames[f];f++) {
- cli_unlink(&cli1, fnames[f]);
- fnum1 = cli_open(&cli1, fnames[f], O_RDWR|O_CREAT, DENY_NONE);
- cli_write(&cli1, fnum1, 0, fnames[f], 0, strlen(fnames[f]));
- cli_close(&cli1, fnum1);
-
- for (d1=0;deny_modes[d1].name;d1++)
- for (o1=0;open_modes[o1].name;o1++)
- for (d2=0;deny_modes[d2].name;d2++)
- for (o2=0;open_modes[o2].name;o2++) {
- fnum1 = cli_open(&cli1, fnames[f],
- open_modes[o1].v,
- deny_modes[d1].v);
- fnum2 = cli_open(&cli1, fnames[f],
- open_modes[o2].v,
- deny_modes[d2].v);
-
- printf("%s %8s %10s %8s %10s ",
- fnames[f],
- open_modes[o1].name,
- deny_modes[d1].name,
- open_modes[o2].name,
- deny_modes[d2].name);
-
- if (fnum1 == -1) {
- printf("X");
- } else if (fnum2 == -1) {
- printf("-");
- } else {
- if (cli_read(&cli1, fnum2, (void *)&x, 0, 1) == 1) {
- printf("R");
- }
- if (cli_write(&cli1, fnum2, 0, (void *)&x, 0, 1) == 1) {
- printf("W");
- }
- }
-
- printf("\n");
- cli_close(&cli1, fnum1);
- cli_close(&cli1, fnum2);
- }
-
- cli_unlink(&cli1, fnames[f]);
- }
+ torture_close_connection(&cli);
- if (!close_connection(&cli1)) {
- correct = False;
- }
-
- printf("finshed denytest2\n");
- return correct;
+ printf("finished locktest6\n");
+ return True;
}
/*
static BOOL run_fdpasstest(int dummy)
{
static struct cli_state cli1, cli2, cli3;
- char *fname = "\\fdpass.tst";
+ const char *fname = "\\fdpass.tst";
int fnum1;
pstring buf;
- if (!open_connection(&cli1) || !open_connection(&cli2)) {
+ if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
return False;
}
cli_sockopt(&cli1, sockops);
cli_close(&cli1, fnum1);
cli_unlink(&cli1, fname);
- close_connection(&cli1);
- close_connection(&cli2);
+ torture_close_connection(&cli1);
+ torture_close_connection(&cli2);
printf("finished fdpasstest\n");
return True;
static BOOL run_unlinktest(int dummy)
{
static struct cli_state cli;
- char *fname = "\\unlink.tst";
+ const char *fname = "\\unlink.tst";
int fnum;
BOOL correct = True;
- if (!open_connection(&cli)) {
+ if (!torture_open_connection(&cli)) {
return False;
}
if (cli_unlink(&cli, 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, fnum);
cli_unlink(&cli, fname);
- if (!close_connection(&cli)) {
+ if (!torture_close_connection(&cli)) {
correct = False;
}
static BOOL run_maxfidtest(int dummy)
{
static struct cli_state cli;
- char *template = "\\maxfid.%d.%d";
+ const char *template = "\\maxfid.%d.%d";
fstring fname;
- int fnum;
+ int fnums[0x11000], i;
int retries=4;
BOOL correct = True;
cli_sockopt(&cli, sockops);
- fnum = 0;
- while (1) {
- slprintf(fname,sizeof(fname)-1,template, fnum,(int)getpid());
- if (cli_open(&cli, fname,
- O_RDWR|O_CREAT|O_TRUNC, DENY_NONE) ==
+ for (i=0; i<0x11000; i++) {
+ slprintf(fname,sizeof(fname)-1,template, i,(int)getpid());
+ if ((fnums[i] = cli_open(&cli, fname,
+ O_RDWR|O_CREAT|O_TRUNC, DENY_NONE)) ==
-1) {
printf("open of %s failed (%s)\n",
fname, cli_errstr(&cli));
- printf("maximum fnum is %d\n", fnum);
+ printf("maximum fnum is %d\n", i);
break;
}
- fnum++;
- if (fnum % 100 == 0) printf("%d\r", fnum);
+ printf("%6d\r", i);
}
- printf("%d\n", fnum);
+ printf("%6d\n", i);
+ i--;
printf("cleaning up\n");
- while (fnum > 0) {
- fnum--;
- slprintf(fname,sizeof(fname)-1,template, fnum,(int)getpid());
- cli_close(&cli, fnum);
+ for (;i>=0;i--) {
+ slprintf(fname,sizeof(fname)-1,template, i,(int)getpid());
+ cli_close(&cli, fnums[i]);
if (!cli_unlink(&cli, fname)) {
printf("unlink of %s failed (%s)\n",
fname, cli_errstr(&cli));
correct = False;
}
+ printf("%6d\r", i);
}
+ printf("%6d\n", 0);
printf("maxfid test finished\n");
- if (!close_connection(&cli)) {
+ if (!torture_close_connection(&cli)) {
correct = False;
}
return correct;
cli_negprot_send(&cli);
}
- if (!close_connection(&cli)) {
+ if (!torture_close_connection(&cli)) {
correct = False;
}
int api, param_len, i;
static struct cli_state cli;
BOOL correct = True;
+ int count = 50000;
printf("starting random ipc test\n");
- if (!open_connection(&cli)) {
+ if (!torture_open_connection(&cli)) {
return False;
}
- for (i=0;i<50000;i++) {
+ for (i=0;i<count;i++) {
api = sys_random() % 500;
param_len = (sys_random() % 64);
NULL, 0, BUFFER_SIZE,
&rparam, &rprcnt,
&rdata, &rdrcnt);
+ if (i % 100 == 0) {
+ printf("%d/%d\r", i,count);
+ }
}
+ printf("%d/%d\n", i, count);
- if (!close_connection(&cli)) {
+ if (!torture_close_connection(&cli)) {
correct = False;
}
printf("starting browse test\n");
- if (!open_connection(&cli)) {
+ if (!torture_open_connection(&cli)) {
return False;
}
SV_TYPE_ALL,
browse_callback, NULL);
- if (!close_connection(&cli)) {
+ if (!torture_close_connection(&cli)) {
correct = False;
}
static struct cli_state cli;
int fnum;
time_t t, t2;
- char *fname = "\\attrib.tst";
+ const char *fname = "\\attrib.tst";
BOOL correct = True;
printf("starting attrib test\n");
- if (!open_connection(&cli)) {
+ if (!torture_open_connection(&cli)) {
return False;
}
correct = False;
}
- if (abs(t - time(NULL)) > 2) {
+ if (abs(t - time(NULL)) > 60*60*24*10) {
printf("ERROR: SMBgetatr bug. time is %s",
ctime(&t));
t = time(NULL);
cli_unlink(&cli, fname);
- if (!close_connection(&cli)) {
+ if (!torture_close_connection(&cli)) {
correct = False;
}
int fnum;
size_t size;
time_t c_time, a_time, m_time, w_time, m_time2;
- char *fname = "\\trans2.tst";
- char *dname = "\\trans2";
- char *fname2 = "\\trans2\\trans2.tst";
+ const char *fname = "\\trans2.tst";
+ const char *dname = "\\trans2";
+ const char *fname2 = "\\trans2\\trans2.tst";
+ pstring pname;
BOOL correct = True;
printf("starting trans2 test\n");
- if (!open_connection(&cli)) {
+ if (!torture_open_connection(&cli)) {
return False;
}
printf("ERROR: qfileinfo failed (%s)\n", cli_errstr(&cli));
correct = False;
}
+
+ if (!cli_qfilename(&cli, fnum, pname)) {
+ printf("ERROR: qfilename failed (%s)\n", cli_errstr(&cli));
+ correct = False;
+ }
+
+ if (strcmp(pname, fname)) {
+ printf("qfilename gave different name? [%s] [%s]\n",
+ fname, pname);
+ correct = False;
+ }
+
cli_close(&cli, fnum);
sleep(2);
cli_unlink(&cli, fname);
fnum = cli_open(&cli, fname,
O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
+ if (fnum == -1) {
+ printf("open of %s failed (%s)\n", fname, cli_errstr(&cli));
+ return False;
+ }
cli_close(&cli, fnum);
if (!cli_qpathinfo(&cli, fname, &c_time, &a_time, &m_time, &size, NULL)) {
}
if (abs(m_time - time(NULL)) > 60*60*24*7) {
- printf("ERROR: totally incorrect times - maybe word reversed?\n");
+ printf("ERROR: totally incorrect times - maybe word reversed? mtime=%s", ctime(&m_time));
correct = False;
}
}
cli_unlink(&cli, fname2);
cli_rmdir(&cli, dname);
- if (!close_connection(&cli)) {
+ if (!torture_close_connection(&cli)) {
correct = False;
}
{
static struct cli_state cli;
int fnum;
- char *fname = "\\w2ktest\\w2k.tst";
+ const char *fname = "\\w2ktest\\w2k.tst";
int level;
BOOL correct = True;
printf("starting w2k test\n");
- if (!open_connection(&cli)) {
+ if (!torture_open_connection(&cli)) {
return False;
}
O_RDWR | O_CREAT , DENY_NONE);
for (level = 1004; level < 1040; level++) {
- if (!new_trans(&cli, fnum, level)) {
- correct = False;
- }
+ new_trans(&cli, fnum, level);
}
cli_close(&cli, fnum);
- if (!close_connection(&cli)) {
+ if (!torture_close_connection(&cli)) {
correct = False;
}
static BOOL run_oplock1(int dummy)
{
static struct cli_state cli1;
- char *fname = "\\lockt1.lck";
+ const char *fname = "\\lockt1.lck";
int fnum1;
BOOL correct = True;
printf("starting oplock test 1\n");
- if (!open_connection(&cli1)) {
+ if (!torture_open_connection(&cli1)) {
return False;
}
return False;
}
- if (!close_connection(&cli1)) {
+ if (!torture_close_connection(&cli1)) {
correct = False;
}
static BOOL run_oplock2(int dummy)
{
static struct cli_state cli1, cli2;
- char *fname = "\\lockt2.lck";
+ const char *fname = "\\lockt2.lck";
int fnum1, fnum2;
int saved_use_oplocks = use_oplocks;
char buf[4];
printf("starting oplock test 2\n");
- if (!open_connection(&cli1)) {
+ if (!torture_open_connection(&cli1)) {
use_level_II_oplocks = False;
use_oplocks = saved_use_oplocks;
return False;
cli1.use_oplocks = True;
cli1.use_level_II_oplocks = True;
- if (!open_connection(&cli2)) {
+ if (!torture_open_connection(&cli2)) {
use_level_II_oplocks = False;
use_oplocks = saved_use_oplocks;
return False;
correct = False;
}
- if (!close_connection(&cli1)) {
+ if (!torture_close_connection(&cli1)) {
correct = False;
}
static BOOL run_oplock3(int dummy)
{
static struct cli_state cli;
- char *fname = "\\oplockt3.dat";
+ const char *fname = "\\oplockt3.dat";
int fnum;
char buf[4] = "abcd";
BOOL correct = True;
/* Child code */
use_oplocks = True;
use_level_II_oplocks = True;
- if (!open_connection(&cli)) {
+ if (!torture_open_connection(&cli)) {
*shared_correct = False;
exit(0);
}
/* parent code */
use_oplocks = True;
use_level_II_oplocks = True;
- if (!open_connection(&cli)) {
+ if (!torture_open_connection(&cli)) {
return False;
}
cli_oplock_handler(&cli, oplock3_handler);
{
static struct cli_state cli1;
static struct cli_state cli2;
- char *fname = "\\delete.file";
- int fnum1, fnum2;
+ const char *fname = "\\delete.file";
+ int fnum1 = -1;
+ int fnum2 = -1;
BOOL correct = True;
printf("starting delete test\n");
- if (!open_connection(&cli1)) {
+ ZERO_STRUCT(cli1);
+ ZERO_STRUCT(cli2);
+
+ if (!torture_open_connection(&cli1)) {
return False;
}
cli_sockopt(&cli1, sockops);
-
+
/* Test 1 - this should *NOT* delete the file on close. */
cli_setatr(&cli1, fname, 0, 0);
cli_unlink(&cli1, fname);
fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
- FILE_SHARE_DELETE, FILE_OVERWRITE_IF, DELETE_ON_CLOSE_FLAG);
+ FILE_SHARE_DELETE, FILE_OVERWRITE_IF,
+ DELETE_ON_CLOSE_FLAG);
if (fnum1 == -1) {
printf("[1] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_close(&cli1, fnum1)) {
printf("[1] close failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
fnum1 = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
if (fnum1 == -1) {
printf("[1] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_close(&cli1, fnum1)) {
printf("[1] close failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
printf("first delete on close test succeeded.\n");
cli_unlink(&cli1, fname);
fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_ALL_ACCESS,
- FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+ FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
+ FILE_OVERWRITE_IF, 0);
if (fnum1 == -1) {
printf("[2] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
printf("[2] setting delete_on_close failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_close(&cli1, fnum1)) {
printf("[2] close failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
if (!cli_close(&cli1, fnum1)) {
printf("[2] close failed (%s)\n", cli_errstr(&cli1));
correct = False;
+ goto fail;
}
cli_unlink(&cli1, fname);
} else
printf("second delete on close test succeeded.\n");
-
/* Test 3 - ... */
cli_setatr(&cli1, fname, 0, 0);
cli_unlink(&cli1, fname);
fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
- FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0);
+ FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0);
if (fnum1 == -1) {
printf("[3] open - 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
/* This should fail with a sharing violation - open for delete is only compatible
if (fnum2 != -1) {
printf("[3] open - 2 of %s succeeded - should have failed.\n", fname);
- return False;
+ correct = False;
+ goto fail;
}
/* This should succeed. */
if (fnum2 == -1) {
printf("[3] open - 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
printf("[3] setting delete_on_close failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_close(&cli1, fnum1)) {
printf("[3] close 1 failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_close(&cli1, fnum2)) {
printf("[3] close 2 failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
/* This should fail - file should no longer be there. */
}
cli_unlink(&cli1, fname);
correct = False;
+ goto fail;
} else
printf("third delete on close test succeeded.\n");
if (fnum1 == -1) {
printf("[4] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
/* This should succeed. */
FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0);
if (fnum2 == -1) {
printf("[4] open - 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_close(&cli1, fnum2)) {
printf("[4] close - 1 failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
printf("[4] setting delete_on_close failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
/* This should fail - no more opens once delete on close set. */
FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0);
if (fnum2 != -1) {
printf("[4] open - 3 of %s succeeded ! Should have failed.\n", fname );
- return False;
+ correct = False;
+ goto fail;
} else
printf("fourth delete on close test succeeded.\n");
if (!cli_close(&cli1, fnum1)) {
printf("[4] close - 2 failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
/* Test 5 ... */
fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT, DENY_NONE);
if (fnum1 == -1) {
printf("[5] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
/* This should fail - only allowed on NT opens with DELETE access. */
if (cli_nt_delete_on_close(&cli1, fnum1, True)) {
printf("[5] setting delete_on_close on OpenX file succeeded - should fail !\n");
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_close(&cli1, fnum1)) {
printf("[5] close - 2 failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
printf("fifth delete on close test succeeded.\n");
if (fnum1 == -1) {
printf("[6] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
/* This should fail - only allowed on NT opens with DELETE access. */
if (cli_nt_delete_on_close(&cli1, fnum1, True)) {
printf("[6] setting delete_on_close on file with no delete access succeeded - should fail !\n");
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_close(&cli1, fnum1)) {
printf("[6] close - 2 failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
printf("sixth delete on close test succeeded.\n");
if (fnum1 == -1) {
printf("[7] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
printf("[7] setting delete_on_close on file failed !\n");
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_nt_delete_on_close(&cli1, fnum1, False)) {
printf("[7] unsetting delete_on_close on file failed !\n");
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_close(&cli1, fnum1)) {
printf("[7] close - 2 failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
/* This next open should succeed - we reset the flag. */
fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
if (fnum1 == -1) {
printf("[5] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_close(&cli1, fnum1)) {
printf("[7] close - 2 failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
printf("seventh delete on close test succeeded.\n");
cli_setatr(&cli1, fname, 0, 0);
cli_unlink(&cli1, fname);
- if (!open_connection(&cli2)) {
+ if (!torture_open_connection(&cli2)) {
printf("[8] failed to open second connection.\n");
- return False;
+ correct = False;
+ goto fail;
}
cli_sockopt(&cli1, sockops);
if (fnum1 == -1) {
printf("[8] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
fnum2 = cli_nt_create_full(&cli2, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
if (fnum2 == -1) {
printf("[8] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
printf("[8] setting delete_on_close on file failed !\n");
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_close(&cli1, fnum1)) {
printf("[8] close - 1 failed (%s)\n", cli_errstr(&cli1));
- return False;
+ correct = False;
+ goto fail;
}
if (!cli_close(&cli2, fnum2)) {
printf("[8] close - 2 failed (%s)\n", cli_errstr(&cli2));
- return False;
+ correct = False;
+ goto fail;
}
/* This should fail.. */
fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
if (fnum1 != -1) {
printf("[8] open of %s succeeded should have been deleted on close !\n", fname);
- if (!cli_close(&cli1, fnum1)) {
- printf("[8] close failed (%s)\n", cli_errstr(&cli1));
- }
- cli_unlink(&cli1, fname);
+ goto fail;
correct = False;
} else
printf("eighth delete on close test succeeded.\n");
+ /* This should fail - we need to set DELETE_ACCESS. */
+ fnum1 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA,
+ FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, FILE_DELETE_ON_CLOSE);
+
+ 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 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
+ FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, FILE_DELETE_ON_CLOSE);
+ if (fnum1 == -1) {
+ printf("[10] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ correct = False;
+ goto fail;
+ }
+
+ /* This should delete the file. */
+ if (!cli_close(&cli1, fnum1)) {
+ printf("[10] close failed (%s)\n", cli_errstr(&cli1));
+ correct = False;
+ goto fail;
+ }
+
+ /* This should fail.. */
+ fnum1 = cli_open(&cli1, 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:
+ cli_close(&cli1, fnum1);
+ cli_close(&cli1, fnum2);
cli_setatr(&cli1, fname, 0, 0);
cli_unlink(&cli1, fname);
- if (!close_connection(&cli1)) {
+ if (!torture_close_connection(&cli1)) {
+ correct = False;
+ }
+ if (!torture_close_connection(&cli2)) {
+ correct = False;
+ }
+ return correct;
+}
+
+
+/*
+ print out server properties
+ */
+static BOOL run_properties(int dummy)
+{
+ static struct cli_state cli;
+ BOOL correct = True;
+
+ printf("starting properties test\n");
+
+ ZERO_STRUCT(cli);
+
+ if (!torture_open_connection(&cli)) {
+ return False;
+ }
+
+ cli_sockopt(&cli, sockops);
+
+ d_printf("Capabilities 0x%08x\n", cli.capabilities);
+
+ if (!torture_close_connection(&cli)) {
+ correct = False;
+ }
+
+ return correct;
+}
+
+
+
+/* FIRST_DESIRED_ACCESS 0xf019f */
+#define FIRST_DESIRED_ACCESS FILE_READ_DATA|FILE_WRITE_DATA|FILE_APPEND_DATA|\
+ FILE_READ_EA| /* 0xf */ \
+ FILE_WRITE_EA|FILE_READ_ATTRIBUTES| /* 0x90 */ \
+ FILE_WRITE_ATTRIBUTES| /* 0x100 */ \
+ DELETE_ACCESS|READ_CONTROL_ACCESS|\
+ WRITE_DAC_ACCESS|WRITE_OWNER_ACCESS /* 0xf0000 */
+/* SECOND_DESIRED_ACCESS 0xe0080 */
+#define SECOND_DESIRED_ACCESS FILE_READ_ATTRIBUTES| /* 0x80 */ \
+ READ_CONTROL_ACCESS|WRITE_DAC_ACCESS|\
+ WRITE_OWNER_ACCESS /* 0xe0000 */
+
+#if 0
+#define THIRD_DESIRED_ACCESS FILE_READ_ATTRIBUTES| /* 0x80 */ \
+ READ_CONTROL_ACCESS|WRITE_DAC_ACCESS|\
+ FILE_READ_DATA|\
+ WRITE_OWNER_ACCESS /* */
+#endif
+
+/*
+ Test ntcreate calls made by xcopy
+ */
+static BOOL run_xcopy(int dummy)
+{
+ static struct cli_state cli1;
+ const char *fname = "\\test.txt";
+ BOOL correct = True;
+ int fnum1, fnum2;
+
+ printf("starting xcopy test\n");
+
+ if (!torture_open_connection(&cli1)) {
+ return False;
+ }
+
+ fnum1 = cli_nt_create_full(&cli1, fname,
+ FIRST_DESIRED_ACCESS, FILE_ATTRIBUTE_ARCHIVE,
+ FILE_SHARE_NONE, FILE_OVERWRITE_IF,
+ 0x4044);
+
+ if (fnum1 == -1) {
+ printf("First open failed - %s\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ fnum2 = cli_nt_create_full(&cli1, fname,
+ SECOND_DESIRED_ACCESS, 0,
+ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN,
+ 0x200000);
+ if (fnum2 == -1) {
+ printf("second open failed - %s\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ if (!torture_close_connection(&cli1)) {
+ correct = False;
+ }
+
+ return correct;
+}
+
+/*
+ Test rename on files open with share delete and no share delete.
+ */
+static BOOL run_rename(int dummy)
+{
+ static 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, fname);
+ cli_unlink(&cli1, fname1);
+ fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_READ, FILE_OVERWRITE_IF, 0);
+
+ if (fnum1 == -1) {
+ printf("First open failed - %s\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ if (!cli_rename(&cli1, fname, fname1)) {
+ printf("First rename failed (this is correct) - %s\n", cli_errstr(&cli1));
+ } else {
+ printf("First rename succeeded - this should have failed !\n");
+ correct = False;
+ }
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("close - 1 failed (%s)\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ cli_unlink(&cli1, fname);
+ cli_unlink(&cli1, fname1);
+ fnum1 = cli_nt_create_full(&cli1, fname,GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
+#if 0
+ FILE_SHARE_DELETE|FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+#else
+ FILE_SHARE_DELETE|FILE_SHARE_READ, FILE_OVERWRITE_IF, 0);
+#endif
+
+ if (fnum1 == -1) {
+ printf("Second open failed - %s\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ if (!cli_rename(&cli1, fname, fname1)) {
+ printf("Second rename failed - this should have succeeded - %s\n", cli_errstr(&cli1));
+ correct = False;
+ } else {
+ printf("Second rename succeeded\n");
+ }
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("close - 2 failed (%s)\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ cli_unlink(&cli1, fname);
+ cli_unlink(&cli1, fname1);
+
+ fnum1 = cli_nt_create_full(&cli1, fname,READ_CONTROL_ACCESS, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+ if (fnum1 == -1) {
+ printf("Third open failed - %s\n", cli_errstr(&cli1));
+ return False;
+ }
+
+
+#if 0
+ {
+ int fnum2;
+
+ fnum2 = cli_nt_create_full(&cli1, fname,DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+ if (fnum2 == -1) {
+ printf("Fourth open failed - %s\n", cli_errstr(&cli1));
+ return False;
+ }
+ if (!cli_nt_delete_on_close(&cli1, fnum2, True)) {
+ printf("[8] setting delete_on_close on file failed !\n");
+ return False;
+ }
+
+ if (!cli_close(&cli1, fnum2)) {
+ printf("close - 4 failed (%s)\n", cli_errstr(&cli1));
+ return False;
+ }
+ }
+#endif
+
+ if (!cli_rename(&cli1, fname, fname1)) {
+ printf("Third rename failed - this should have succeeded - %s\n", cli_errstr(&cli1));
correct = False;
+ } else {
+ printf("Third rename succeeded\n");
}
- if (!close_connection(&cli2)) {
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("close - 3 failed (%s)\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ cli_unlink(&cli1, fname);
+ cli_unlink(&cli1, fname1);
+
+ if (!torture_close_connection(&cli1)) {
correct = False;
}
+
return correct;
}
+static BOOL run_pipe_number(int dummy)
+{
+ static struct cli_state cli1;
+ const char *pipe_name = "\\SPOOLSS";
+ int fnum;
+ int num_pipes = 0;
+
+ printf("starting pipenumber test\n");
+ if (!torture_open_connection(&cli1)) {
+ return False;
+ }
+
+ cli_sockopt(&cli1, sockops);
+ while(1) {
+ fnum = cli_nt_create_full(&cli1, pipe_name,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN_IF, 0);
+
+ if (fnum == -1) {
+ printf("Open of pipe %s failed with error (%s)\n", pipe_name, cli_errstr(&cli1));
+ break;
+ }
+ num_pipes++;
+ }
+
+ printf("pipe_number test - we can open %d %s pipes.\n", num_pipes, pipe_name );
+ torture_close_connection(&cli1);
+ return True;
+}
+
/*
Test open mode returns on read-only files.
*/
static BOOL run_opentest(int dummy)
{
static struct cli_state cli1;
- char *fname = "\\readonly.file";
+ static struct cli_state cli2;
+ const char *fname = "\\readonly.file";
int fnum1, fnum2;
- uint8 eclass;
- uint32 errnum;
char buf[20];
size_t fsize;
BOOL correct = True;
+ char *tmp_path;
+ uint16 attr;
+
+ printf("starting open test\n");
+
+ if (!torture_open_connection(&cli1)) {
+ return False;
+ }
+
+ cli_setatr(&cli1, fname, 0, 0);
+ cli_unlink(&cli1, fname);
+
+ cli_sockopt(&cli1, sockops);
+
+ fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+ if (fnum1 == -1) {
+ printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("close2 failed (%s)\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ if (!cli_setatr(&cli1, fname, aRONLY, 0)) {
+ printf("cli_setatr failed (%s)\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_WRITE);
+ if (fnum1 == -1) {
+ printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+
+ /* This will fail - but the error should be ERRnoaccess, not ERRbadshare. */
+ fnum2 = cli_open(&cli1, fname, O_RDWR, DENY_ALL);
+
+ if (check_error(__LINE__, &cli1, ERRDOS, ERRnoaccess,
+ NT_STATUS_ACCESS_DENIED)) {
+ printf("correct error code ERRDOS/ERRnoaccess returned\n");
+ }
+
+ printf("finished open test 1\n");
+
+ cli_close(&cli1, fnum1);
+
+ /* Now try not readonly and ensure ERRbadshare is returned. */
+
+ cli_setatr(&cli1, fname, 0, 0);
+
+ fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_WRITE);
+ if (fnum1 == -1) {
+ printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+
+ /* This will fail - but the error should be ERRshare. */
+ fnum2 = cli_open(&cli1, fname, O_RDWR, DENY_ALL);
+
+ if (check_error(__LINE__, &cli1, ERRDOS, ERRbadshare,
+ NT_STATUS_SHARING_VIOLATION)) {
+ printf("correct error code ERRDOS/ERRbadshare returned\n");
+ }
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("close2 failed (%s)\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ cli_unlink(&cli1, fname);
+
+ printf("finished open test 2\n");
+
+ /* Test truncate open disposition on file opened for read. */
+
+ fnum1 = cli_open(&cli1, 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));
+ return False;
+ }
+
+ /* write 20 bytes. */
+
+ memset(buf, '\0', 20);
+
+ if (cli_write(&cli1, fnum1, 0, buf, 0, 20) != 20) {
+ printf("write failed (%s)\n", cli_errstr(&cli1));
+ correct = False;
+ }
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("(3) close1 failed (%s)\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ /* Ensure size == 20. */
+ if (!cli_getatr(&cli1, fname, NULL, &fsize, NULL)) {
+ printf("(3) getatr failed (%s)\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ if (fsize != 20) {
+ printf("(3) file size != 20\n");
+ return False;
+ }
+
+ /* Now test if we can truncate a file opened for readonly. */
+
+ fnum1 = cli_open(&cli1, fname, O_RDONLY|O_TRUNC, DENY_NONE);
+ if (fnum1 == -1) {
+ printf("(3) open (2) of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("close2 failed (%s)\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ /* Ensure size == 0. */
+ if (!cli_getatr(&cli1, fname, NULL, &fsize, NULL)) {
+ printf("(3) getatr failed (%s)\n", cli_errstr(&cli1));
+ return False;
+ }
+
+ if (fsize != 0) {
+ printf("(3) file size != 0\n");
+ return False;
+ }
+ printf("finished open test 3\n");
+
+ cli_unlink(&cli1, fname);
+
+
+ printf("testing ctemp\n");
+ fnum1 = cli_ctemp(&cli1, "\\", &tmp_path);
+ if (fnum1 == -1) {
+ printf("ctemp failed (%s)\n", cli_errstr(&cli1));
+ return False;
+ }
+ printf("ctemp gave path %s\n", tmp_path);
+ if (!cli_close(&cli1, fnum1)) {
+ printf("close of temp failed (%s)\n", cli_errstr(&cli1));
+ }
+ if (!cli_unlink(&cli1, tmp_path)) {
+ printf("unlink of temp failed (%s)\n", cli_errstr(&cli1));
+ }
+
+ /* Test the non-io opens... */
+
+ if (!torture_open_connection(&cli2)) {
+ return False;
+ }
+
+ cli_setatr(&cli2, fname, 0, 0);
+ cli_unlink(&cli2, fname);
+
+ cli_sockopt(&cli2, sockops);
+
+ printf("TEST #1 testing 2 non-io opens (no delete)\n");
+
+ fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+ if (fnum1 == -1) {
+ printf("test 1 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+
+ fnum2 = cli_nt_create_full(&cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OPEN_IF, 0);
+
+ if (fnum2 == -1) {
+ printf("test 1 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+ return False;
+ }
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+ if (!cli_close(&cli2, fnum2)) {
+ printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+ return False;
+ }
+
+ printf("non-io open test #1 passed.\n");
+
+ cli_unlink(&cli1, fname);
+
+ printf("TEST #2 testing 2 non-io opens (first with delete)\n");
+
+ fnum1 = cli_nt_create_full(&cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+ if (fnum1 == -1) {
+ printf("test 2 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+
+ fnum2 = cli_nt_create_full(&cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OPEN_IF, 0);
+
+ if (fnum2 == -1) {
+ printf("test 2 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+ return False;
+ }
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+ if (!cli_close(&cli2, fnum2)) {
+ printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+
+ printf("non-io open test #2 passed.\n");
+
+ cli_unlink(&cli1, fname);
+
+ printf("TEST #3 testing 2 non-io opens (second with delete)\n");
+
+ fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+ if (fnum1 == -1) {
+ printf("test 3 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+
+ fnum2 = cli_nt_create_full(&cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OPEN_IF, 0);
+
+ if (fnum2 == -1) {
+ printf("test 3 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+ return False;
+ }
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("test 3 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+ if (!cli_close(&cli2, fnum2)) {
+ printf("test 3 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+ return False;
+ }
+
+ printf("non-io open test #3 passed.\n");
+
+ cli_unlink(&cli1, fname);
+
+ printf("TEST #4 testing 2 non-io opens (both with delete)\n");
+
+ fnum1 = cli_nt_create_full(&cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+ if (fnum1 == -1) {
+ printf("test 4 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+
+ fnum2 = cli_nt_create_full(&cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OPEN_IF, 0);
+
+ if (fnum2 != -1) {
+ printf("test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(&cli2));
+ return False;
+ }
+
+ printf("test 3 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(&cli2), "sharing violation");
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("test 4 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+
+ printf("non-io open test #4 passed.\n");
+
+ cli_unlink(&cli1, fname);
+
+ printf("TEST #5 testing 2 non-io opens (both with delete - both with file share delete)\n");
+
+ fnum1 = cli_nt_create_full(&cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_DELETE, FILE_OVERWRITE_IF, 0);
+
+ if (fnum1 == -1) {
+ printf("test 5 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+
+ fnum2 = cli_nt_create_full(&cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_DELETE, FILE_OPEN_IF, 0);
+
+ if (fnum2 == -1) {
+ printf("test 5 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+ return False;
+ }
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("test 5 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
- printf("starting open test\n");
-
- if (!open_connection(&cli1)) {
+ if (!cli_close(&cli2, fnum2)) {
+ printf("test 5 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
return False;
}
+
+ printf("non-io open test #5 passed.\n");
+
+ printf("TEST #6 testing 1 non-io open, one io open\n");
- cli_setatr(&cli1, fname, 0, 0);
cli_unlink(&cli1, fname);
-
- cli_sockopt(&cli1, sockops);
-
- fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+
+ fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
if (fnum1 == -1) {
- printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ printf("test 6 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
return False;
}
- if (!cli_close(&cli1, fnum1)) {
- printf("close2 failed (%s)\n", cli_errstr(&cli1));
+ fnum2 = cli_nt_create_full(&cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_READ, FILE_OPEN_IF, 0);
+
+ if (fnum2 == -1) {
+ printf("test 6 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
return False;
}
-
- if (!cli_setatr(&cli1, fname, aRONLY, 0)) {
- printf("cli_setatr failed (%s)\n", cli_errstr(&cli1));
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("test 6 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
return False;
}
-
- fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_WRITE);
- if (fnum1 == -1) {
- printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+
+ if (!cli_close(&cli2, fnum2)) {
+ printf("test 6 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
return False;
}
-
- /* This will fail - but the error should be ERRnoaccess, not ERRbadshare. */
- fnum2 = cli_open(&cli1, fname, O_RDWR, DENY_ALL);
-
- cli_error( &cli1, &eclass, &errnum, NULL);
-
- if (eclass != ERRDOS || errnum != ERRnoaccess) {
- printf("wrong error code (%x,%x) = %s\n", (unsigned int)eclass,
- (unsigned int)errnum, cli_errstr(&cli1) );
- correct = False;
- } else {
- printf("correct error code ERRDOS/ERRnoaccess returned\n");
- }
-
-
- printf("finished open test 1\n");
-
- cli_close(&cli1, fnum1);
-
- /* Now try not readonly and ensure ERRbadshare is returned. */
-
- cli_setatr(&cli1, fname, 0, 0);
-
- fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_WRITE);
+
+ printf("non-io open test #6 passed.\n");
+
+ printf("TEST #7 testing 1 non-io open, one io open with delete\n");
+
+ cli_unlink(&cli1, fname);
+
+ fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
if (fnum1 == -1) {
- printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ printf("test 7 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
return False;
}
-
- /* This will fail - but the error should be ERRshare. */
- fnum2 = cli_open(&cli1, fname, O_RDWR, DENY_ALL);
-
- cli_error( &cli1, &eclass, &errnum, NULL);
- if (eclass != ERRDOS || errnum != ERRbadshare) {
- printf("wrong error code (%x,%x) = %s\n", (unsigned int)eclass,
- (unsigned int)errnum, cli_errstr(&cli1) );
- correct = False;
- } else {
- printf("correct error code ERRDOS/ERRbadshare returned\n");
+ fnum2 = cli_nt_create_full(&cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_OPEN_IF, 0);
+
+ if (fnum2 != -1) {
+ printf("test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(&cli2));
+ return False;
}
-
+
+ printf("test 7 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(&cli2), "sharing violation");
+
if (!cli_close(&cli1, fnum1)) {
- printf("close2 failed (%s)\n", cli_errstr(&cli1));
+ printf("test 7 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
return False;
}
-
+
+ printf("non-io open test #7 passed.\n");
+
cli_unlink(&cli1, fname);
-
- printf("finished open test 2\n");
-
- /* Test truncate open disposition on file opened for read. */
-
- fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+
+ /* Test 8 - attributes test #1... */
+ fnum1 = cli_nt_create_full(&cli1, fname,FILE_WRITE_DATA, FILE_ATTRIBUTE_HIDDEN,
+ FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
if (fnum1 == -1) {
- printf("(3) open (1) of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ printf("test 8 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
return False;
}
-
- /* write 20 bytes. */
-
- memset(buf, '\0', 20);
- if (cli_write(&cli1, fnum1, 0, buf, 0, 20) != 20) {
- printf("write failed (%s)\n", cli_errstr(&cli1));
- correct = False;
+ if (!cli_close(&cli1, fnum1)) {
+ printf("test 8 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
+ }
+
+ /* FILE_SUPERSEDE && FILE_OVERWRITE_IF have the same effect here. */
+ fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_DATA, FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+ if (fnum1 == -1) {
+ printf("test 8 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ return False;
}
if (!cli_close(&cli1, fnum1)) {
- printf("(3) close1 failed (%s)\n", cli_errstr(&cli1));
+ printf("test 8 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
return False;
}
-
- /* Ensure size == 20. */
- if (!cli_getatr(&cli1, fname, NULL, &fsize, NULL)) {
- printf("(3) getatr failed (%s)\n", cli_errstr(&cli1));
+
+ /* This open should fail with ACCESS_DENIED for FILE_SUPERSEDE, FILE_OVERWRITE and FILE_OVERWRITE_IF. */
+ fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OVERWRITE, 0);
+
+ if (fnum1 != -1) {
+ printf("test 8 open 3 of %s succeeded - should have failed with (NT_STATUS_ACCESS_DENIED)\n", fname);
+ correct = False;
+ cli_close(&cli1, fnum1);
+ } else {
+ if (check_error(__LINE__, &cli1, ERRDOS, ERRnoaccess, NT_STATUS_ACCESS_DENIED)) {
+ printf("correct error code NT_STATUS_ACCESS_DENIED/ERRDOS:ERRnoaccess returned\n");
+ }
+ }
+
+ printf("Attribute open test #8 %s.\n", correct ? "passed" : "failed");
+
+ cli_unlink(&cli1, fname);
+
+ /*
+ * Test #9. Open with NORMAL, close, then re-open with attribute
+ * HIDDEN and request to truncate.
+ */
+
+ fnum1 = cli_nt_create_full(&cli1, fname,FILE_WRITE_DATA, FILE_ATTRIBUTE_NORMAL,
+ FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+ if (fnum1 == -1) {
+ printf("test 9 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
return False;
}
-
- if (fsize != 20) {
- printf("(3) file size != 20\n");
+
+ if (!cli_close(&cli1, fnum1)) {
+ printf("test 9 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
return False;
}
- /* Now test if we can truncate a file opened for readonly. */
-
- fnum1 = cli_open(&cli1, fname, O_RDONLY|O_TRUNC, DENY_NONE);
+ fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_DATA|FILE_WRITE_DATA, FILE_ATTRIBUTE_HIDDEN,
+ FILE_SHARE_NONE, FILE_OVERWRITE, 0);
+
if (fnum1 == -1) {
- printf("(3) open (2) of %s failed (%s)\n", fname, cli_errstr(&cli1));
+ printf("test 9 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
return False;
}
-
+
if (!cli_close(&cli1, fnum1)) {
- printf("close2 failed (%s)\n", cli_errstr(&cli1));
+ printf("test 9 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
return False;
}
- /* Ensure size == 0. */
- if (!cli_getatr(&cli1, fname, NULL, &fsize, NULL)) {
- printf("(3) getatr failed (%s)\n", cli_errstr(&cli1));
+ /* Ensure we have attr hidden. */
+ if (!cli_getatr(&cli1, fname, &attr, NULL, NULL)) {
+ printf("test 9 getatr(2) failed (%s)\n", cli_errstr(&cli1));
return False;
}
- if (fsize != 0) {
- printf("(3) file size != 0\n");
+ if (!(attr & FILE_ATTRIBUTE_HIDDEN)) {
+ printf("test 9 getatr didn't have HIDDEN attribute\n");
+ cli_unlink(&cli1, fname);
return False;
}
- printf("finished open test 3\n");
-
- cli_unlink(&cli1, fname);
+ printf("Attribute open test #9 %s.\n", correct ? "passed" : "failed");
- printf("testing ctemp\n");
- {
- char *tmp_path;
- fnum1 = cli_ctemp(&cli1, "\\", &tmp_path);
- if (fnum1 == -1) {
- printf("ctemp failed (%s)\n", cli_errstr(&cli1));
- return False;
- }
- printf("ctemp gave path %s\n", tmp_path);
- cli_close(&cli1, fnum1);
- cli_unlink(&cli1, tmp_path);
+ cli_unlink(&cli1, fname);
+
+ if (!torture_close_connection(&cli1)) {
+ correct = False;
}
-
- if (!close_connection(&cli1)) {
+ if (!torture_close_connection(&cli2)) {
correct = False;
}
printf("starting directory test\n");
- if (!open_connection(&cli)) {
+ if (!torture_open_connection(&cli)) {
return False;
}
cli_sockopt(&cli, sockops);
srandom(0);
- for (i=0;i<numops;i++) {
+ for (i=0;i<torture_numops;i++) {
fstring fname;
- slprintf(fname, sizeof(fname), "%x", (int)random());
+ slprintf(fname, sizeof(fname), "\\%x", (int)random());
fnum = cli_open(&cli, fname, O_RDWR|O_CREAT, DENY_NONE);
if (fnum == -1) {
fprintf(stderr,"Failed to open %s\n", fname);
printf("dirtest core %g seconds\n", end_timer() - t1);
srandom(0);
- for (i=0;i<numops;i++) {
+ for (i=0;i<torture_numops;i++) {
fstring fname;
- slprintf(fname, sizeof(fname), "%x", (int)random());
+ slprintf(fname, sizeof(fname), "\\%x", (int)random());
cli_unlink(&cli, fname);
}
- if (!close_connection(&cli)) {
+ if (!torture_close_connection(&cli)) {
correct = False;
}
return correct;
}
+static void del_fn(file_info *finfo, const char *mask, void *state)
+{
+ struct cli_state *pcli = (struct cli_state *)state;
+ fstring fname;
+ slprintf(fname, sizeof(fname), "\\LISTDIR\\%s", finfo->name);
+
+ if (strcmp(finfo->name, ".") == 0 || strcmp(finfo->name, "..") == 0)
+ return;
+
+ if (finfo->mode & aDIR) {
+ if (!cli_rmdir(pcli, fname))
+ printf("del_fn: failed to rmdir %s\n,", fname );
+ } else {
+ if (!cli_unlink(pcli, fname))
+ printf("del_fn: failed to unlink %s\n,", fname );
+ }
+}
+
+static BOOL run_dirtest1(int dummy)
+{
+ int i;
+ static struct cli_state cli;
+ int fnum, num_seen;
+ BOOL correct = True;
+
+ printf("starting directory test\n");
+
+ if (!torture_open_connection(&cli)) {
+ return False;
+ }
+
+ cli_sockopt(&cli, sockops);
+
+ cli_list(&cli, "\\LISTDIR\\*", 0, del_fn, &cli);
+ cli_list(&cli, "\\LISTDIR\\*", aDIR, del_fn, &cli);
+ cli_rmdir(&cli, "\\LISTDIR");
+ cli_mkdir(&cli, "\\LISTDIR");
+
+ /* Create 1000 files and 1000 directories. */
+ for (i=0;i<1000;i++) {
+ fstring fname;
+ slprintf(fname, sizeof(fname), "\\LISTDIR\\f%d", i);
+ fnum = cli_nt_create_full(&cli, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_ARCHIVE,
+ FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0);
+ if (fnum == -1) {
+ fprintf(stderr,"Failed to open %s\n", fname);
+ return False;
+ }
+ cli_close(&cli, fnum);
+ }
+ for (i=0;i<1000;i++) {
+ fstring fname;
+ slprintf(fname, sizeof(fname), "\\LISTDIR\\d%d", i);
+ if (!cli_mkdir(&cli, fname)) {
+ fprintf(stderr,"Failed to open %s\n", fname);
+ return False;
+ }
+ }
+
+ /* Now ensure that doing an old list sees both files and directories. */
+ num_seen = cli_list_old(&cli, "\\LISTDIR\\*", aDIR, list_fn, NULL);
+ printf("num_seen = %d\n", num_seen );
+ /* We should see 100 files + 1000 directories + . and .. */
+ if (num_seen != 2002)
+ correct = False;
+
+ /* Ensure if we have the "must have" bits we only see the
+ * relevent entries.
+ */
+ num_seen = cli_list_old(&cli, "\\LISTDIR\\*", (aDIR<<8)|aDIR, list_fn, NULL);
+ printf("num_seen = %d\n", num_seen );
+ if (num_seen != 1002)
+ correct = False;
+
+ num_seen = cli_list_old(&cli, "\\LISTDIR\\*", (aARCH<<8)|aDIR, list_fn, NULL);
+ printf("num_seen = %d\n", num_seen );
+ if (num_seen != 1000)
+ correct = False;
+
+ /* Delete everything. */
+ cli_list(&cli, "\\LISTDIR\\*", 0, del_fn, &cli);
+ cli_list(&cli, "\\LISTDIR\\*", aDIR, del_fn, &cli);
+ cli_rmdir(&cli, "\\LISTDIR");
+
+#if 0
+ printf("Matched %d\n", cli_list(&cli, "a*.*", 0, list_fn, NULL));
+ printf("Matched %d\n", cli_list(&cli, "b*.*", 0, list_fn, NULL));
+ printf("Matched %d\n", cli_list(&cli, "xyzabc", 0, list_fn, NULL));
+#endif
+
+ if (!torture_close_connection(&cli)) {
+ correct = False;
+ }
+
+ printf("finished dirtest1\n");
+
+ return correct;
+}
+
+static BOOL run_error_map_extract(int dummy) {
+
+ static struct cli_state c_dos;
+ static struct cli_state c_nt;
+
+ uint32 error;
+
+ uint32 flgs2, errnum;
+ uint8 errclass;
+
+ NTSTATUS nt_status;
+
+ fstring user;
+
+ /* NT-Error connection */
+
+ if (!open_nbt_connection(&c_nt)) {
+ return False;
+ }
+
+ c_nt.use_spnego = False;
+
+ if (!cli_negprot(&c_nt)) {
+ printf("%s rejected the NT-error negprot (%s)\n",host, cli_errstr(&c_nt));
+ cli_shutdown(&c_nt);
+ return False;
+ }
+
+ if (!cli_session_setup(&c_nt, "", "", 0, "", 0,
+ workgroup)) {
+ printf("%s rejected the NT-error initial session setup (%s)\n",host, cli_errstr(&c_nt));
+ return False;
+ }
+
+ /* DOS-Error connection */
+
+ if (!open_nbt_connection(&c_dos)) {
+ return False;
+ }
+
+ c_dos.use_spnego = False;
+ c_dos.force_dos_errors = True;
+ if (!cli_negprot(&c_dos)) {
+ printf("%s rejected the DOS-error negprot (%s)\n",host, cli_errstr(&c_dos));
+ cli_shutdown(&c_dos);
+ return False;
+ }
+
+ if (!cli_session_setup(&c_dos, "", "", 0, "", 0,
+ workgroup)) {
+ printf("%s rejected the DOS-error initial session setup (%s)\n",host, cli_errstr(&c_dos));
+ return False;
+ }
+
+ for (error=(0xc0000000 | 0x1); error < (0xc0000000| 0xFFF); error++) {
+ snprintf(user, sizeof(user), "%X", error);
+
+ if (cli_session_setup(&c_nt, user,
+ password, strlen(password),
+ password, strlen(password),
+ workgroup)) {
+ printf("/** Session setup succeeded. This shouldn't happen...*/\n");
+ }
+
+ flgs2 = SVAL(c_nt.inbuf,smb_flg2);
+
+ /* Case #1: 32-bit NT errors */
+ if (flgs2 & FLAGS2_32_BIT_ERROR_CODES) {
+ nt_status = NT_STATUS(IVAL(c_nt.inbuf,smb_rcls));
+ } else {
+ printf("/** Dos error on NT connection! (%s) */\n",
+ cli_errstr(&c_nt));
+ nt_status = NT_STATUS(0xc0000000);
+ }
+
+ if (cli_session_setup(&c_dos, user,
+ password, strlen(password),
+ password, strlen(password),
+ workgroup)) {
+ printf("/** Session setup succeeded. This shouldn't happen...*/\n");
+ }
+ flgs2 = SVAL(c_dos.inbuf,smb_flg2), errnum;
+
+ /* Case #1: 32-bit NT errors */
+ if (flgs2 & FLAGS2_32_BIT_ERROR_CODES) {
+ printf("/** NT error on DOS connection! (%s) */\n",
+ cli_errstr(&c_nt));
+ errnum = errclass = 0;
+ } else {
+ cli_dos_error(&c_dos, &errclass, &errnum);
+ }
+
+ if (NT_STATUS_V(nt_status) != error) {
+ printf("/*\t{ This NT error code was 'sqashed'\n\t from %s to %s \n\t during the session setup }\n*/\n",
+ get_nt_error_c_code(NT_STATUS(error)),
+ get_nt_error_c_code(nt_status));
+ }
+
+ printf("\t{%s,\t%s,\t%s},\n",
+ smb_dos_err_class(errclass),
+ smb_dos_err_name(errclass, errnum),
+ get_nt_error_c_code(NT_STATUS(error)));
+ }
+ return True;
+}
static double create_procs(BOOL (*fn)(int), BOOL *result)
{
return -1;
}
- memset(child_status, 0, sizeof(pid_t)*nprocs);
- memset(child_status_out, True, sizeof(BOOL)*nprocs);
+ for (i = 0; i < nprocs; i++) {
+ child_status[i] = 0;
+ child_status_out[i] = True;
+ }
start_timer();
while (1) {
memset(¤t_cli, 0, sizeof(current_cli));
- if (open_connection(¤t_cli)) break;
+ if (torture_open_connection(¤t_cli)) break;
if (tries-- == 0) {
printf("pid %d failed to start\n", (int)getpid());
_exit(1);
child_status[i] = getpid();
- while (child_status[i]) msleep(2);
+ while (child_status[i] && end_timer() < 5) msleep(2);
child_status_out[i] = fn(i);
_exit(0);
printf("%d clients started\n", nprocs);
for (i=0;i<nprocs;i++) {
- waitpid(0, &status, 0);
- printf("*");
+ while (waitpid(0, &status, 0) == -1 && errno == EINTR) /* noop */ ;
}
printf("\n");
return end_timer();
}
-
#define FLAG_MULTIPROC 1
static struct {
- char *name;
+ const char *name;
BOOL (*fn)(int);
unsigned flags;
} torture_ops[] = {
{"LOCK3", run_locktest3, 0},
{"LOCK4", run_locktest4, 0},
{"LOCK5", run_locktest5, 0},
+ {"LOCK6", run_locktest6, 0},
{"UNLINK", run_unlinktest, 0},
{"BROWSE", run_browsetest, 0},
{"ATTR", run_attrtest, 0},
{"TORTURE",run_torture, FLAG_MULTIPROC},
{"RANDOMIPC", run_randomipc, 0},
{"NEGNOWAIT", run_negprot_nowait, 0},
- {"NBW95", run_nbw95, 0},
- {"NBWNT", run_nbwnt, 0},
+ {"NBENCH", run_nbench, 0},
{"OPLOCK1", run_oplock1, 0},
{"OPLOCK2", run_oplock2, 0},
{"OPLOCK3", run_oplock3, 0},
{"DIR", run_dirtest, 0},
- {"DENY1", run_denytest1, 0},
- {"DENY2", run_denytest2, 0},
+ {"DIR1", run_dirtest1, 0},
+ {"DENY1", torture_denytest1, 0},
+ {"DENY2", torture_denytest2, 0},
{"TCON", run_tcon_test, 0},
{"RW1", run_readwritetest, 0},
{"RW2", run_readwritemulti, FLAG_MULTIPROC},
{"RW3", run_readwritelarge, 0},
{"OPEN", run_opentest, 0},
+ {"XCOPY", run_xcopy, 0},
+ {"RENAME", run_rename, 0},
{"DELETE", run_deletetest, 0},
+ {"PROPERTIES", run_properties, 0},
+ {"MANGLE", torture_mangle, 0},
{"W2K", run_w2ktest, 0},
+ {"TRANS2SCAN", torture_trans2_scan, 0},
+ {"NTTRANSSCAN", torture_nttrans_scan, 0},
+ {"UTABLE", torture_utable, 0},
+ {"CASETABLE", torture_casetable, 0},
+ {"ERRMAPEXTRACT", run_error_map_extract, 0},
+ {"PIPE_NUMBER", run_pipe_number, 0},
{NULL, NULL, 0}};
/****************************************************************************
run a specified test or "ALL"
****************************************************************************/
-static BOOL run_test(char *name)
+static BOOL run_test(const char *name)
{
BOOL ret = True;
BOOL result = True;
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 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-A showall\n");
+ printf("\t-s seed\n");
printf("\n\n");
printf("tests are:");
{
int opt, i;
char *p;
+ int gotuser = 0;
int gotpass = 0;
extern char *optarg;
extern int optind;
- extern FILE *dbf;
- static pstring servicesf = CONFIGFILE;
BOOL correct = True;
- dbf = stdout;
+ dbf = x_stdout;
#ifdef HAVE_SETBUFFER
setbuffer(stdout, NULL, 0);
#endif
- lp_load(servicesf,True,False,False);
+ lp_load(dyn_CONFIGFILE,True,False,False);
load_interfaces();
if (argc < 2) {
get_myname(myname);
if (*username == 0 && getenv("LOGNAME")) {
- pstrcpy(username,getenv("LOGNAME"));
+ fstrcpy(username,getenv("LOGNAME"));
}
argc--;
argv++;
+ srandom(time(NULL));
fstrcpy(workgroup, lp_workgroup());
- while ((opt = getopt(argc, argv, "hW:U:n:N:O:o:m:Ld:")) != EOF) {
+ while ((opt = getopt(argc, argv, "hW:U:n:N:O:o:m:Ld:Ac:ks:")) != EOF) {
switch (opt) {
+ case 's':
+ srandom(atoi(optarg));
+ break;
case 'W':
fstrcpy(workgroup,optarg);
break;
nprocs = atoi(optarg);
break;
case 'o':
- numops = atoi(optarg);
+ torture_numops = atoi(optarg);
break;
case 'd':
DEBUGLEVEL = atoi(optarg);
case 'L':
use_oplocks = True;
break;
+ case 'A':
+ torture_showall = True;
+ break;
case 'n':
fstrcpy(myname, optarg);
break;
+ case 'c':
+ client_txt = optarg;
+ break;
+ case 'k':
+#ifdef HAVE_KRB5
+ use_kerberos = True;
+#else
+ d_printf("No kerberos support compiled in\n");
+ exit(1);
+#endif
+ break;
case 'U':
- pstrcpy(username,optarg);
+ gotuser = 1;
+ fstrcpy(username,optarg);
p = strchr_m(username,'%');
if (p) {
*p = 0;
- pstrcpy(password, p+1);
+ fstrcpy(password, p+1);
gotpass = 1;
}
break;
}
}
+ if(use_kerberos && !gotuser) gotpass = True;
while (!gotpass) {
p = getpass("Password:");
if (p) {
- pstrcpy(password, p);
+ fstrcpy(password, p);
gotpass = 1;
}
}
git.samba.org / jra / samba / .git / blobdiff