- added a mangling test suite that measures the collision rate on
[sfrench/samba-autobuild/.git] / source3 / torture / torture.c
index 5300bfd2749e6c07f209b3c068b58ff10f1c1b6e..23624d07333a51aa78f8c9f234fde13b882e1110 100644 (file)
 static fstring host, workgroup, share, password, username, myname;
 static int max_protocol = PROTOCOL_NT1;
 static char *sockops="TCP_NODELAY";
-static int nprocs=1, numops=100;
+static int nprocs=1;
+int torture_numops=100;
 static int procnum; /* records process count number when forking */
 static struct cli_state current_cli;
 static fstring randomfname;
 static BOOL use_oplocks;
 static BOOL use_level_II_oplocks;
 static char *client_txt = "client_oplocks.txt";
+static BOOL use_kerberos;
 
 BOOL torture_showall = False;
 
@@ -107,6 +109,8 @@ static BOOL open_nbt_connection(struct cli_state *c)
                return False;
        }
 
+       c->use_kerberos = use_kerberos;
+
        c->timeout = 120000; /* set a really long timeout (2 minutes) */
        if (use_oplocks) c->use_oplocks = True;
        if (use_level_II_oplocks) c->use_level_II_oplocks = True;
@@ -184,7 +188,7 @@ static BOOL check_error(int line, struct cli_state *c,
                         printf("unexpected error code class=%d code=%d\n", 
                                (int)class, (int)num);
                         printf(" expected %d/%d %s (line=%d)\n", 
-                               (int)eclass, (int)ecode, get_nt_error_msg(nterr), line);
+                               (int)eclass, (int)ecode, nt_errstr(nterr), line);
                         return False;
                 }
 
@@ -196,8 +200,8 @@ static BOOL check_error(int line, struct cli_state *c,
                 status = cli_nt_error(c);
 
                 if (NT_STATUS_V(nterr) != NT_STATUS_V(status)) {
-                        printf("unexpected error code %s\n", get_nt_error_msg(status));
-                        printf(" expected %s (line=%d)\n", get_nt_error_msg(nterr), line);
+                        printf("unexpected error code %s\n", nt_errstr(status));
+                        printf(" expected %s (line=%d)\n", nt_errstr(nterr), line);
                         return False;
                 }
         }
@@ -236,7 +240,7 @@ static BOOL rw_torture(struct cli_state *c)
        }
 
 
-       for (i=0;i<numops;i++) {
+       for (i=0;i<torture_numops;i++) {
                unsigned n = (unsigned)sys_random()%10;
                if (i % 10 == 0) {
                        printf("%d\r", i); fflush(stdout);
@@ -453,7 +457,7 @@ static BOOL rw_torture2(struct cli_state *c1, struct cli_state *c2)
                return False;
        }
 
-       for (i=0;i<numops;i++)
+       for (i=0;i<torture_numops;i++)
        {
                size_t buf_size = ((unsigned)sys_random()%(sizeof(buf)-1))+ 1;
                if (i % 10 == 0) {
@@ -552,7 +556,7 @@ static BOOL run_readwritelarge(int dummy)
        int fnum1;
        char *lockfname = "\\large.dat";
        size_t fsize;
-       char buf[0x10000];
+       char buf[126*1024];
        BOOL correct = True;
  
        if (!torture_open_connection(&cli1)) {
@@ -561,7 +565,7 @@ static BOOL run_readwritelarge(int dummy)
        cli_sockopt(&cli1, sockops);
        memset(buf,'\0',sizeof(buf));
        
-       cli1.max_xmit = 0x11000;
+       cli1.max_xmit = 128*1024;
        
        printf("starting readwritelarge\n");
  
@@ -575,13 +579,8 @@ static BOOL run_readwritelarge(int dummy)
    
        cli_write(&cli1, fnum1, 0, buf, 0, sizeof(buf));
 
-       if (!cli_close(&cli1, fnum1)) {
-               printf("close failed (%s)\n", cli_errstr(&cli1));
-               correct = False;
-       }
-
-       if (!cli_qpathinfo(&cli1, lockfname, NULL, NULL, NULL, &fsize, NULL)) {
-               printf("qpathinfo failed (%s)\n", cli_errstr(&cli1));
+       if (!cli_qfileinfo(&cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+               printf("qfileinfo failed (%s)\n", cli_errstr(&cli1));
                correct = False;
        }
 
@@ -592,6 +591,11 @@ static BOOL run_readwritelarge(int dummy)
                correct = False;
        }
 
+       if (!cli_close(&cli1, fnum1)) {
+               printf("close failed (%s)\n", cli_errstr(&cli1));
+               correct = False;
+       }
+
        if (!cli_unlink(&cli1, lockfname)) {
                printf("unlink failed (%s)\n", cli_errstr(&cli1));
                correct = False;
@@ -603,8 +607,36 @@ static BOOL run_readwritelarge(int dummy)
                return False;
        }
        
+       cli1.max_xmit = 4*1024;
+       
        cli_smbwrite(&cli1, fnum1, buf, 0, sizeof(buf));
        
+       if (!cli_qfileinfo(&cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+               printf("qfileinfo failed (%s)\n", cli_errstr(&cli1));
+               correct = False;
+       }
+
+       if (fsize == sizeof(buf))
+               printf("readwritelarge test 2 succeeded (size = %x)\n", fsize);
+       else {
+               printf("readwritelarge test 2 failed (size = %x)\n", fsize);
+               correct = False;
+       }
+
+#if 0
+       /* ToDo - set allocation. JRA */
+       if(!cli_set_allocation_size(&cli1, fnum1, 0)) {
+               printf("set allocation size to zero failed (%s)\n", cli_errstr(&cli1));
+               return False;
+       }
+       if (!cli_qfileinfo(&cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+               printf("qfileinfo failed (%s)\n", cli_errstr(&cli1));
+               correct = False;
+       }
+       if (fsize != 0)
+               printf("readwritelarge test 3 (truncate test) succeeded (size = %x)\n", fsize);
+#endif
+
        if (!cli_close(&cli1, fnum1)) {
                printf("close failed (%s)\n", cli_errstr(&cli1));
                correct = False;
@@ -802,7 +834,7 @@ static BOOL run_locktest1(int dummy)
                return False;
        } else {
                if (!check_error(__LINE__, &cli2, ERRDOS, ERRlock, 
-                                NT_STATUS_LOCK_NOT_GRANTED)) return False;
+                                NT_STATUS_FILE_LOCK_CONFLICT)) return False;
        }
        t2 = time(NULL);
 
@@ -820,7 +852,7 @@ static BOOL run_locktest1(int dummy)
                return False;
        } else {
                if (!check_error(__LINE__, &cli2, ERRDOS, ERRlock, 
-                                NT_STATUS_LOCK_NOT_GRANTED)) return False;
+                                NT_STATUS_FILE_LOCK_CONFLICT)) return False;
        }
 
        if (!cli_close(&cli1, fnum1)) {
@@ -1004,7 +1036,7 @@ static BOOL run_locktest2(int dummy)
                correct = False;
        } else {
                if (!check_error(__LINE__, &cli, ERRDOS, ERRlock, 
-                                NT_STATUS_LOCK_NOT_GRANTED)) return False;
+                                NT_STATUS_FILE_LOCK_CONFLICT)) return False;
        }
 
        if (!cli_lock(&cli, fnum1, 100, 4, 0, WRITE_LOCK)) {
@@ -1022,7 +1054,7 @@ static BOOL run_locktest2(int dummy)
        } else {
                if (!check_error(__LINE__, &cli, 
                                 ERRDOS, ERRlock, 
-                                NT_STATUS_LOCK_NOT_GRANTED)) return False;
+                                NT_STATUS_RANGE_NOT_LOCKED)) return False;
        }
 
        if (cli_unlock(&cli, fnum1, 0, 8)) {
@@ -1031,7 +1063,7 @@ static BOOL run_locktest2(int dummy)
        } else {
                if (!check_error(__LINE__, &cli, 
                                 ERRDOS, ERRlock, 
-                                NT_STATUS_LOCK_NOT_GRANTED)) return False;
+                                NT_STATUS_RANGE_NOT_LOCKED)) return False;
        }
 
        if (cli_lock(&cli, fnum3, 0, 4, 0, WRITE_LOCK)) {
@@ -1081,7 +1113,7 @@ static BOOL run_locktest3(int dummy)
        uint32 offset;
        BOOL correct = True;
 
-#define NEXT_OFFSET offset += (~(uint32)0) / numops
+#define NEXT_OFFSET offset += (~(uint32)0) / torture_numops
 
        if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
                return False;
@@ -1104,7 +1136,7 @@ static BOOL run_locktest3(int dummy)
                return False;
        }
 
-       for (offset=i=0;i<numops;i++) {
+       for (offset=i=0;i<torture_numops;i++) {
                NEXT_OFFSET;
                if (!cli_lock(&cli1, fnum1, offset-1, 1, 0, WRITE_LOCK)) {
                        printf("lock1 %d failed (%s)\n", 
@@ -1121,7 +1153,7 @@ static BOOL run_locktest3(int dummy)
                }
        }
 
-       for (offset=i=0;i<numops;i++) {
+       for (offset=i=0;i<torture_numops;i++) {
                NEXT_OFFSET;
 
                if (cli_lock(&cli1, fnum1, offset-2, 1, 0, WRITE_LOCK)) {
@@ -1145,7 +1177,7 @@ static BOOL run_locktest3(int dummy)
                }
        }
 
-       for (offset=i=0;i<numops;i++) {
+       for (offset=i=0;i<torture_numops;i++) {
                NEXT_OFFSET;
 
                if (!cli_unlock(&cli1, fnum1, offset-1, 1)) {
@@ -1351,9 +1383,10 @@ static BOOL run_locktest4(int dummy)
              ((fnum1 = cli_open(&cli1, fname, O_RDWR, DENY_NONE)) != -1) &&
              cli_lock(&cli1, fnum1, 7, 1, 0, WRITE_LOCK);
         cli_close(&cli1, f);
+       cli_close(&cli1, fnum1);
        EXPECTED(ret, True);
        printf("the server %s have the NT byte range lock bug\n", !ret?"does":"doesn't");
-       
+
  fail:
        cli_close(&cli1, fnum1);
        cli_close(&cli2, fnum2);
@@ -1489,6 +1522,49 @@ static BOOL run_locktest5(int dummy)
        return correct;
 }
 
+/*
+  tries the unusual lockingX locktype bits
+*/
+static BOOL run_locktest6(int dummy)
+{
+       static struct cli_state cli;
+       char *fname[1] = { "\\lock6.txt" };
+       int i;
+       int fnum;
+       NTSTATUS status;
+
+       if (!torture_open_connection(&cli)) {
+               return False;
+       }
+
+       cli_sockopt(&cli, sockops);
+
+       printf("starting locktest6\n");
+
+       for (i=0;i<1;i++) {
+               printf("Testing %s\n", fname[i]);
+
+               cli_unlink(&cli, fname[i]);
+
+               fnum = cli_open(&cli, fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE);
+               status = cli_locktype(&cli, fnum, 0, 8, 0, LOCKING_ANDX_CHANGE_LOCKTYPE);
+               cli_close(&cli, fnum);
+               printf("CHANGE_LOCKTYPE gave %s\n", nt_errstr(status));
+
+               fnum = cli_open(&cli, fname[i], O_RDWR, DENY_NONE);
+               status = cli_locktype(&cli, fnum, 0, 8, 0, LOCKING_ANDX_CANCEL_LOCK);
+               cli_close(&cli, fnum);
+               printf("CANCEL_LOCK gave %s\n", nt_errstr(status));
+
+               cli_unlink(&cli, fname[i]);
+       }
+
+       torture_close_connection(&cli);
+
+       printf("finished locktest6\n");
+       return True;
+}
+
 /*
 test whether fnums and tids open on one VC are available on another (a major
 security hole)
@@ -2285,11 +2361,15 @@ static BOOL run_deletetest(int dummy)
        static struct cli_state cli1;
        static struct cli_state cli2;
        char *fname = "\\delete.file";
-       int fnum1, fnum2;
+       int fnum1 = -1;
+       int fnum2 = -1;
        BOOL correct = True;
        
        printf("starting delete test\n");
        
+       ZERO_STRUCT(cli1);
+       ZERO_STRUCT(cli2);
+
        if (!torture_open_connection(&cli1)) {
                return False;
        }
@@ -2307,23 +2387,27 @@ static BOOL run_deletetest(int dummy)
        
        if (fnum1 == -1) {
                printf("[1] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        if (!cli_close(&cli1, fnum1)) {
                printf("[1] close failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
 
        fnum1 = cli_open(&cli1, fname, O_RDWR, DENY_NONE);
        if (fnum1 == -1) {
                printf("[1] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        if (!cli_close(&cli1, fnum1)) {
                printf("[1] close failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        printf("first delete on close test succeeded.\n");
@@ -2339,17 +2423,20 @@ static BOOL run_deletetest(int dummy)
        
        if (fnum1 == -1) {
                printf("[2] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
                printf("[2] setting delete_on_close failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        if (!cli_close(&cli1, fnum1)) {
                printf("[2] close failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
@@ -2358,6 +2445,7 @@ static BOOL run_deletetest(int dummy)
                if (!cli_close(&cli1, fnum1)) {
                        printf("[2] close failed (%s)\n", cli_errstr(&cli1));
                        correct = False;
+                       goto fail;
                }
                cli_unlink(&cli1, fname);
        } else
@@ -2372,7 +2460,8 @@ static BOOL run_deletetest(int dummy)
 
        if (fnum1 == -1) {
                printf("[3] open - 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
 
        /* This should fail with a sharing violation - open for delete is only compatible
@@ -2383,7 +2472,8 @@ static BOOL run_deletetest(int dummy)
 
        if (fnum2 != -1) {
                printf("[3] open  - 2 of %s succeeded - should have failed.\n", fname);
-               return False;
+               correct = False;
+               goto fail;
        }
 
        /* This should succeed. */
@@ -2393,22 +2483,26 @@ static BOOL run_deletetest(int dummy)
 
        if (fnum2 == -1) {
                printf("[3] open  - 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
 
        if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
                printf("[3] setting delete_on_close failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        if (!cli_close(&cli1, fnum1)) {
                printf("[3] close 1 failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        if (!cli_close(&cli1, fnum2)) {
                printf("[3] close 2 failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        /* This should fail - file should no longer be there. */
@@ -2421,6 +2515,7 @@ static BOOL run_deletetest(int dummy)
                }
                cli_unlink(&cli1, fname);
                correct = False;
+               goto fail;
        } else
                printf("third delete on close test succeeded.\n");
 
@@ -2433,7 +2528,8 @@ static BOOL run_deletetest(int dummy)
                                                                
        if (fnum1 == -1) {
                printf("[4] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
 
        /* This should succeed. */
@@ -2441,17 +2537,20 @@ static BOOL run_deletetest(int dummy)
                        FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0);
        if (fnum2 == -1) {
                printf("[4] open  - 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        if (!cli_close(&cli1, fnum2)) {
                printf("[4] close - 1 failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
                printf("[4] setting delete_on_close failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        /* This should fail - no more opens once delete on close set. */
@@ -2459,13 +2558,15 @@ static BOOL run_deletetest(int dummy)
                                   FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0);
        if (fnum2 != -1) {
                printf("[4] open  - 3 of %s succeeded ! Should have failed.\n", fname );
-               return False;
+               correct = False;
+               goto fail;
        } else
                printf("fourth delete on close test succeeded.\n");
        
        if (!cli_close(&cli1, fnum1)) {
                printf("[4] close - 2 failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        /* Test 5 ... */
@@ -2475,19 +2576,22 @@ static BOOL run_deletetest(int dummy)
        fnum1 = cli_open(&cli1, fname, O_RDWR|O_CREAT, DENY_NONE);
        if (fnum1 == -1) {
                printf("[5] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
 
        /* This should fail - only allowed on NT opens with DELETE access. */
 
        if (cli_nt_delete_on_close(&cli1, fnum1, True)) {
                printf("[5] setting delete_on_close on OpenX file succeeded - should fail !\n");
-               return False;
+               correct = False;
+               goto fail;
        }
 
        if (!cli_close(&cli1, fnum1)) {
                printf("[5] close - 2 failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        printf("fifth delete on close test succeeded.\n");
@@ -2502,19 +2606,22 @@ static BOOL run_deletetest(int dummy)
        
        if (fnum1 == -1) {
                printf("[6] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        /* This should fail - only allowed on NT opens with DELETE access. */
        
        if (cli_nt_delete_on_close(&cli1, fnum1, True)) {
                printf("[6] setting delete_on_close on file with no delete access succeeded - should fail !\n");
-               return False;
+               correct = False;
+               goto fail;
        }
 
        if (!cli_close(&cli1, fnum1)) {
                printf("[6] close - 2 failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
 
        printf("sixth delete on close test succeeded.\n");
@@ -2528,22 +2635,26 @@ static BOOL run_deletetest(int dummy)
                                                                
        if (fnum1 == -1) {
                printf("[7] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
 
        if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
                printf("[7] setting delete_on_close on file failed !\n");
-               return False;
+               correct = False;
+               goto fail;
        }
        
        if (!cli_nt_delete_on_close(&cli1, fnum1, False)) {
                printf("[7] unsetting delete_on_close on file failed !\n");
-               return False;
+               correct = False;
+               goto fail;
        }
 
        if (!cli_close(&cli1, fnum1)) {
                printf("[7] close - 2 failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
        
        /* This next open should succeed - we reset the flag. */
@@ -2551,12 +2662,14 @@ static BOOL run_deletetest(int dummy)
        fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
        if (fnum1 == -1) {
                printf("[5] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
 
        if (!cli_close(&cli1, fnum1)) {
                printf("[7] close - 2 failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
 
        printf("seventh delete on close test succeeded.\n");
@@ -2567,7 +2680,8 @@ static BOOL run_deletetest(int dummy)
        
        if (!torture_open_connection(&cli2)) {
                printf("[8] failed to open second connection.\n");
-               return False;
+               correct = False;
+               goto fail;
        }
 
        cli_sockopt(&cli1, sockops);
@@ -2577,7 +2691,8 @@ static BOOL run_deletetest(int dummy)
        
        if (fnum1 == -1) {
                printf("[8] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
 
        fnum2 = cli_nt_create_full(&cli2, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
@@ -2585,38 +2700,78 @@ static BOOL run_deletetest(int dummy)
        
        if (fnum2 == -1) {
                printf("[8] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
 
        if (!cli_nt_delete_on_close(&cli1, fnum1, True)) {
                printf("[8] setting delete_on_close on file failed !\n");
-               return False;
+               correct = False;
+               goto fail;
        }
        
        if (!cli_close(&cli1, fnum1)) {
                printf("[8] close - 1 failed (%s)\n", cli_errstr(&cli1));
-               return False;
+               correct = False;
+               goto fail;
        }
 
        if (!cli_close(&cli2, fnum2)) {
                printf("[8] close - 2 failed (%s)\n", cli_errstr(&cli2));
-               return False;
+               correct = False;
+               goto fail;
        }
 
        /* This should fail.. */
        fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
        if (fnum1 != -1) {
                printf("[8] open of %s succeeded should have been deleted on close !\n", fname);
-               if (!cli_close(&cli1, fnum1)) {
-                       printf("[8] close failed (%s)\n", cli_errstr(&cli1));
-               }
-               cli_unlink(&cli1, fname);
+               goto fail;
                correct = False;
        } else
                printf("eighth delete on close test succeeded.\n");
 
+       /* This should fail - we need to set DELETE_ACCESS. */
+       fnum1 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA,
+                                  FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, FILE_DELETE_ON_CLOSE);
+       
+       if (fnum1 != -1) {
+               printf("[9] open of %s succeeded should have failed!\n", fname);
+               correct = False;
+               goto fail;
+       }
+
+       printf("ninth delete on close test succeeded.\n");
+
+       fnum1 = cli_nt_create_full(&cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
+                                  FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, FILE_DELETE_ON_CLOSE);
+       if (fnum1 == -1) {
+               printf("[10] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               correct = False;
+               goto fail;
+       }
+
+       /* This should delete the file. */
+       if (!cli_close(&cli1, fnum1)) {
+               printf("[10] close failed (%s)\n", cli_errstr(&cli1));
+               correct = False;
+               goto fail;
+       }
+
+       /* This should fail.. */
+       fnum1 = cli_open(&cli1, fname, O_RDONLY, DENY_NONE);
+       if (fnum1 != -1) {
+               printf("[10] open of %s succeeded should have been deleted on close !\n", fname);
+               goto fail;
+               correct = False;
+       } else
+               printf("tenth delete on close test succeeded.\n");
        printf("finished delete test\n");
+
+  fail:
        
+       cli_close(&cli1, fnum1);
+       cli_close(&cli1, fnum2);
        cli_setatr(&cli1, fname, 0, 0);
        cli_unlink(&cli1, fname);
        
@@ -2630,6 +2785,54 @@ static BOOL run_deletetest(int dummy)
 }
 
 
+/*
+  print out server properties
+ */
+static BOOL run_properties(int dummy)
+{
+       static struct cli_state cli;
+       BOOL correct = True;
+       
+       printf("starting properties test\n");
+       
+       ZERO_STRUCT(cli);
+
+       if (!torture_open_connection(&cli)) {
+               return False;
+       }
+       
+       cli_sockopt(&cli, sockops);
+
+       d_printf("Capabilities 0x%08x\n", cli.capabilities);
+
+       if (!torture_close_connection(&cli)) {
+               correct = False;
+       }
+
+       return correct;
+}
+
+
+
+/* FIRST_DESIRED_ACCESS   0xf019f */
+#define FIRST_DESIRED_ACCESS   FILE_READ_DATA|FILE_WRITE_DATA|FILE_APPEND_DATA|\
+                               FILE_READ_EA|                           /* 0xf */ \
+                               FILE_WRITE_EA|FILE_READ_ATTRIBUTES|     /* 0x90 */ \
+                               FILE_WRITE_ATTRIBUTES|                  /* 0x100 */ \
+                               DELETE_ACCESS|READ_CONTROL_ACCESS|\
+                               WRITE_DAC_ACCESS|WRITE_OWNER_ACCESS     /* 0xf0000 */
+/* SECOND_DESIRED_ACCESS  0xe0080 */
+#define SECOND_DESIRED_ACCESS  FILE_READ_ATTRIBUTES|                   /* 0x80 */ \
+                               READ_CONTROL_ACCESS|WRITE_DAC_ACCESS|\
+                               WRITE_OWNER_ACCESS                      /* 0xe0000 */
+
+#if 0
+#define THIRD_DESIRED_ACCESS   FILE_READ_ATTRIBUTES|                   /* 0x80 */ \
+                               READ_CONTROL_ACCESS|WRITE_DAC_ACCESS|\
+                               FILE_READ_DATA|\
+                               WRITE_OWNER_ACCESS                      /* */
+#endif
+
 /*
   Test ntcreate calls made by xcopy
  */
@@ -2647,8 +2850,8 @@ static BOOL run_xcopy(int dummy)
        }
        
        fnum1 = cli_nt_create_full(&cli1, fname, 
-                                  0xf019f, 0x20,
-                                  0, 5
+                                  FIRST_DESIRED_ACCESS, FILE_ATTRIBUTE_ARCHIVE,
+                                  FILE_SHARE_NONE, FILE_OVERWRITE_IF
                                   0x4044);
 
        if (fnum1 == -1) {
@@ -2657,8 +2860,8 @@ static BOOL run_xcopy(int dummy)
        }
 
        fnum2 = cli_nt_create_full(&cli1, fname, 
-                                  0xe0080, 0,
-                                  0x7, 1
+                                  SECOND_DESIRED_ACCESS, 0,
+                                  FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN
                                   0x200000);
        if (fnum2 == -1) {
                printf("second open failed - %s\n", cli_errstr(&cli1));
@@ -2672,6 +2875,128 @@ static BOOL run_xcopy(int dummy)
        return correct;
 }
 
+/*
+  Test rename on files open with share delete and no share delete.
+ */
+static BOOL run_rename(int dummy)
+{
+       static struct cli_state cli1;
+       char *fname = "\\test.txt";
+       char *fname1 = "\\test1.txt";
+       BOOL correct = True;
+       int fnum1;
+
+       printf("starting rename test\n");
+       
+       if (!torture_open_connection(&cli1)) {
+               return False;
+       }
+       
+       cli_unlink(&cli1, fname);
+       cli_unlink(&cli1, fname1);
+       fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_READ, FILE_OVERWRITE_IF, 0);
+
+       if (fnum1 == -1) {
+               printf("First open failed - %s\n", cli_errstr(&cli1));
+               return False;
+       }
+
+       if (!cli_rename(&cli1, fname, fname1)) {
+               printf("First rename failed (this is correct) - %s\n", cli_errstr(&cli1));
+       } else {
+               printf("First rename succeeded - this should have failed !\n");
+               correct = False;
+       }
+
+       if (!cli_close(&cli1, fnum1)) {
+               printf("close - 1 failed (%s)\n", cli_errstr(&cli1));
+               return False;
+       }
+
+       cli_unlink(&cli1, fname);
+       cli_unlink(&cli1, fname1);
+       fnum1 = cli_nt_create_full(&cli1, fname,GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
+#if 0
+                                  FILE_SHARE_DELETE|FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+#else
+                                  FILE_SHARE_DELETE|FILE_SHARE_READ, FILE_OVERWRITE_IF, 0);
+#endif
+
+       if (fnum1 == -1) {
+               printf("Second open failed - %s\n", cli_errstr(&cli1));
+               return False;
+       }
+
+       if (!cli_rename(&cli1, fname, fname1)) {
+               printf("Second rename failed - this should have succeeded - %s\n", cli_errstr(&cli1));
+               correct = False;
+       } else {
+               printf("Second rename succeeded\n");
+       }
+
+       if (!cli_close(&cli1, fnum1)) {
+               printf("close - 2 failed (%s)\n", cli_errstr(&cli1));
+               return False;
+       }
+
+       cli_unlink(&cli1, fname);
+       cli_unlink(&cli1, fname1);
+
+       fnum1 = cli_nt_create_full(&cli1, fname,READ_CONTROL_ACCESS, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+       if (fnum1 == -1) {
+               printf("Third open failed - %s\n", cli_errstr(&cli1));
+               return False;
+       }
+
+
+#if 0
+  {
+  int fnum2;
+
+       fnum2 = cli_nt_create_full(&cli1, fname,DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+       if (fnum2 == -1) {
+               printf("Fourth open failed - %s\n", cli_errstr(&cli1));
+               return False;
+       }
+       if (!cli_nt_delete_on_close(&cli1, fnum2, True)) {
+               printf("[8] setting delete_on_close on file failed !\n");
+               return False;
+       }
+       
+       if (!cli_close(&cli1, fnum2)) {
+               printf("close - 4 failed (%s)\n", cli_errstr(&cli1));
+               return False;
+       }
+  }
+#endif
+
+       if (!cli_rename(&cli1, fname, fname1)) {
+               printf("Third rename failed - this should have succeeded - %s\n", cli_errstr(&cli1));
+               correct = False;
+       } else {
+               printf("Third rename succeeded\n");
+       }
+
+       if (!cli_close(&cli1, fnum1)) {
+               printf("close - 3 failed (%s)\n", cli_errstr(&cli1));
+               return False;
+       }
+
+       cli_unlink(&cli1, fname);
+       cli_unlink(&cli1, fname1);
+
+       if (!torture_close_connection(&cli1)) {
+               correct = False;
+       }
+       
+       return correct;
+}
+
 
 /*
   Test open mode returns on read-only files.
@@ -2679,6 +3004,7 @@ static BOOL run_xcopy(int dummy)
 static BOOL run_opentest(int dummy)
 {
        static struct cli_state cli1;
+       static struct cli_state cli2;
        char *fname = "\\readonly.file";
        int fnum1, fnum2;
        char buf[20];
@@ -2833,9 +3159,238 @@ static BOOL run_opentest(int dummy)
                printf("unlink of temp failed (%s)\n", cli_errstr(&cli1));
        }
        
+       /* Test the non-io opens... */
+
+       if (!torture_open_connection(&cli2)) {
+               return False;
+       }
+       
+       cli_setatr(&cli2, fname, 0, 0);
+       cli_unlink(&cli2, fname);
+       
+       cli_sockopt(&cli2, sockops);
+
+       printf("TEST #1 testing 2 non-io opens (no delete)\n");
+       
+       fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+       if (fnum1 == -1) {
+               printf("test 1 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+
+       fnum2 = cli_nt_create_full(&cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_NONE, FILE_OPEN_IF, 0);
+
+       if (fnum2 == -1) {
+               printf("test 1 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+               return False;
+       }
+
+       if (!cli_close(&cli1, fnum1)) {
+               printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+       if (!cli_close(&cli2, fnum2)) {
+               printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+               return False;
+       }
+
+       printf("non-io open test #1 passed.\n");
+
+       cli_unlink(&cli1, fname);
+
+       printf("TEST #2 testing 2 non-io opens (first with delete)\n");
+       
+       fnum1 = cli_nt_create_full(&cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+       if (fnum1 == -1) {
+               printf("test 2 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+
+       fnum2 = cli_nt_create_full(&cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_NONE, FILE_OPEN_IF, 0);
+
+       if (fnum2 == -1) {
+               printf("test 2 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+               return False;
+       }
+
+       if (!cli_close(&cli1, fnum1)) {
+               printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+       if (!cli_close(&cli2, fnum2)) {
+               printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+
+       printf("non-io open test #2 passed.\n");
+
+       cli_unlink(&cli1, fname);
+
+       printf("TEST #3 testing 2 non-io opens (second with delete)\n");
+       
+       fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+       if (fnum1 == -1) {
+               printf("test 3 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+
+       fnum2 = cli_nt_create_full(&cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_NONE, FILE_OPEN_IF, 0);
+
+       if (fnum2 == -1) {
+               printf("test 3 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+               return False;
+       }
+
+       if (!cli_close(&cli1, fnum1)) {
+               printf("test 3 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+       if (!cli_close(&cli2, fnum2)) {
+               printf("test 3 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+               return False;
+       }
+
+       printf("non-io open test #3 passed.\n");
+
+       cli_unlink(&cli1, fname);
+
+       printf("TEST #4 testing 2 non-io opens (both with delete)\n");
+       
+       fnum1 = cli_nt_create_full(&cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+       if (fnum1 == -1) {
+               printf("test 4 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+
+       fnum2 = cli_nt_create_full(&cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_NONE, FILE_OPEN_IF, 0);
+
+       if (fnum2 != -1) {
+               printf("test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(&cli2));
+               return False;
+       }
+
+       printf("test 3 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(&cli2), "sharing violation");
+
+       if (!cli_close(&cli1, fnum1)) {
+               printf("test 4 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+
+       printf("non-io open test #4 passed.\n");
+
+       cli_unlink(&cli1, fname);
+
+       printf("TEST #5 testing 2 non-io opens (both with delete - both with file share delete)\n");
+       
+       fnum1 = cli_nt_create_full(&cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_DELETE, FILE_OVERWRITE_IF, 0);
+
+       if (fnum1 == -1) {
+               printf("test 5 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+
+       fnum2 = cli_nt_create_full(&cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_DELETE, FILE_OPEN_IF, 0);
+
+       if (fnum2 == -1) {
+               printf("test 5 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+               return False;
+       }
+
+       if (!cli_close(&cli1, fnum1)) {
+               printf("test 5 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+
+       if (!cli_close(&cli2, fnum2)) {
+               printf("test 5 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+               return False;
+       }
+
+       printf("non-io open test #5 passed.\n");
+
+       printf("TEST #6 testing 1 non-io open, one io open\n");
+       
+       cli_unlink(&cli1, fname);
+
+       fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+       if (fnum1 == -1) {
+               printf("test 6 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+
+       fnum2 = cli_nt_create_full(&cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_READ, FILE_OPEN_IF, 0);
+
+       if (fnum2 == -1) {
+               printf("test 6 open 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+               return False;
+       }
+
+       if (!cli_close(&cli1, fnum1)) {
+               printf("test 6 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+
+       if (!cli_close(&cli2, fnum2)) {
+               printf("test 6 close 2 of %s failed (%s)\n", fname, cli_errstr(&cli2));
+               return False;
+       }
+
+       printf("non-io open test #6 passed.\n");
+
+       printf("TEST #7 testing 1 non-io open, one io open with delete\n");
+
+       cli_unlink(&cli1, fname);
+
+       fnum1 = cli_nt_create_full(&cli1, fname,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0);
+
+       if (fnum1 == -1) {
+               printf("test 7 open 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+
+       fnum2 = cli_nt_create_full(&cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
+                                  FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_OPEN_IF, 0);
+
+       if (fnum2 != -1) {
+               printf("test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(&cli2));
+               return False;
+       }
+
+       printf("test 7 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(&cli2), "sharing violation");
+
+       if (!cli_close(&cli1, fnum1)) {
+               printf("test 7 close 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));
+               return False;
+       }
+
+       printf("non-io open test #7 passed.\n");
+
+       cli_unlink(&cli1, fname);
+
        if (!torture_close_connection(&cli1)) {
                correct = False;
        }
+       if (!torture_close_connection(&cli2)) {
+               correct = False;
+       }
        
        return correct;
 }
@@ -2865,7 +3420,7 @@ static BOOL run_dirtest(int dummy)
        cli_sockopt(&cli, sockops);
 
        srandom(0);
-       for (i=0;i<numops;i++) {
+       for (i=0;i<torture_numops;i++) {
                fstring fname;
                slprintf(fname, sizeof(fname), "\\%x", (int)random());
                fnum = cli_open(&cli, fname, O_RDWR|O_CREAT, DENY_NONE);
@@ -2885,7 +3440,7 @@ static BOOL run_dirtest(int dummy)
        printf("dirtest core %g seconds\n", end_timer() - t1);
 
        srandom(0);
-       for (i=0;i<numops;i++) {
+       for (i=0;i<torture_numops;i++) {
                fstring fname;
                slprintf(fname, sizeof(fname), "\\%x", (int)random());
                cli_unlink(&cli, fname);
@@ -3056,7 +3611,7 @@ static double create_procs(BOOL (*fn)(int), BOOL *result)
 
                        child_status[i] = getpid();
 
-                       while (child_status[i]) msleep(2);
+                       while (child_status[i] && end_timer() < 5) msleep(2);
 
                        child_status_out[i] = fn(i);
                        _exit(0);
@@ -3088,7 +3643,7 @@ static double create_procs(BOOL (*fn)(int), BOOL *result)
        printf("%d clients started\n", nprocs);
 
        for (i=0;i<nprocs;i++) {
-               waitpid(0, &status, 0);
+               while (waitpid(0, &status, 0) == -1 && errno == EINTR) /* noop */ ;
        }
 
        printf("\n");
@@ -3114,6 +3669,7 @@ static struct {
        {"LOCK3",  run_locktest3,  0},
        {"LOCK4",  run_locktest4,  0},
        {"LOCK5",  run_locktest5,  0},
+       {"LOCK6",  run_locktest6,  0},
        {"UNLINK", run_unlinktest, 0},
        {"BROWSE", run_browsetest, 0},
        {"ATTR",   run_attrtest,   0},
@@ -3135,7 +3691,10 @@ static struct {
        {"RW3",  run_readwritelarge, 0},
        {"OPEN", run_opentest, 0},
        {"XCOPY", run_xcopy, 0},
+       {"RENAME", run_rename, 0},
        {"DELETE", run_deletetest, 0},
+       {"PROPERTIES", run_properties, 0},
+       {"MANGLE", torture_mangle, 0},
        {"W2K", run_w2ktest, 0},
        {"TRANS2SCAN", torture_trans2_scan, 0},
        {"NTTRANSSCAN", torture_nttrans_scan, 0},
@@ -3197,6 +3756,7 @@ static void usage(void)
 
        printf("\t-d debuglevel\n");
        printf("\t-U user%%pass\n");
+       printf("\t-k               use kerberos\n");
        printf("\t-N numprocs\n");
        printf("\t-n my_netbios_name\n");
        printf("\t-W workgroup\n");
@@ -3206,6 +3766,7 @@ static void usage(void)
        printf("\t-L use oplocks\n");
        printf("\t-c CLIENT.TXT   specify client load file for NBENCH\n");
        printf("\t-A showall\n");
+       printf("\t-s seed\n");
        printf("\n\n");
 
        printf("tests are:");
@@ -3276,8 +3837,11 @@ static void usage(void)
 
        fstrcpy(workgroup, lp_workgroup());
 
-       while ((opt = getopt(argc, argv, "hW:U:n:N:O:o:m:Ld:Ac:")) != EOF) {
+       while ((opt = getopt(argc, argv, "hW:U:n:N:O:o:m:Ld:Ac:ks:")) != EOF) {
                switch (opt) {
+               case 's':
+                       srandom(atoi(optarg));
+                       break;
                case 'W':
                        fstrcpy(workgroup,optarg);
                        break;
@@ -3288,7 +3852,7 @@ static void usage(void)
                        nprocs = atoi(optarg);
                        break;
                case 'o':
-                       numops = atoi(optarg);
+                       torture_numops = atoi(optarg);
                        break;
                case 'd':
                        DEBUGLEVEL = atoi(optarg);
@@ -3308,6 +3872,15 @@ static void usage(void)
                case 'c':
                        client_txt = optarg;
                        break;
+               case 'k':
+#ifdef HAVE_KRB5
+                       use_kerberos = True;
+                       gotpass = True;
+#else
+                       d_printf("No kerberos support compiled in\n");
+                       exit(1);
+#endif
+                       break;
                case 'U':
                        pstrcpy(username,optarg);
                        p = strchr_m(username,'%');