utils/torture.c: Added one more delete on close test.
[nivanova/samba-autobuild/.git] / source3 / utils / torture.c
index fc6d5bcc151c8da4fd1c672450272c924ca44084..ac922eed61b5124f1a54e40dfdf8e1b1621e07ce 100644 (file)
@@ -2,7 +2,7 @@
    Unix SMB/Netbios implementation.
    Version 1.9.
    SMB torture tester
-   Copyright (C) Andrew Tridgell 1997
+   Copyright (C) Andrew Tridgell 1997-1998
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifdef SYSLOG
-#undef SYSLOG
-#endif
+#define NO_SYSLOG
 
 #include "includes.h"
+#include <sys/ipc.h>
+#include <sys/shm.h>
 
 static fstring host, workgroup, share, password, username, myname;
 static int max_protocol = PROTOCOL_NT1;
-static char *sockops="";
+static char *sockops="TCP_NODELAY";
+static int nprocs=1, 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 double create_procs(void (*fn)(int));
 
 
 static struct timeval tp1,tp2;
 
-static void start_timer()
+static void start_timer(void)
 {
        gettimeofday(&tp1,NULL);
 }
 
-static double end_timer()
+static double end_timer(void)
 {
        gettimeofday(&tp2,NULL);
        return((tp2.tv_sec - tp1.tv_sec) + 
@@ -45,20 +53,81 @@ static double end_timer()
 }
 
 
-static BOOL open_connection(struct cli_state *c)
+/* return a pointer to a anonymous shared memory segment of size "size"
+   which will persist across fork() but will disappear when all processes
+   exit 
+
+   The memory is not zeroed 
+
+   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)
+{
+       int shmid;
+       void *ret;
+
+       shmid = shmget(IPC_PRIVATE, size, SHM_R | SHM_W);
+       if (shmid == -1) {
+               printf("can't get shared memory\n");
+               exit(1);
+       }
+       ret = (void *)shmat(shmid, 0, 0);
+       if (!ret || ret == (void *)-1) {
+               printf("can't attach to shared memory\n");
+               return NULL;
+       }
+       /* the following releases the ipc, but note that this process
+          and all its children will still have access to the memory, its
+          just that the shmid is no longer valid for other shm calls. This
+          means we don't leave behind lots of shm segments after we exit 
+
+          See Stevens "advanced programming in unix env" for details
+          */
+       shmctl(shmid, IPC_RMID, 0);
+       
+       return ret;
+}
+
+
+static BOOL open_nbt_connection(struct cli_state *c)
 {
-       if (!cli_initialise(c) || !cli_connect(c, host, NULL)) {
+       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;
+
+       if (!cli_initialise(c) || !cli_connect(c, host, &ip)) {
                printf("Failed to connect with %s\n", host);
                return False;
        }
 
-       if (!cli_session_request(c, host, 0x20, myname)) {
+       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;
+
+       if (!cli_session_request(c, &calling, &called)) {
                printf("%s rejected the session\n",host);
                cli_shutdown(c);
                return False;
        }
 
-       c->protocol = max_protocol;
+       return True;
+}
+
+static BOOL open_connection(struct cli_state *c)
+{
+       ZERO_STRUCTP(c);
+
+       if (!open_nbt_connection(c)) {
+               return False;
+       }
 
        if (!cli_negprot(c)) {
                printf("%s rejected the negprot (%s)\n",host, cli_errstr(c));
@@ -66,14 +135,17 @@ static BOOL open_connection(struct cli_state *c)
                return False;
        }
 
-       if (!cli_session_setup(c, username, password, strlen(password),
-                              "", 0, workgroup)) {
+       if (!cli_session_setup(c, username, 
+                              password, strlen(password),
+                              password, strlen(password),
+                              workgroup)) {
                printf("%s rejected the sessionsetup (%s)\n", host, cli_errstr(c));
                cli_shutdown(c);
                return False;
        }
 
-       if (!cli_send_tconX(c, share, "A:", password, strlen(password)+1)) {
+       if (!cli_send_tconX(c, share, "?????",
+                           password, strlen(password)+1)) {
                printf("%s refused tree connect (%s)\n", host, cli_errstr(c));
                cli_shutdown(c);
                return False;
@@ -83,7 +155,6 @@ static BOOL open_connection(struct cli_state *c)
 }
 
 
-
 static void close_connection(struct cli_state *c)
 {
        if (!cli_tdis(c)) {
@@ -94,29 +165,43 @@ static void close_connection(struct cli_state *c)
 }
 
 
+/* check if the server produced the expected error code */
+static BOOL check_error(struct cli_state *c, 
+                       uint8 eclass, uint32 ecode, uint32 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;
+       }
+       return True;
+}
+
+
 static BOOL wait_lock(struct cli_state *c, int fnum, uint32 offset, uint32 len)
 {
-       while (!cli_lock(c, fnum, offset, len, -1)) {
-               int eclass, num;
-               cli_error(c, &eclass, &num);
-               if (eclass != ERRDOS || num != ERRlock) {
-                       printf("lock failed (%s)\n", 
-                              cli_errstr(c));
-                       return False;
-               }
+       while (!cli_lock(c, fnum, offset, len, -1, WRITE_LOCK)) {
+               if (!check_error(c, ERRDOS, ERRlock, 0)) return False;
        }
        return True;
 }
 
 
-static BOOL rw_torture(struct cli_state *c, int numops)
+static BOOL rw_torture(struct cli_state *c)
 {
        char *lockfname = "\\torture.lck";
        fstring fname;
        int fnum;
        int fnum2;
-       int pid2, pid = getpid();
-       int i;
+       pid_t pid2, pid = getpid();
+       int i, j;
+       char buf[1024];
 
        fnum2 = cli_open(c, lockfname, O_RDWR | O_CREAT | O_EXCL, 
                         DENY_NONE);
@@ -129,11 +214,11 @@ static BOOL rw_torture(struct cli_state *c, int numops)
 
 
        for (i=0;i<numops;i++) {
-               unsigned n = (unsigned)random()%10;
+               unsigned n = (unsigned)sys_random()%10;
                if (i % 10 == 0) {
                        printf("%d\r", i); fflush(stdout);
                }
-               sprintf(fname,"\\torture.%u", n);
+               slprintf(fname, sizeof(fstring) - 1, "\\torture.%u", n);
 
                if (!wait_lock(c, fnum2, n*sizeof(int), sizeof(int))) {
                        return False;
@@ -145,10 +230,18 @@ static BOOL rw_torture(struct cli_state *c, int numops)
                        break;
                }
 
-               if (cli_write(c, fnum, (char *)&pid, 0, sizeof(pid)) != sizeof(pid)) {
+               if (cli_write(c, fnum, 0, (char *)&pid, 0, sizeof(pid)) != sizeof(pid)) {
                        printf("write failed (%s)\n", cli_errstr(c));
                }
 
+               for (j=0;j<50;j++) {
+                       if (cli_write(c, fnum, 0, (char *)buf, 
+                                     sizeof(pid)+(j*sizeof(buf)), 
+                                     sizeof(buf)) != sizeof(buf)) {
+                               printf("write failed (%s)\n", cli_errstr(c));
+                       }
+               }
+
                pid2 = 0;
 
                if (cli_read(c, fnum, (char *)&pid2, 0, sizeof(pid)) != sizeof(pid)) {
@@ -167,49 +260,359 @@ static BOOL rw_torture(struct cli_state *c, int numops)
                        printf("unlink failed (%s)\n", cli_errstr(c));
                }
 
-               if (!cli_unlock(c, fnum2, n*sizeof(int), sizeof(int), -1)) {
+               if (!cli_unlock(c, fnum2, n*sizeof(int), sizeof(int))) {
                        printf("unlock failed (%s)\n", cli_errstr(c));
                }
        }
 
+       cli_close(c, fnum2);
+       cli_unlink(c, lockfname);
+
        printf("%d\n", i);
 
        return True;
 }
 
-static void usage(void)
+static void run_torture(int dummy)
 {
-       printf("Usage: smbtorture \\\\server\\share <options>\n");
+       struct cli_state cli;
 
-       printf("\t-U user%%pass\n");
-       printf("\t-N numprocs\n");
-       printf("\t-n my_netbios_name\n");
-       printf("\t-W workgroup\n");
-       printf("\t-o num_operations\n");
-       printf("\t-O socket_options\n");
-       printf("\t-m maximum protocol\n");
-       printf("\n");
+       cli = current_cli;
 
-       exit(1);
+       cli_sockopt(&cli, sockops);
+
+       rw_torture(&cli);
+       
+       close_connection(&cli);
+}
+
+static BOOL rw_torture3(struct cli_state *c, char *lockfname)
+{
+       int fnum = -1;
+       int i = 0;
+       char buf[131072];
+       char buf_rd[131072];
+       unsigned count;
+       unsigned countprev = 0;
+       unsigned sent = 0;
+
+       srandom(1);
+       for (i = 0; i < sizeof(buf); i += sizeof(uint32))
+       {
+               SIVAL(buf, i, sys_random());
+       }
+
+       if (procnum == 0)
+       {
+               fnum = cli_open(c, lockfname, O_RDWR | O_CREAT | O_EXCL, 
+                                DENY_NONE);
+               if (fnum == -1) {
+                       printf("first open read/write of %s failed (%s)\n",
+                                       lockfname, cli_errstr(c));
+                       return False;
+               }
+       }
+       else
+       {
+               for (i = 0; i < 500 && fnum == -1; i++)
+               {
+                       fnum = cli_open(c, lockfname, O_RDONLY, 
+                                        DENY_NONE);
+                       msleep(10);
+               }
+               if (fnum == -1) {
+                       printf("second open read-only of %s failed (%s)\n",
+                                       lockfname, cli_errstr(c));
+                       return False;
+               }
+       }
+
+       i = 0;
+       for (count = 0; count < sizeof(buf); count += sent)
+       {
+               if (count >= countprev) {
+                       printf("%d %8d\r", i, count);
+                       fflush(stdout);
+                       i++;
+                       countprev += (sizeof(buf) / 20);
+               }
+
+               if (procnum == 0)
+               {
+                       sent = ((unsigned)sys_random()%(20))+ 1;
+                       if (sent > sizeof(buf) - count)
+                       {
+                               sent = sizeof(buf) - count;
+                       }
+
+                       if (cli_write(c, fnum, 0, buf+count, count, sent) != sent) {
+                               printf("write failed (%s)\n", cli_errstr(c));
+                       }
+               }
+               else
+               {
+                       sent = cli_read(c, fnum, buf_rd+count, count,
+                                                 sizeof(buf)-count);
+                       if (sent < 0)
+                       {
+                               printf("read failed offset:%d size:%d (%s)\n",
+                                               count, sizeof(buf)-count,
+                                               cli_errstr(c));
+                               sent = 0;
+                       }
+                       if (sent > 0)
+                       {
+                               if (memcmp(buf_rd+count, buf+count, sent) != 0)
+                               {
+                                       printf("read/write compare failed\n");
+                                       printf("offset: %d req %d recvd %d\n",
+                                               count, sizeof(buf)-count, sent);
+                                       break;
+                               }
+                       }
+               }
+
+       }
+
+       if (!cli_close(c, fnum)) {
+               printf("close failed (%s)\n", cli_errstr(c));
+       }
+
+       return True;
+}
+
+static BOOL rw_torture2(struct cli_state *c1, struct cli_state *c2)
+{
+       char *lockfname = "\\torture.lck";
+       int fnum1;
+       int fnum2;
+       int i;
+       char buf[131072];
+       char buf_rd[131072];
+
+       if (!cli_unlink(c1, lockfname)) {
+               printf("unlink failed (%s)\n", cli_errstr(c1));
+       }
+
+       fnum1 = cli_open(c1, lockfname, O_RDWR | O_CREAT | O_EXCL, 
+                        DENY_NONE);
+       if (fnum1 == -1) {
+               printf("first open read/write of %s failed (%s)\n",
+                               lockfname, cli_errstr(c1));
+               return False;
+       }
+       fnum2 = cli_open(c2, lockfname, O_RDONLY, 
+                        DENY_NONE);
+       if (fnum2 == -1) {
+               printf("second open read-only of %s failed (%s)\n",
+                               lockfname, cli_errstr(c2));
+               cli_close(c1, fnum1);
+               return False;
+       }
+
+       for (i=0;i<numops;i++)
+       {
+               unsigned buf_size = ((unsigned)sys_random()%(sizeof(buf)-1))+ 1;
+               if (i % 10 == 0) {
+                       printf("%d\r", i); fflush(stdout);
+               }
+
+               generate_random_buffer(buf, buf_size, False);
+
+               if (cli_write(c1, fnum1, 0, buf, 0, buf_size) != buf_size) {
+                       printf("write failed (%s)\n", cli_errstr(c1));
+               }
+
+               if (cli_read(c2, fnum2, buf_rd, 0, buf_size) != buf_size) {
+                       printf("read failed (%s)\n", cli_errstr(c2));
+               }
+
+               if (memcmp(buf_rd, buf, buf_size) != 0)
+               {
+                       printf("read/write compare failed\n");
+               }
+       }
+
+       if (!cli_close(c2, fnum2)) {
+               printf("close failed (%s)\n", cli_errstr(c2));
+       }
+       if (!cli_close(c1, fnum1)) {
+               printf("close failed (%s)\n", cli_errstr(c1));
+       }
+
+       if (!cli_unlink(c1, lockfname)) {
+               printf("unlink failed (%s)\n", cli_errstr(c1));
+       }
+
+       return True;
 }
 
+static void run_readwritetest(int dummy)
+{
+       static struct cli_state cli1, cli2;
+       BOOL test;
+
+       if (!open_connection(&cli1) || !open_connection(&cli2)) {
+               return;
+       }
+       cli_sockopt(&cli1, sockops);
+       cli_sockopt(&cli2, sockops);
+
+       printf("starting readwritetest\n");
 
+       test = rw_torture2(&cli1, &cli2);
+       printf("Passed readwritetest v1: %s\n", BOOLSTR(test));
 
-static void run_torture(int numops)
+       test = rw_torture2(&cli1, &cli1);
+       printf("Passed readwritetest v2: %s\n", BOOLSTR(test));
+
+       close_connection(&cli1);
+       close_connection(&cli2);
+}
+
+static void run_readwritemulti(int dummy)
 {
        static struct cli_state cli;
+       BOOL test;
+
+       cli = current_cli;
+
+       cli_sockopt(&cli, sockops);
+
+       printf("run_readwritemulti: fname %s\n", randomfname);
+       test = rw_torture3(&cli, randomfname);
+
+       close_connection(&cli);
+}
+
+int line_count = 0;
+
+/* run a test that simulates an approximate netbench client load */
+static void run_netbench(int client)
+{
+       struct cli_state cli;
+       int i;
+       fstring fname;
+       pstring line;
+       char cname[20];
+       FILE *f;
+       char *params[20];
+
+       cli = current_cli;
+
+       cli_sockopt(&cli, sockops);
 
-       if (open_connection(&cli)) {
-               cli_sockopt(&cli, sockops);
+       nb_setup(&cli);
 
-               printf("pid %d OK\n", getpid());
+       slprintf(cname,sizeof(fname), "CLIENT%d", client);
 
-               rw_torture(&cli, numops);
+       f = fopen("client.txt", "r");
 
-               close_connection(&cli);
+       if (!f) {
+               perror("client.txt");
+               return;
+       }
+
+       while (fgets(line, sizeof(line)-1, f)) {
+               line_count++;
+
+               line[strlen(line)-1] = 0;
+
+               /* printf("[%d] %s\n", line_count, 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;
+               while (params[i]) params[++i] = strtok(NULL," ");
+
+               params[i] = "";
+
+               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]));
+                       }
+               } 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);
+                       }
+               }
        }
+       fclose(f);
+
+       slprintf(fname,sizeof(fname), "CLIENTS/CLIENT%d", client);
+       rmdir(fname);
+       rmdir("CLIENTS");
+
+       printf("+");    
+
+       close_connection(&cli);
+}
+
+
+/* run a test that simulates an approximate netbench w9X client load */
+static void run_nbw95(int dummy)
+{
+       double t;
+       t = create_procs(run_netbench);
+       /* 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);
+}
+
+/* run a test that simulates an approximate netbench wNT client load */
+static void run_nbwnt(int dummy)
+{
+       double t;
+       t = create_procs(run_netbench);
+       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);
 }
 
+
+
 /*
   This test checks for two things:
 
@@ -217,10 +620,10 @@ static void run_torture(int numops)
      must not use posix semantics)
   2) support for lock timeouts
  */
-static void run_locktest1(void)
+static void run_locktest1(int dummy)
 {
        static struct cli_state cli1, cli2;
-       char *fname = "\\locktest.lck";
+       char *fname = "\\lockt1.lck";
        int fnum1, fnum2, fnum3;
        time_t t1, t2;
 
@@ -250,39 +653,27 @@ static void run_locktest1(void)
                return;
        }
 
-       if (!cli_lock(&cli1, fnum1, 0, 4, 0)) {
+       if (!cli_lock(&cli1, fnum1, 0, 4, 0, WRITE_LOCK)) {
                printf("lock1 failed (%s)\n", cli_errstr(&cli1));
                return;
        }
 
 
-       if (cli_lock(&cli2, fnum3, 0, 4, 0)) {
+       if (cli_lock(&cli2, fnum3, 0, 4, 0, WRITE_LOCK)) {
                printf("lock2 succeeded! This is a locking bug\n");
                return;
        } else {
-               int eclass, num;
-               cli_error(&cli2, &eclass, &num);
-               if (eclass != ERRDOS || num != ERRlock) {
-                       printf("error should have been ERRDOS/ERRlock (%s)\n", 
-                              cli_errstr(&cli2));
-                       return;
-               }
+               if (!check_error(&cli2, ERRDOS, ERRlock, 0)) return;
        }
 
 
        printf("Testing lock timeouts\n");
        t1 = time(NULL);
-       if (cli_lock(&cli2, fnum3, 0, 4, 10*1000)) {
+       if (cli_lock(&cli2, fnum3, 0, 4, 10*1000, WRITE_LOCK)) {
                printf("lock3 succeeded! This is a locking bug\n");
                return;
        } else {
-               int eclass, num;
-               cli_error(&cli2, &eclass, &num);
-               if (eclass != ERRDOS || num != ERRlock) {
-                       printf("error should have been ERRDOS/ERRlock (%s)\n", 
-                              cli_errstr(&cli2));
-                       return;
-               }
+               if (!check_error(&cli2, ERRDOS, ERRlock, 0)) return;
        }
        t2 = time(NULL);
 
@@ -295,17 +686,11 @@ static void run_locktest1(void)
                return;
        }
 
-       if (cli_lock(&cli2, fnum3, 0, 4, 0)) {
+       if (cli_lock(&cli2, fnum3, 0, 4, 0, WRITE_LOCK)) {
                printf("lock4 succeeded! This is a locking bug\n");
                return;
        } else {
-               int eclass, num;
-               cli_error(&cli2, &eclass, &num);
-               if (eclass != ERRDOS || num != ERRlock) {
-                       printf("error should have been ERRDOS/ERRlock (%s)\n", 
-                              cli_errstr(&cli2));
-                       return;
-               }
+               if (!check_error(&cli2, ERRDOS, ERRlock, 0)) return;
        }
 
        if (!cli_close(&cli1, fnum1)) {
@@ -330,6 +715,77 @@ static void run_locktest1(void)
        printf("Passed locktest1\n");
 }
 
+/*
+ checks for correct tconX support
+ */
+static void run_tcon_test(int dummy)
+{
+       static struct cli_state cli1;
+       char *fname = "\\tcontest.tmp";
+       int fnum1;
+       uint16 cnum;
+       char buf[4];
+
+       if (!open_connection(&cli1)) {
+               return;
+       }
+       cli_sockopt(&cli1, sockops);
+
+       printf("starting tcontest\n");
+
+       cli_unlink(&cli1, fname);
+
+       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;
+       }
+
+       cnum = cli1.cnum;
+
+       if (cli_write(&cli1, fnum1, 0, buf, 130, 4) != 4)
+       {
+               printf("write failed (%s)", cli_errstr(&cli1));
+               return;
+       }
+
+       if (!cli_send_tconX(&cli1, share, "?????",
+                           password, strlen(password)+1)) {
+               printf("%s refused 2nd tree connect (%s)\n", host,
+                          cli_errstr(&cli1));
+               cli_shutdown(&cli1);
+               return ;
+       }
+
+       if (cli_write(&cli1, fnum1, 0, buf, 130, 4) == 4)
+       {
+               printf("write succeeded (%s)", cli_errstr(&cli1));
+               return;
+       }
+
+       if (cli_close(&cli1, fnum1)) {
+               printf("close2 succeeded (%s)\n", cli_errstr(&cli1));
+               return;
+       }
+
+       if (!cli_tdis(&cli1)) {
+               printf("tdis failed (%s)\n", cli_errstr(&cli1));
+               return;
+       }
+
+       cli1.cnum = cnum;
+
+       if (!cli_close(&cli1, fnum1)) {
+               printf("close2 failed (%s)\n", cli_errstr(&cli1));
+               return;
+       }
+
+       close_connection(&cli1);
+
+       printf("Passed tcontest\n");
+}
+
 
 /*
   This test checks that 
@@ -342,10 +798,10 @@ static void run_locktest1(void)
 
   3) the server denies unlock requests by an incorrect client PID
 */
-static void run_locktest2(void)
+static void run_locktest2(int dummy)
 {
        static struct cli_state cli;
-       char *fname = "\\locktest.lck";
+       char *fname = "\\lockt2.lck";
        int fnum1, fnum2, fnum3;
 
        if (!open_connection(&cli)) {
@@ -382,39 +838,39 @@ static void run_locktest2(void)
 
        cli_setpid(&cli, 1);
 
-       if (!cli_lock(&cli, fnum1, 0, 4, 0)) {
+       if (!cli_lock(&cli, fnum1, 0, 4, 0, WRITE_LOCK)) {
                printf("lock1 failed (%s)\n", cli_errstr(&cli));
                return;
        }
 
-       if (cli_lock(&cli, fnum2, 0, 4, 0)) {
-               printf("lock2 succeeded! This is a locking bug\n");
+       if (cli_lock(&cli, fnum1, 0, 4, 0, WRITE_LOCK)) {
+               printf("WRITE lock1 succeeded! This is a locking bug\n");
        } else {
-               int eclass, num;
-               cli_error(&cli, &eclass, &num);
-               if (eclass != ERRDOS || num != ERRlock) {
-                       printf("error should have been ERRDOS/ERRlock (%s)\n", 
-                              cli_errstr(&cli));
-                       return;
-               }
+               if (!check_error(&cli, ERRDOS, ERRlock, 0)) return;
+       }
+
+       if (cli_lock(&cli, fnum2, 0, 4, 0, WRITE_LOCK)) {
+               printf("WRITE lock2 succeeded! This is a locking bug\n");
+       } else {
+               if (!check_error(&cli, ERRDOS, ERRlock, 0)) return;
+       }
+
+       if (cli_lock(&cli, fnum2, 0, 4, 0, READ_LOCK)) {
+               printf("READ lock2 succeeded! This is a locking bug\n");
+       } else {
+               if (!check_error(&cli, ERRDOS, ERRlock, 0)) return;
        }
 
        cli_setpid(&cli, 2);
 
-       if (cli_unlock(&cli, fnum1, 0, 4, 0)) {
+       if (cli_unlock(&cli, fnum1, 0, 8)) {
                printf("unlock1 succeeded! This is a locking bug\n");
        }
 
-       if (cli_lock(&cli, fnum3, 0, 4, 0)) {
+       if (cli_lock(&cli, fnum3, 0, 4, 0, WRITE_LOCK)) {
                printf("lock3 succeeded! This is a locking bug\n");
        } else {
-               int eclass, num;
-               cli_error(&cli, &eclass, &num);
-               if (eclass != ERRDOS || num != ERRlock) {
-                       printf("error should have been ERRDOS/ERRlock (%s)\n", 
-                              cli_errstr(&cli));
-                       return;
-               }
+               if (!check_error(&cli, ERRDOS, ERRlock, 0)) return;
        }
 
        cli_setpid(&cli, 1);
@@ -445,10 +901,10 @@ static void run_locktest2(void)
 
   1) the server supports the full offset range in lock requests
 */
-static void run_locktest3(int numops)
+static void run_locktest3(int dummy)
 {
        static struct cli_state cli1, cli2;
-       char *fname = "\\locktest.lck";
+       char *fname = "\\lockt3.lck";
        int fnum1, fnum2, i;
        uint32 offset;
 
@@ -477,14 +933,14 @@ static void run_locktest3(int numops)
 
        for (offset=i=0;i<numops;i++) {
                NEXT_OFFSET;
-               if (!cli_lock(&cli1, fnum1, offset-1, 1, 0)) {
+               if (!cli_lock(&cli1, fnum1, offset-1, 1, 0, WRITE_LOCK)) {
                        printf("lock1 %d failed (%s)\n", 
                               i,
                               cli_errstr(&cli1));
                        return;
                }
 
-               if (!cli_lock(&cli2, fnum2, offset-2, 1, 0)) {
+               if (!cli_lock(&cli2, fnum2, offset-2, 1, 0, WRITE_LOCK)) {
                        printf("lock2 %d failed (%s)\n", 
                               i,
                               cli_errstr(&cli1));
@@ -495,22 +951,22 @@ static void run_locktest3(int numops)
        for (offset=i=0;i<numops;i++) {
                NEXT_OFFSET;
 
-               if (cli_lock(&cli1, fnum1, offset-2, 1, 0)) {
+               if (cli_lock(&cli1, fnum1, offset-2, 1, 0, WRITE_LOCK)) {
                        printf("error: lock1 %d succeeded!\n", i);
                        return;
                }
 
-               if (cli_lock(&cli2, fnum2, offset-1, 1, 0)) {
+               if (cli_lock(&cli2, fnum2, offset-1, 1, 0, WRITE_LOCK)) {
                        printf("error: lock2 %d succeeded!\n", i);
                        return;
                }
 
-               if (cli_lock(&cli1, fnum1, offset-1, 1, 0)) {
+               if (cli_lock(&cli1, fnum1, offset-1, 1, 0, WRITE_LOCK)) {
                        printf("error: lock3 %d succeeded!\n", i);
                        return;
                }
 
-               if (cli_lock(&cli2, fnum2, offset-2, 1, 0)) {
+               if (cli_lock(&cli2, fnum2, offset-2, 1, 0, WRITE_LOCK)) {
                        printf("error: lock4 %d succeeded!\n", i);
                        return;
                }
@@ -519,14 +975,14 @@ static void run_locktest3(int numops)
        for (offset=i=0;i<numops;i++) {
                NEXT_OFFSET;
 
-               if (!cli_unlock(&cli1, fnum1, offset-1, 1, 0)) {
+               if (!cli_unlock(&cli1, fnum1, offset-1, 1)) {
                        printf("unlock1 %d failed (%s)\n", 
                               i,
                               cli_errstr(&cli1));
                        return;
                }
 
-               if (!cli_unlock(&cli2, fnum2, offset-2, 1, 0)) {
+               if (!cli_unlock(&cli2, fnum2, offset-2, 1)) {
                        printf("unlock2 %d failed (%s)\n", 
                               i,
                               cli_errstr(&cli1));
@@ -553,256 +1009,1740 @@ static void run_locktest3(int numops)
        printf("finished locktest3\n");
 }
 
+#define EXPECTED(ret, v) if ((ret) != (v)) printf("** ")
 
 /*
-  This test checks that 
-
-  1) the server does not allow an unlink on a file that is open
+  looks at overlapping locks
 */
-static void run_unlinktest(void)
+static void run_locktest4(int dummy)
 {
-       static struct cli_state cli;
-       char *fname = "\\unlink.tst";
-       int fnum;
+       static struct cli_state cli1, cli2;
+       char *fname = "\\lockt4.lck";
+       int fnum1, fnum2, f;
+       BOOL ret;
+       char buf[1000];
 
-       if (!open_connection(&cli)) {
+       if (!open_connection(&cli1) || !open_connection(&cli2)) {
                return;
        }
 
-       cli_sockopt(&cli, sockops);
+       cli_sockopt(&cli1, sockops);
+       cli_sockopt(&cli2, sockops);
 
-       printf("starting unlink test\n");
+       printf("starting locktest4\n");
 
-       cli_unlink(&cli, fname);
+       cli_unlink(&cli1, fname);
 
-       cli_setpid(&cli, 1);
+       fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+       fnum2 = cli_open(&cli2, fname, O_RDWR, DENY_NONE);
 
-       fnum = cli_open(&cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
-       if (fnum == -1) {
-               printf("open of %s failed (%s)\n", fname, cli_errstr(&cli));
-               return;
-       }
+       memset(buf, 0, sizeof(buf));
 
-       if (cli_unlink(&cli, fname)) {
-               printf("error: server allowed unlink on an open file\n");
+       if (cli_write(&cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
+               printf("Failed to create file\n");
+               goto fail;
        }
 
-       close_connection(&cli);
+       ret = cli_lock(&cli1, fnum1, 0, 4, 0, WRITE_LOCK) &&
+             cli_lock(&cli1, fnum1, 2, 4, 0, WRITE_LOCK);
+       EXPECTED(ret, False);
+       printf("the same process %s set overlapping write locks\n", ret?"can":"cannot");
+           
+       ret = cli_lock(&cli1, fnum1, 10, 4, 0, READ_LOCK) &&
+             cli_lock(&cli1, fnum1, 12, 4, 0, READ_LOCK);
+       EXPECTED(ret, True);
+       printf("the same process %s set overlapping read locks\n", ret?"can":"cannot");
+
+       ret = cli_lock(&cli1, fnum1, 20, 4, 0, WRITE_LOCK) &&
+             cli_lock(&cli2, fnum2, 22, 4, 0, WRITE_LOCK);
+       EXPECTED(ret, False);
+       printf("a different connection %s set overlapping write locks\n", ret?"can":"cannot");
+           
+       ret = cli_lock(&cli1, fnum1, 30, 4, 0, READ_LOCK) &&
+             cli_lock(&cli2, fnum2, 32, 4, 0, READ_LOCK);
+       EXPECTED(ret, True);
+       printf("a different connection %s set overlapping read locks\n", ret?"can":"cannot");
+       
+       ret = (cli_setpid(&cli1, 1), cli_lock(&cli1, fnum1, 40, 4, 0, WRITE_LOCK)) &&
+             (cli_setpid(&cli1, 2), cli_lock(&cli1, fnum1, 42, 4, 0, WRITE_LOCK));
+       EXPECTED(ret, False);
+       printf("a different pid %s set overlapping write locks\n", ret?"can":"cannot");
+           
+       ret = (cli_setpid(&cli1, 1), cli_lock(&cli1, fnum1, 50, 4, 0, READ_LOCK)) &&
+             (cli_setpid(&cli1, 2), cli_lock(&cli1, fnum1, 52, 4, 0, READ_LOCK));
+       EXPECTED(ret, True);
+       printf("a different pid %s set overlapping read locks\n", ret?"can":"cannot");
+
+       ret = cli_lock(&cli1, fnum1, 60, 4, 0, READ_LOCK) &&
+             cli_lock(&cli1, 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 = cli_lock(&cli1, fnum1, 70, 4, 0, WRITE_LOCK) &&
+             cli_lock(&cli1, 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 = cli_lock(&cli1, fnum1, 80, 4, 0, READ_LOCK) &&
+             cli_lock(&cli1, 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 = cli_lock(&cli1, fnum1, 90, 4, 0, WRITE_LOCK) &&
+             cli_lock(&cli1, 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 = (cli_setpid(&cli1, 1), cli_lock(&cli1, fnum1, 100, 4, 0, WRITE_LOCK)) &&
+             (cli_setpid(&cli1, 2), cli_lock(&cli1, 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 = cli_lock(&cli1, fnum1, 110, 4, 0, READ_LOCK) &&
+             cli_lock(&cli1, fnum1, 112, 4, 0, READ_LOCK) &&
+             cli_unlock(&cli1, fnum1, 110, 6);
+       EXPECTED(ret, False);
+       printf("the same process %s coalesce read locks\n", ret?"can":"cannot");
+
+
+       ret = cli_lock(&cli1, fnum1, 120, 4, 0, WRITE_LOCK) &&
+             (cli_read(&cli2, fnum2, buf, 120, 4) == 4);
+       EXPECTED(ret, False);
+       printf("this server %s strict write locking\n", ret?"doesn't do":"does");
+
+       ret = cli_lock(&cli1, fnum1, 130, 4, 0, READ_LOCK) &&
+             (cli_write(&cli2, fnum2, 0, buf, 130, 4) == 4);
+       EXPECTED(ret, False);
+       printf("this server %s strict read locking\n", ret?"doesn't do":"does");
+
+
+       ret = cli_lock(&cli1, fnum1, 140, 4, 0, READ_LOCK) &&
+             cli_lock(&cli1, fnum1, 140, 4, 0, READ_LOCK) &&
+             cli_unlock(&cli1, fnum1, 140, 4) &&
+             cli_unlock(&cli1, fnum1, 140, 4);
+       EXPECTED(ret, True);
+       printf("this server %s do recursive read locking\n", ret?"does":"doesn't");
+
+
+       ret = cli_lock(&cli1, fnum1, 150, 4, 0, WRITE_LOCK) &&
+             cli_lock(&cli1, fnum1, 150, 4, 0, READ_LOCK) &&
+             cli_unlock(&cli1, fnum1, 150, 4) &&
+             (cli_read(&cli2, fnum2, buf, 150, 4) == 4) &&
+             !(cli_write(&cli2, fnum2, 0, buf, 150, 4) == 4) &&
+             cli_unlock(&cli1, fnum1, 150, 4);
+       EXPECTED(ret, True);
+       printf("this server %s do recursive lock overlays\n", ret?"does":"doesn't");
+
+       ret = cli_lock(&cli1, fnum1, 160, 4, 0, READ_LOCK) &&
+             cli_unlock(&cli1, fnum1, 160, 4) &&
+             (cli_write(&cli2, fnum2, 0, buf, 160, 4) == 4) &&         
+             (cli_read(&cli2, 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 = cli_lock(&cli1, fnum1, 170, 4, 0, WRITE_LOCK) &&
+             cli_unlock(&cli1, fnum1, 170, 4) &&
+             (cli_write(&cli2, fnum2, 0, buf, 170, 4) == 4) &&         
+             (cli_read(&cli2, 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 = cli_lock(&cli1, fnum1, 190, 4, 0, WRITE_LOCK) &&
+             cli_lock(&cli1, fnum1, 190, 4, 0, READ_LOCK) &&
+             cli_unlock(&cli1, fnum1, 190, 4) &&
+             !(cli_write(&cli2, fnum2, 0, buf, 190, 4) == 4) &&                
+             (cli_read(&cli2, fnum2, buf, 190, 4) == 4);               
+       EXPECTED(ret, True);
+       printf("the same process %s remove the first lock first\n", ret?"does":"doesn't");
+
+       cli_close(&cli1, fnum1);
+       cli_close(&cli2, fnum2);
+       fnum1 = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
+       f = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
+       ret = cli_lock(&cli1, fnum1, 0, 8, 0, READ_LOCK) &&
+             cli_lock(&cli1, f, 0, 1, 0, READ_LOCK) &&
+             cli_close(&cli1, fnum1) &&
+             ((fnum1 = cli_open(&cli1, fname, O_RDWR, DENY_NONE)) != -1) &&
+             cli_lock(&cli1, fnum1, 7, 1, 0, WRITE_LOCK);
+        cli_close(&cli1, f);
+       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);
 
-       printf("unlink test finished\n");
+       printf("finished locktest4\n");
 }
 
+/*
+  looks at lock upgrade/downgrade.
+*/
+static void run_locktest5(int dummy)
+{
+       static struct cli_state cli1, cli2;
+       char *fname = "\\lockt5.lck";
+       int fnum1, fnum2, fnum3;
+       BOOL ret;
+       char buf[1000];
+
+       if (!open_connection(&cli1) || !open_connection(&cli2)) {
+               return;
+       }
+
+       cli_sockopt(&cli1, sockops);
+       cli_sockopt(&cli2, sockops);
+
+       printf("starting locktest5\n");
+
+       cli_unlink(&cli1, fname);
+
+       fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+       fnum2 = cli_open(&cli2, fname, O_RDWR, DENY_NONE);
+       fnum3 = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
+
+       memset(buf, 0, sizeof(buf));
+
+       if (cli_write(&cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
+               printf("Failed to create file\n");
+               goto fail;
+       }
+
+       /* Check for NT bug... */
+       ret = cli_lock(&cli1, fnum1, 0, 8, 0, READ_LOCK) &&
+                 cli_lock(&cli1, fnum3, 0, 1, 0, READ_LOCK);
+       cli_close(&cli1, fnum1);
+       fnum1 = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
+       ret = cli_lock(&cli1, fnum1, 7, 1, 0, WRITE_LOCK);
+       EXPECTED(ret, True);
+       printf("this server %s the NT locking bug\n", ret ? "doesn't have" : "has");
+       cli_close(&cli1, fnum1);
+       fnum1 = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
+       cli_unlock(&cli1, fnum3, 0, 1);
+
+       ret = cli_lock(&cli1, fnum1, 0, 4, 0, WRITE_LOCK) &&
+             cli_lock(&cli1, 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 = cli_lock(&cli2, fnum2, 0, 4, 0, READ_LOCK);
+       EXPECTED(ret, False);
+
+       printf("a different processs %s get a read lock on the first process lock stack\n", ret?"can":"cannot");
+
+       /* Unlock the process 2 lock. */
+       cli_unlock(&cli2, fnum2, 0, 4);
+
+       ret = cli_lock(&cli1, fnum3, 0, 4, 0, READ_LOCK);
+       EXPECTED(ret, False);
+
+       printf("the same processs on a different fnum %s get a read lock\n", ret?"can":"cannot");
+
+       /* Unlock the process 1 fnum3 lock. */
+       cli_unlock(&cli1, fnum3, 0, 4);
+
+       /* Stack 2 more locks here. */
+       ret = cli_lock(&cli1, fnum1, 0, 4, 0, READ_LOCK) &&
+                 cli_lock(&cli1, 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 = cli_unlock(&cli1, fnum1, 0, 4) &&
+                       cli_lock(&cli2, fnum2, 0, 4, 0, READ_LOCK);
+
+       EXPECTED(ret, True);
+       printf("the first unlock removes the %s lock\n", ret?"WRITE":"READ");
+
+       /* Unlock the process 2 lock. */
+       cli_unlock(&cli2, fnum2, 0, 4);
+
+       /* We should have 3 stacked locks here. Ensure we need to do 3 unlocks. */
+
+       ret = cli_unlock(&cli1, fnum1, 1, 1) &&
+                 cli_unlock(&cli1, fnum1, 0, 4) &&
+                 cli_unlock(&cli1, 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 = cli_unlock(&cli1, 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 = cli_lock(&cli2, fnum2, 0, 4, 0, WRITE_LOCK);
+       EXPECTED(ret, True);
+
+       printf("a different processs %s get a write lock on the unlocked stack\n", ret?"can":"cannot");
+
+ fail:
+       cli_close(&cli1, fnum1);
+       cli_close(&cli2, fnum2);
+       cli_unlink(&cli1, fname);
+       close_connection(&cli1);
+       close_connection(&cli2);
+
+       printf("finished locktest5\n");
+}
+
+
+/*
+  this produces a matrix of deny mode behaviour
+ */
+static void run_denytest1(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}};
+
+       if (!open_connection(&cli1) || !open_connection(&cli2)) {
+               return;
+       }
+       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);
+
+               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("\n");
+                       cli_close(&cli1, fnum1);
+                       cli_close(&cli2, fnum2);
+               }
+               
+               cli_unlink(&cli1, fnames[f]);
+       }
+
+       close_connection(&cli1);
+       close_connection(&cli2);
+       
+       printf("finshed denytest1\n");
+}
+
+
+/*
+  this produces a matrix of deny mode behaviour for two opens on the
+  same connection
+ */
+static void 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}};
+
+       if (!open_connection(&cli1)) {
+               return;
+       }
+       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]);
+       }
+
+       close_connection(&cli1);
+       
+       printf("finshed denytest2\n");
+}
+
+/*
+test whether fnums and tids open on one VC are available on another (a major
+security hole)
+*/
+static void run_fdpasstest(int dummy)
+{
+       static struct cli_state cli1, cli2, cli3;
+       char *fname = "\\fdpass.tst";
+       int fnum1;
+       pstring buf;
+
+       if (!open_connection(&cli1) || !open_connection(&cli2)) {
+               return;
+       }
+       cli_sockopt(&cli1, sockops);
+       cli_sockopt(&cli2, sockops);
+
+       printf("starting fdpasstest\n");
+
+       cli_unlink(&cli1, fname);
+
+       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;
+       }
+
+       if (cli_write(&cli1, fnum1, 0, "hello world\n", 0, 13) != 13) {
+               printf("write failed (%s)\n", cli_errstr(&cli1));
+               return;
+       }
+
+       cli3 = cli2;
+       cli3.vuid = cli1.vuid;
+       cli3.cnum = cli1.cnum;
+       cli3.pid = cli1.pid;
+
+       if (cli_read(&cli3, fnum1, buf, 0, 13) == 13) {
+               printf("read succeeded! nasty security hole [%s]\n",
+                      buf);
+               return;
+       }
+
+       cli_close(&cli1, fnum1);
+       cli_unlink(&cli1, fname);
+
+       close_connection(&cli1);
+       close_connection(&cli2);
+
+       printf("finished fdpasstest\n");
+}
+
+
+/*
+  This test checks that 
+
+  1) the server does not allow an unlink on a file that is open
+*/
+static void run_unlinktest(int dummy)
+{
+       static struct cli_state cli;
+       char *fname = "\\unlink.tst";
+       int fnum;
+
+       if (!open_connection(&cli)) {
+               return;
+       }
+
+       cli_sockopt(&cli, sockops);
+
+       printf("starting unlink test\n");
+
+       cli_unlink(&cli, fname);
+
+       cli_setpid(&cli, 1);
+
+       fnum = cli_open(&cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+       if (fnum == -1) {
+               printf("open of %s failed (%s)\n", fname, cli_errstr(&cli));
+               return;
+       }
+
+       if (cli_unlink(&cli, fname)) {
+               printf("error: server allowed unlink on an open file\n");
+       }
+
+       cli_close(&cli, fnum);
+       cli_unlink(&cli, fname);
+
+       close_connection(&cli);
+
+       printf("unlink test finished\n");
+}
+
+
+/*
+test how many open files this server supports on the one socket
+*/
+static void run_maxfidtest(int dummy)
+{
+       static struct cli_state cli;
+       char *template = "\\maxfid.%d.%d";
+       fstring fname;
+       int fnum;
+       int retries=4;
+
+       cli = current_cli;
+
+       if (retries <= 0) {
+               printf("failed to connect\n");
+               return;
+       }
+
+       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) ==
+                   -1) {
+                       printf("open of %s failed (%s)\n", 
+                              fname, cli_errstr(&cli));
+                       printf("maximum fnum is %d\n", fnum);
+                       break;
+               }
+               fnum++;
+               if (fnum % 100 == 0) printf("%d\r", fnum);
+       }
+       printf("%d\n", fnum);
+
+       printf("cleaning up\n");
+       while (fnum > 0) {
+               fnum--;
+               slprintf(fname,sizeof(fname)-1,template, fnum,(int)getpid());
+               cli_close(&cli, fnum);
+               if (!cli_unlink(&cli, fname)) {
+                       printf("unlink of %s failed (%s)\n", 
+                              fname, cli_errstr(&cli));
+               }
+       }
+
+       printf("maxfid test finished\n");
+       close_connection(&cli);
+}
+
+/* generate a random buffer */
+static void rand_buf(char *buf, int len)
+{
+       while (len--) {
+               *buf = (char)sys_random();
+               buf++;
+       }
+}
+
+/* send smb negprot commands, not reading the response */
+static void run_negprot_nowait(int dummy)
+{
+       int i;
+       static struct cli_state cli;
+
+       printf("starting negprot nowait test\n");
+
+       if (!open_nbt_connection(&cli)) {
+               return;
+       }
+
+       for (i=0;i<50000;i++) {
+               cli_negprot_send(&cli);
+       }
+
+       close_connection(&cli);
+
+       printf("finished negprot nowait test\n");
+}
+
+
+/* send random IPC commands */
+static void run_randomipc(int dummy)
+{
+       char *rparam = NULL;
+       char *rdata = NULL;
+       int rdrcnt,rprcnt;
+       pstring param;
+       int api, param_len, i;
+       static struct cli_state cli;
+
+       printf("starting random ipc test\n");
+
+       if (!open_connection(&cli)) {
+               return;
+       }
+
+       for (i=0;i<50000;i++) {
+               api = sys_random() % 500;
+               param_len = (sys_random() % 64);
+
+               rand_buf(param, param_len);
+  
+               SSVAL(param,0,api); 
+
+               cli_api(&cli, 
+                       param, param_len, 8,  
+                       NULL, 0, BUFFER_SIZE, 
+                       &rparam, &rprcnt,     
+                       &rdata, &rdrcnt);
+       }
+
+       close_connection(&cli);
+
+       printf("finished random ipc test\n");
+}
+
+
+
+static void browse_callback(const char *sname, uint32 stype, 
+                           const char *comment, void *state)
+{
+       printf("\t%20.20s %08x %s\n", sname, stype, comment);
+}
+
+
+
+/*
+  This test checks the browse list code
+
+*/
+static void run_browsetest(int dummy)
+{
+       static struct cli_state cli;
+
+       printf("starting browse test\n");
+
+       if (!open_connection(&cli)) {
+               return;
+       }
+
+       printf("domain list:\n");
+       cli_NetServerEnum(&cli, cli.server_domain, 
+                         SV_TYPE_DOMAIN_ENUM,
+                         browse_callback, NULL);
+
+       printf("machine list:\n");
+       cli_NetServerEnum(&cli, cli.server_domain, 
+                         SV_TYPE_ALL,
+                         browse_callback, NULL);
+
+       close_connection(&cli);
+
+       printf("browse test finished\n");
+}
+
+
+/*
+  This checks how the getatr calls works
+*/
+static void run_attrtest(int dummy)
+{
+       static struct cli_state cli;
+       int fnum;
+       time_t t, t2;
+       char *fname = "\\attrib.tst";
+
+       printf("starting attrib test\n");
+
+       if (!open_connection(&cli)) {
+               return;
+       }
+
+       cli_unlink(&cli, fname);
+       fnum = cli_open(&cli, fname, 
+                       O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
+       cli_close(&cli, fnum);
+       if (!cli_getatr(&cli, fname, NULL, NULL, &t)) {
+               printf("getatr failed (%s)\n", cli_errstr(&cli));
+       }
+
+       if (abs(t - time(NULL)) > 2) {
+               printf("ERROR: SMBgetatr bug. time is %s",
+                      ctime(&t));
+               t = time(NULL);
+       }
+
+       t2 = t-60*60*24; /* 1 day ago */
+
+       if (!cli_setatr(&cli, fname, 0, t2)) {
+               printf("setatr failed (%s)\n", cli_errstr(&cli));
+       }
+
+       if (!cli_getatr(&cli, fname, NULL, NULL, &t)) {
+               printf("getatr failed (%s)\n", cli_errstr(&cli));
+       }
+
+       if (t != t2) {
+               printf("ERROR: getatr/setatr bug. times are\n%s",
+                      ctime(&t));
+               printf("%s", ctime(&t2));
+       }
+
+       cli_unlink(&cli, fname);
+
+       close_connection(&cli);
+
+       printf("attrib test finished\n");
+}
+
+
+/*
+  This checks a couple of trans2 calls
+*/
+static void run_trans2test(int dummy)
+{
+       static struct cli_state cli;
+       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";
+
+       printf("starting trans2 test\n");
+
+       if (!open_connection(&cli)) {
+               return;
+       }
+
+       cli_unlink(&cli, fname);
+       fnum = cli_open(&cli, fname, 
+                       O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
+       if (!cli_qfileinfo(&cli, fnum, NULL, &size, &c_time, &a_time, &m_time,
+                          NULL, NULL)) {
+               printf("ERROR: qfileinfo failed (%s)\n", cli_errstr(&cli));
+       }
+       cli_close(&cli, fnum);
+
+       sleep(2);
+
+       cli_unlink(&cli, fname);
+       fnum = cli_open(&cli, fname, 
+                       O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
+       cli_close(&cli, fnum);
+
+       if (!cli_qpathinfo(&cli, fname, &c_time, &a_time, &m_time, &size, NULL)) {
+               printf("ERROR: qpathinfo failed (%s)\n", cli_errstr(&cli));
+       } else {
+               if (c_time != m_time) {
+                       printf("create time=%s", ctime(&c_time));
+                       printf("modify time=%s", ctime(&m_time));
+                       printf("This system appears to have sticky create times\n");
+               }
+               if (a_time % (60*60) == 0) {
+                       printf("access time=%s", ctime(&a_time));
+                       printf("This system appears to set a midnight access time\n");
+               }
+
+               if (abs(m_time - time(NULL)) > 60*60*24*7) {
+                       printf("ERROR: totally incorrect times - maybe word reversed?\n");
+               }
+       }
+
+
+       cli_unlink(&cli, fname);
+       fnum = cli_open(&cli, fname, 
+                       O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
+       cli_close(&cli, fnum);
+       if (!cli_qpathinfo2(&cli, fname, &c_time, &a_time, &m_time, 
+                           &w_time, &size, NULL, NULL)) {
+               printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(&cli));
+       } else {
+               if (w_time < 60*60*24*2) {
+                       printf("write time=%s", ctime(&w_time));
+                       printf("This system appears to set a initial 0 write time\n");
+               }
+       }
+
+       cli_unlink(&cli, fname);
+
+
+       /* check if the server updates the directory modification time
+           when creating a new file */
+       if (!cli_mkdir(&cli, dname)) {
+               printf("ERROR: mkdir failed (%s)\n", cli_errstr(&cli));
+       }
+       sleep(3);
+       if (!cli_qpathinfo2(&cli, "\\trans2\\", &c_time, &a_time, &m_time, 
+                           &w_time, &size, NULL, NULL)) {
+               printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(&cli));
+       }
+
+       fnum = cli_open(&cli, fname2, 
+                       O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
+       cli_write(&cli, fnum,  0, (char *)&fnum, 0, sizeof(fnum));
+       cli_close(&cli, fnum);
+       if (!cli_qpathinfo2(&cli, "\\trans2\\", &c_time, &a_time, &m_time2, 
+                           &w_time, &size, NULL, NULL)) {
+               printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(&cli));
+       } else {
+               if (m_time2 == m_time)
+                       printf("This system does not update directory modification times\n");
+       }
+       cli_unlink(&cli, fname2);
+       cli_rmdir(&cli, dname);
+
+
+       close_connection(&cli);
+
+       printf("trans2 test finished\n");
+}
+
+
+/*
+  this is a harness for some oplock tests
+ */
+static void run_oplock1(int dummy)
+{
+       static struct cli_state cli1;
+       char *fname = "\\lockt1.lck";
+       int fnum1;
+
+       printf("starting oplock test 1\n");
+
+       if (!open_connection(&cli1)) {
+               return;
+       }
+
+       cli_unlink(&cli1, fname);
+
+       cli_sockopt(&cli1, sockops);
+
+       cli1.use_oplocks = True;
+
+       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;
+       }
+
+       cli1.use_oplocks = False;
+
+       cli_unlink(&cli1, fname);
+       cli_unlink(&cli1, fname);
+
+       if (!cli_close(&cli1, fnum1)) {
+               printf("close2 failed (%s)\n", cli_errstr(&cli1));
+               return;
+       }
+
+       if (!cli_unlink(&cli1, fname)) {
+               printf("unlink failed (%s)\n", cli_errstr(&cli1));
+               return;
+       }
+
+
+       close_connection(&cli1);
+
+       printf("finished oplock test 1\n");
+}
+
+static void run_oplock2(int dummy)
+{
+       static struct cli_state cli1, cli2;
+       char *fname = "\\lockt2.lck";
+       int fnum1, fnum2;
+       int saved_use_oplocks = use_oplocks;
+       char buf[4];
+
+       use_level_II_oplocks = True;
+       use_oplocks = True;
+
+       printf("starting oplock test 2\n");
+
+       if (!open_connection(&cli1)) {
+               use_level_II_oplocks = False;
+               use_oplocks = saved_use_oplocks;
+               return;
+       }
+
+       cli1.use_oplocks = True;
+       cli1.use_level_II_oplocks = True;
+
+       if (!open_connection(&cli2)) {
+               use_level_II_oplocks = False;
+               use_oplocks = saved_use_oplocks;
+               return;
+       }
+
+       cli2.use_oplocks = True;
+       cli2.use_level_II_oplocks = True;
+
+       cli_unlink(&cli1, fname);
+
+       cli_sockopt(&cli1, sockops);
+       cli_sockopt(&cli2, 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;
+       }
+
+       /* Don't need the globals any more. */
+       use_level_II_oplocks = False;
+       use_oplocks = saved_use_oplocks;
+
+       if (fork() == 0) {
+               /* Child code */
+               fnum2 = cli_open(&cli2, fname, O_RDWR, DENY_NONE);
+               if (fnum2 == -1) {
+                       printf("second open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+                       exit(0);
+               }
+
+               sleep(2);
+
+               if (!cli_close(&cli2, fnum2)) {
+                       printf("close2 failed (%s)\n", cli_errstr(&cli1));
+               }
+
+               exit(0);
+       }
+
+       sleep(2);
+
+       /* Ensure cli1 processes the break. */
+
+       if (cli_read(&cli1, fnum1, buf, 0, 4) != 4) {
+               printf("read on fnum1 failed (%s)\n", cli_errstr(&cli1));
+       }
+
+       /* Should now be at level II. */
+       /* Test if sending a write locks causes a break to none. */
+
+       if (!cli_lock(&cli1, fnum1, 0, 4, 0, READ_LOCK)) {
+               printf("lock failed (%s)\n", cli_errstr(&cli1));
+       }
+
+       cli_unlock(&cli1, fnum1, 0, 4);
+
+       sleep(2);
+
+       if (!cli_lock(&cli1, fnum1, 0, 4, 0, WRITE_LOCK)) {
+               printf("lock failed (%s)\n", cli_errstr(&cli1));
+       }
+
+       cli_unlock(&cli1, fnum1, 0, 4);
+
+       sleep(2);
+
+       cli_read(&cli1, fnum1, buf, 0, 4);
+
+#if 0
+       if (cli_write(&cli1, fnum1, 0, buf, 0, 4) != 4) {
+               printf("write on fnum1 failed (%s)\n", cli_errstr(&cli1));
+       }
+#endif
+
+       if (!cli_close(&cli1, fnum1)) {
+               printf("close1 failed (%s)\n", cli_errstr(&cli1));
+       }
+
+       sleep(4);
+
+       if (!cli_unlink(&cli1, fname)) {
+               printf("unlink failed (%s)\n", cli_errstr(&cli1));
+       }
+
+       close_connection(&cli1);
+
+       printf("finished oplock test 2\n");
+}
+
+/*
+  Test delete on close semantics.
+ */
+static void run_deletetest(int dummy)
+{
+    static struct cli_state cli1;
+    static struct cli_state cli2;
+    char *fname = "\\delete.file";
+    int fnum1, fnum2;
+
+    printf("starting delete test\n");
+
+    if (!open_connection(&cli1)) {
+        return;
+    }
+
+       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);
+
+       if (fnum1 == -1) {
+               printf("[1] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return;
+       }
+
+    if (!cli_close(&cli1, fnum1)) {
+        printf("[1] close failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
+
+    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;
+    }
+
+    if (!cli_close(&cli1, fnum1)) {
+        printf("[1] close failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
+
+       printf("first delete on close test succeeded.\n");
 
+       /* Test 2 - this should delete the file on close. */
 
-static void browse_callback(char *sname, uint32 stype, char *comment)
-{
-       printf("\t%20.20s %08x %s\n", sname, stype, comment);
-}
-
+       cli_setatr(&cli1, fname, 0, 0);
+       cli_unlink(&cli1, fname);
 
-/*
-  This test checks the browse list code
+       fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_ALL_ACCESS,
+                       FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
 
-*/
-static void run_browsetest(void)
-{
-       static struct cli_state cli;
+       if (fnum1 == -1) {
+               printf("[2] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return;
+       }
 
-       printf("staring browse test\n");
+       if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
+        printf("[2] setting delete_on_close failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
+
+    if (!cli_close(&cli1, fnum1)) {
+        printf("[2] close failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
+
+    fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
+    if (fnum1 != -1) {
+               printf("[2] open of %s succeeded should have been deleted on close !\n", fname);
+               if (!cli_close(&cli1, fnum1)) {
+                       printf("[2] close failed (%s)\n", cli_errstr(&cli1));
+               }
+               cli_unlink(&cli1, fname);
+    } else
+               printf("second delete on close test succeeded.\n");
 
-       if (!open_connection(&cli)) {
+
+       /* 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);
+
+       if (fnum1 == -1) {
+               printf("[3] open - 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
                return;
        }
 
-       printf("domain list:\n");
-       cli_NetServerEnum(&cli, workgroup, 
-                         SV_TYPE_DOMAIN_ENUM,
-                         browse_callback);
+       /* This should fail with a sharing violation - open for delete is only compatible
+          with SHARE_DELETE. */
 
-       printf("machine list:\n");
-       cli_NetServerEnum(&cli, workgroup, 
-                         SV_TYPE_ALL,
-                         browse_callback);
+       fnum2 = cli_nt_create_full(&cli1, fname, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
+                       FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0);
 
-       close_connection(&cli);
+       if (fnum2 != -1) {
+               printf("[3] open  - 2 of %s succeeded - should have failed.\n", fname);
+               return;
+       }
 
-       printf("browse test finished\n");
-}
+       /* This should succeed. */
 
+       fnum2 = cli_nt_create_full(&cli1, fname, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0);
 
-/*
-  This checks how the getatr calls works
-*/
-static void run_attrtest(void)
-{
-       static struct cli_state cli;
-       int fnum;
-       time_t t, t2;
-       char *fname = "\\attrib.tst";
+       if (fnum2 == -1) {
+               printf("[3] open  - 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return;
+       }
 
-       printf("staring attrib test\n");
+       if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
+        printf("[3] setting delete_on_close failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
 
-       if (!open_connection(&cli)) {
+    if (!cli_close(&cli1, fnum1)) {
+        printf("[3] close 1 failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
+
+    if (!cli_close(&cli1, fnum2)) {
+        printf("[3] close 2 failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
+
+       /* This should fail - file should no longer be there. */
+
+    fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
+    if (fnum1 != -1) {
+               printf("[3] open of %s succeeded should have been deleted on close !\n", fname);
+               if (!cli_close(&cli1, fnum1)) {
+                       printf("[3] close failed (%s)\n", cli_errstr(&cli1));
+               }
+               cli_unlink(&cli1, fname);
+    } else
+               printf("third delete on close test succeeded.\n");
+
+       /* Test 4 ... */
+       cli_setatr(&cli1, fname, 0, 0);
+       cli_unlink(&cli1, fname);
+
+       fnum1 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
+                       FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0);
+                                                               
+       if (fnum1 == -1) {
+               printf("[4] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
                return;
        }
 
-       cli_unlink(&cli, fname);
-       fnum = cli_open(&cli, fname, 
-                       O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
-       cli_close(&cli, fnum);
-       if (!cli_getatr(&cli, fname, NULL, NULL, &t)) {
-               printf("getatr failed (%s)\n", cli_errstr(&cli));
+       /* This should succeed. */
+       fnum2 = cli_nt_create_full(&cli1, fname, GENERIC_READ_ACCESS,
+                       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;
        }
 
-       if (abs(t - time(NULL)) > 2) {
-               printf("ERROR: SMBgetatr bug. time is %s",
-                      ctime(&t));
-               t = time(NULL);
+    if (!cli_close(&cli1, fnum2)) {
+        printf("[4] close - 1 failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
+
+       if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
+        printf("[4] setting delete_on_close failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
+
+       /* This should fail - no more opens once delete on close set. */
+       fnum2 = cli_nt_create_full(&cli1, fname, GENERIC_READ_ACCESS,
+                       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;
+    } 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;
+    }
+
+       /* Test 5 ... */
+       cli_setatr(&cli1, fname, 0, 0);
+       cli_unlink(&cli1, fname);
+
+    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;
        }
 
-       t2 = t-60*60*24; /* 1 day ago */
+       /* This should fail - only allowed on NT opens with DELETE access. */
 
-       if (!cli_setatr(&cli, fname, 0, t2)) {
-               printf("setatr failed (%s)\n", cli_errstr(&cli));
+       if (cli_nt_delete_on_close(&cli1, fnum1, True)) {
+        printf("[5] setting delete_on_close on OpenX file succeeded - should fail !\n");
+        return;
+    }
+
+    if (!cli_close(&cli1, fnum1)) {
+        printf("[5] close - 2 failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
+
+       printf("fifth delete on close test succeeded.\n");
+
+       /* Test 6 ... */
+       cli_setatr(&cli1, fname, 0, 0);
+       cli_unlink(&cli1, fname);
+
+       fnum1 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA,
+                       FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                       FILE_OVERWRITE_IF, 0);
+                                                               
+       if (fnum1 == -1) {
+               printf("[6] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return;
        }
 
-       if (!cli_getatr(&cli, fname, NULL, NULL, &t)) {
-               printf("getatr failed (%s)\n", cli_errstr(&cli));
+       /* 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;
+    }
+
+    if (!cli_close(&cli1, fnum1)) {
+        printf("[6] close - 2 failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
+
+       printf("sixth delete on close test succeeded.\n");
+
+       /* Test 7 ... */
+       cli_setatr(&cli1, fname, 0, 0);
+       cli_unlink(&cli1, fname);
+
+       fnum1 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
+                       FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF, 0);
+                                                               
+       if (fnum1 == -1) {
+               printf("[7] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return;
        }
 
-       if (t != t2) {
-               printf("ERROR: getatr/setatr bug. times are\n%s",
-                      ctime(&t));
-               printf("%s", ctime(&t2));
+       if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
+        printf("[7] setting delete_on_close on file failed !\n");
+        return;
+    }
+
+       if (!cli_nt_delete_on_close(&cli1, fnum1, False)) {
+        printf("[7] unsetting delete_on_close on file failed !\n");
+        return;
+    }
+
+    if (!cli_close(&cli1, fnum1)) {
+        printf("[7] close - 2 failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
+
+       /* 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;
        }
 
-       close_connection(&cli);
+    if (!cli_close(&cli1, fnum1)) {
+        printf("[7] close - 2 failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
 
-       printf("attrib test finished\n");
+       printf("seventh delete on close test succeeded.\n");
+
+       /* Test 7 ... */
+       cli_setatr(&cli1, fname, 0, 0);
+       cli_unlink(&cli1, fname);
+
+    if (!open_connection(&cli2)) {
+               printf("[8] failed to open second connection.\n");
+        return;
+    }
+
+       cli_sockopt(&cli1, sockops);
+
+       fnum1 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
+                       FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OVERWRITE_IF, 0);
+                                                               
+       if (fnum1 == -1) {
+               printf("[8] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return;
+       }
+
+       fnum2 = cli_nt_create_full(&cli2, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
+                       FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0);
+                                                               
+       if (fnum2 == -1) {
+               printf("[8] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return;
+       }
+
+       if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
+        printf("[8] setting delete_on_close on file failed !\n");
+        return;
+    }
+
+    if (!cli_close(&cli1, fnum1)) {
+        printf("[8] close - 1 failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
+
+    if (!cli_close(&cli2, fnum2)) {
+        printf("[8] close - 2 failed (%s)\n", cli_errstr(&cli2));
+        return;
+    }
+
+       /* 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);
+    } else
+               printf("eighth delete on close test succeeded.\n");
+
+    printf("finished delete test\n");
+
+       cli_setatr(&cli1, fname, 0, 0);
+       cli_unlink(&cli1, fname);
+
+    close_connection(&cli1);
+    close_connection(&cli2);
+}
+
+/*
+  Test open mode returns on read-only files.
+ */
+static void run_opentest(int dummy)
+{
+    static struct cli_state cli1;
+    char *fname = "\\readonly.file";
+    int fnum1, fnum2;
+       uint8 eclass;
+       uint32 errnum;
+
+    printf("starting open test\n");
+
+    if (!open_connection(&cli1)) {
+        return;
+    }
+
+       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;
+    }
+
+    if (!cli_close(&cli1, fnum1)) {
+        printf("close2 failed (%s)\n", cli_errstr(&cli1));
+        return;
+    }
+
+       if (!cli_setatr(&cli1, fname, aRONLY, 0)) {
+               printf("cli_setatr failed (%s)\n", cli_errstr(&cli1));
+               return;
+       }
+
+    fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_WRITE);
+    if (fnum1 == -1) {
+        printf("open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+        return;
+    }
+
+       /* This will fail - but the error should be ERRnoaccess, not ERRshare. */
+    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) );
+       } else {
+               printf("correct error code ERRDOS/ERRnoaccess returned\n");
+       }
+
+       
+       cli_close(&cli1, fnum1);
+
+       cli_setatr(&cli1, fname, 0, 0);
+       cli_unlink(&cli1, fname);
+
+    close_connection(&cli1);
+
+    printf("finished open test 1\n");
 }
 
+static void list_fn(file_info *finfo, const char *name, void *state)
+{
+       
+}
 
 /*
-  This checks a couple of trans2 calls
-*/
-static void run_trans2test(void)
+  test directory listing speed
+ */
+static void run_dirtest(int dummy)
 {
+       int i;
        static struct cli_state cli;
        int fnum;
-       uint32 size;
-       time_t c_time, a_time, m_time;
-       char *fname = "\\trans2.tst";
+       double t1;
 
-       printf("staring trans2 test\n");
+       printf("starting directory test\n");
 
        if (!open_connection(&cli)) {
                return;
        }
 
-       cli_unlink(&cli, fname);
-       fnum = cli_open(&cli, fname, 
-                       O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
-       if (!cli_qfileinfo(&cli, fnum, &c_time, &a_time, &m_time, &size)) {
-               printf("ERROR: qfileinfo failed (%s)\n", cli_errstr(&cli));
+       cli_sockopt(&cli, sockops);
+
+       srandom(0);
+       for (i=0;i<numops;i++) {
+               fstring fname;
+               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);
+                       return;
+               }
+               cli_close(&cli, fnum);
        }
-       cli_close(&cli, fnum);
 
-       sleep(2);
+       t1 = end_timer();
 
-       cli_unlink(&cli, fname);
-       fnum = cli_open(&cli, fname, 
-                       O_RDWR | O_CREAT | O_TRUNC, DENY_NONE);
-       cli_close(&cli, fnum);
+       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));
 
-       if (!cli_qpathinfo(&cli, fname, &c_time, &a_time, &m_time, &size)) {
-               printf("ERROR: qpathinfo failed (%s)\n", cli_errstr(&cli));
-       } else {
-               if (c_time != m_time) {
-                       printf("create time=%s", ctime(&c_time));
-                       printf("modify time=%s", ctime(&m_time));
-                       printf("This system appears to have sticky create times\n");
-               }
-               if (a_time % (60*60) == 0) {
-                       printf("access time=%s", ctime(&a_time));
-                       printf("This system appears to set a midnight access time\n");
-               }
+       printf("dirtest core %g seconds\n", end_timer() - t1);
 
-               if (abs(m_time - time(NULL)) > 60) {
-                       printf("ERROR: totally incorrect times - maybe word reversed?\n");
-               }
+       srandom(0);
+       for (i=0;i<numops;i++) {
+               fstring fname;
+               slprintf(fname, sizeof(fname), "%x", (int)random());
+               cli_unlink(&cli, fname);
        }
 
-       cli_unlink(&cli, fname);
-
        close_connection(&cli);
 
-       printf("trans2 test finished\n");
+       printf("finished dirtest\n");
 }
 
 
-static void create_procs(int nprocs, int numops)
+
+static double create_procs(void (*fn)(int))
 {
        int i, status;
+       volatile int *child_status;
+       int synccount;
+       int tries = 8;
+
+       start_timer();
+
+       synccount = 0;
+
+       child_status = (volatile int *)shm_setup(sizeof(int)*nprocs);
+       if (!child_status) {
+               printf("Failed to setup shared memory\n");
+               return end_timer();
+       }
+
+       memset((char *)child_status, 0, sizeof(int)*nprocs);
 
        for (i=0;i<nprocs;i++) {
+               procnum = i;
                if (fork() == 0) {
-                       int mypid = getpid();
-                       srandom(mypid ^ time(NULL));
-                       run_torture(numops);
+                       pid_t mypid = getpid();
+                       sys_srandom(((int)mypid) ^ ((int)time(NULL)));
+
+                       slprintf(myname,sizeof(myname),"CLIENT%d", i);
+
+                       while (1) {
+                               memset(&current_cli, 0, sizeof(current_cli));
+                               if (open_connection(&current_cli)) break;
+                               if (tries-- == 0) {
+                                       printf("pid %d failed to start\n", (int)getpid());
+                                       _exit(1);
+                               }
+                               msleep(10);
+                       }
+
+                       child_status[i] = getpid();
+
+                       while (child_status[i]) msleep(2);
+
+                       fn(i);
                        _exit(0);
                }
        }
 
-       for (i=0;i<nprocs;i++)
+       do {
+               synccount = 0;
+               for (i=0;i<nprocs;i++) {
+                       if (child_status[i]) synccount++;
+               }
+               if (synccount == nprocs) break;
+               msleep(10);
+       } while (end_timer() < 30);
+
+       if (synccount != nprocs) {
+               printf("FAILED TO START %d CLIENTS (started %d)\n", nprocs, synccount);
+               return end_timer();
+       }
+
+       /* start the client load */
+       start_timer();
+
+       for (i=0;i<nprocs;i++) {
+               child_status[i] = 0;
+       }
+
+       printf("%d clients started\n", nprocs);
+
+       for (i=0;i<nprocs;i++) {
                waitpid(0, &status, 0);
+               printf("*");
+       }
+       printf("\n");
+       return end_timer();
+}
+
+
+#define FLAG_MULTIPROC 1
+
+static struct {
+       char *name;
+       void (*fn)(int);
+       unsigned flags;
+} torture_ops[] = {
+       {"FDPASS", run_fdpasstest, 0},
+       {"LOCK1",  run_locktest1,  0},
+       {"LOCK2",  run_locktest2,  0},
+       {"LOCK3",  run_locktest3,  0},
+       {"LOCK4",  run_locktest4,  0},
+       {"LOCK5",  run_locktest5,  0},
+       {"UNLINK", run_unlinktest, 0},
+       {"BROWSE", run_browsetest, 0},
+       {"ATTR",   run_attrtest,   0},
+       {"TRANS2", run_trans2test, 0},
+       {"MAXFID", run_maxfidtest, FLAG_MULTIPROC},
+       {"TORTURE",run_torture,    FLAG_MULTIPROC},
+       {"RANDOMIPC", run_randomipc, 0},
+       {"NEGNOWAIT", run_negprot_nowait, 0},
+       {"NBW95",  run_nbw95, 0},
+       {"NBWNT",  run_nbwnt, 0},
+       {"OPLOCK1",  run_oplock1, 0},
+       {"OPLOCK2",  run_oplock2, 0},
+       {"DIR",  run_dirtest, 0},
+       {"DENY1",  run_denytest1, 0},
+       {"DENY2",  run_denytest2, 0},
+       {"TCON",  run_tcon_test, 0},
+       {"RW1",  run_readwritetest, 0},
+       {"RW2",  run_readwritemulti, FLAG_MULTIPROC},
+       {"OPEN", run_opentest, 0},
+       {"DELETE", run_deletetest, 0},
+       {NULL, NULL, 0}};
+
+
+
+/****************************************************************************
+run a specified test or "ALL"
+****************************************************************************/
+static void run_test(char *name)
+{
+       int i;
+       if (strequal(name,"ALL")) {
+               for (i=0;torture_ops[i].name;i++) {
+                       run_test(torture_ops[i].name);
+               }
+       }
+       
+       for (i=0;torture_ops[i].name;i++) {
+               fstrcpy(randomfname, "\\XXXXXXX");
+               mktemp(randomfname);
+
+               if (strequal(name, torture_ops[i].name)) {
+                       start_timer();
+                       printf("Running %s\n", name);
+                       if (torture_ops[i].flags & FLAG_MULTIPROC) {
+                               create_procs(torture_ops[i].fn);
+                       } else {
+                               torture_ops[i].fn(0);
+                       }
+                       printf("%s took %g secs\n\n", name, end_timer());
+               }
+       }
+}
+
+
+static void usage(void)
+{
+       int i;
+
+       printf("Usage: smbtorture //server/share <options> TEST1 TEST2 ...\n");
+
+       printf("\t-d debuglevel\n");
+       printf("\t-U user%%pass\n");
+       printf("\t-N numprocs\n");
+       printf("\t-n my_netbios_name\n");
+       printf("\t-W workgroup\n");
+       printf("\t-o num_operations\n");
+       printf("\t-O socket_options\n");
+       printf("\t-m maximum protocol\n");
+       printf("\t-L use oplocks\n");
+       printf("\n\n");
+
+       printf("tests are:");
+       for (i=0;torture_ops[i].name;i++) {
+               printf(" %s", torture_ops[i].name);
+       }
+       printf("\n");
+
+       printf("default test is ALL\n");
+       
+       exit(1);
 }
 
 
 
+
+
 /****************************************************************************
   main program
 ****************************************************************************/
  int main(int argc,char *argv[])
 {
-       int nprocs=1, numops=100;
-       int opt;
+       int opt, i;
        char *p;
        int gotpass = 0;
        extern char *optarg;
        extern int optind;
        extern FILE *dbf;
+       static pstring servicesf = CONFIGFILE;
 
        dbf = stdout;
 
+       setbuffer(stdout, NULL, 0);
+
        charset_initialise();
 
+       lp_load(servicesf,True,False,False);
+       load_interfaces();
+
        if (argc < 2) {
                usage();
        }
 
-       if (strncmp(argv[1], "\\\\", 2)) {
+        for(p = argv[1]; *p; p++)
+          if(*p == '\\')
+            *p = '/';
+       if (strncmp(argv[1], "//", 2)) {
                usage();
        }
 
        fstrcpy(host, &argv[1][2]);
-       p = strchr(&host[2],'\\');
+       p = strchr(&host[2],'/');
        if (!p) {
                usage();
        }
        *p = 0;
        fstrcpy(share, p+1);
 
-       get_myname(myname,NULL);
+       get_myname(myname);
 
        if (*username == 0 && getenv("LOGNAME")) {
-         strcpy(username,getenv("LOGNAME"));
+         pstrcpy(username,getenv("LOGNAME"));
        }
 
        argc--;
        argv++;
 
 
-       while ((opt = getopt(argc, argv, "hW:U:n:N:O:o:m:")) != EOF) {
+       fstrcpy(workgroup, lp_workgroup());
+
+       while ((opt = getopt(argc, argv, "hW:U:n:N:O:o:m:Ld:")) != EOF) {
                switch (opt) {
                case 'W':
                        fstrcpy(workgroup,optarg);
@@ -816,18 +2756,24 @@ static void create_procs(int nprocs, int numops)
                case 'o':
                        numops = atoi(optarg);
                        break;
+               case 'd':
+                       DEBUGLEVEL = atoi(optarg);
+                       break;
                case 'O':
                        sockops = optarg;
                        break;
+               case 'L':
+                       use_oplocks = True;
+                       break;
                case 'n':
                        fstrcpy(myname, optarg);
                        break;
                case 'U':
-                       strcpy(username,optarg);
+                       pstrcpy(username,optarg);
                        p = strchr(username,'%');
                        if (p) {
                                *p = 0;
-                               strcpy(password, p+1);
+                               pstrcpy(password, p+1);
                                gotpass = 1;
                        }
                        break;
@@ -841,7 +2787,7 @@ static void create_procs(int nprocs, int numops)
        while (!gotpass) {
                p = getpass("Password:");
                if (p) {
-                       strcpy(password, p);
+                       pstrcpy(password, p);
                        gotpass = 1;
                }
        }
@@ -849,19 +2795,13 @@ static void create_procs(int nprocs, int numops)
        printf("host=%s share=%s user=%s myname=%s\n", 
               host, share, username, myname);
 
-       start_timer();
-       create_procs(nprocs, numops);
-       printf("rw_torture: %g secs\n", end_timer());
-
-       run_locktest1();
-       run_locktest2();
-       run_locktest3(numops);
-       run_unlinktest();
-       run_browsetest();
-       run_attrtest();
-       run_trans2test();
+       if (argc == 1) {
+               run_test("ALL");
+       } else {
+               for (i=1;i<argc;i++) {
+                       run_test(argv[i]);
+               }
+       }
 
        return(0);
 }
-
-