nterr: Add mem_ctx for return string from get_nt_error_c_code()
[ddiss/samba.git] / source3 / torture / torture.c
index 9e1ac7648ed606ecafa8f884c25dbc52c22eee8d..fe9a5cb093784fc57fc7274b844717d1db8440ab 100644 (file)
@@ -2,6 +2,7 @@
    Unix SMB/CIFS implementation.
    SMB torture tester
    Copyright (C) Andrew Tridgell 1997-1998
+   Copyright (C) Jeremy Allison 2009
 
    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
 */
 
 #include "includes.h"
-#include "nsswitch/libwbclient/wbc_async.h"
+#include "system/shmem.h"
+#include "wbc_async.h"
+#include "torture/proto.h"
+#include "libcli/security/security.h"
+#include "tldap.h"
+#include "tldap_util.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "memcache.h"
+#include "nsswitch/winbind_client.h"
+#include "dbwrap.h"
+#include "talloc_dict.h"
+#include "async_smb.h"
+#include "libsmb/clirap.h"
+#include "trans2.h"
+#include "libsmb/nmblib.h"
+#include "../lib/util/tevent_ntstatus.h"
 
 extern char *optarg;
 extern int optind;
@@ -40,28 +56,15 @@ static bool use_kerberos;
 static fstring multishare_conn_fname;
 static bool use_multishare_conn = False;
 static bool do_encrypt;
+static const char *local_path = NULL;
+static int signing_state = Undefined;
+char *test_filename;
 
 bool torture_showall = False;
 
 static double create_procs(bool (*fn)(int), bool *result);
 
 
-static struct timeval tp1,tp2;
-
-
-void start_timer(void)
-{
-       GetTimeOfDay(&tp1);
-}
-
-double end_timer(void)
-{
-       GetTimeOfDay(&tp2);
-       return((tp2.tv_sec - tp1.tv_sec) + 
-              (tp2.tv_usec - tp1.tv_usec)*1.0e-6);
-}
-
-
 /* return a pointer to a anonymous shared memory segment of size "size"
    which will persist across fork() but will disappear when all processes
    exit 
@@ -134,10 +137,12 @@ static bool force_cli_encryption(struct cli_state *c,
                        return false;
        }
 
-       if (!cli_unix_extensions_version(c, &major, &minor, &caplow, &caphigh)) {
+       status = cli_unix_extensions_version(c, &major, &minor, &caplow,
+                                            &caphigh);
+       if (!NT_STATUS_IS_OK(status)) {
                d_printf("Encryption required and "
                        "can't get UNIX CIFS extensions "
-                       "version from server.\n");
+                       "version from server: %s\n", nt_errstr(status));
                return false;
        }
 
@@ -180,7 +185,7 @@ static struct cli_state *open_nbt_connection(void)
 
         zero_sockaddr(&ss);
 
-       if (!(c = cli_initialise())) {
+       if (!(c = cli_initialise_ex(signing_state))) {
                printf("Failed initialize cli_struct to connect with %s\n", host);
                return NULL;
        }
@@ -223,6 +228,120 @@ static struct cli_state *open_nbt_connection(void)
        return c;
 }
 
+/****************************************************************************
+ Send a corrupt session request. See rfc1002.txt 4.3 and 4.3.2.
+****************************************************************************/
+
+static bool cli_bad_session_request(struct cli_state *cli,
+                         struct nmb_name *calling, struct nmb_name *called)
+{
+        char *p;
+        int len = 4;
+        int namelen = 0;
+        char *tmp;
+
+        memcpy(&(cli->calling), calling, sizeof(*calling));
+        memcpy(&(cli->called ), called , sizeof(*called ));
+
+        /* put in the destination name */
+
+        tmp = name_mangle(talloc_tos(), cli->called.name,
+                          cli->called.name_type);
+        if (tmp == NULL) {
+                return false;
+        }
+
+        p = cli->outbuf+len;
+        namelen = name_len((unsigned char *)tmp, talloc_get_size(tmp));
+        if (namelen > 0) {
+                memcpy(p, tmp, namelen);
+                len += namelen;
+        }
+        TALLOC_FREE(tmp);
+
+       /* Deliberately corrupt the name len (first byte) */
+       *p = 100;
+
+        /* and my name */
+
+        tmp = name_mangle(talloc_tos(), cli->calling.name,
+                          cli->calling.name_type);
+        if (tmp == NULL) {
+                return false;
+        }
+
+        p = cli->outbuf+len;
+        namelen = name_len((unsigned char *)tmp, talloc_get_size(tmp));
+        if (namelen > 0) {
+                memcpy(p, tmp, namelen);
+                len += namelen;
+        }
+        TALLOC_FREE(tmp);
+       /* Deliberately corrupt the name len (first byte) */
+       *p = 100;
+
+        /* send a session request (RFC 1002) */
+        /* setup the packet length
+         * Remove four bytes from the length count, since the length
+         * field in the NBT Session Service header counts the number
+         * of bytes which follow.  The cli_send_smb() function knows
+         * about this and accounts for those four bytes.
+         * CRH.
+         */
+        len -= 4;
+        _smb_setlen(cli->outbuf,len);
+        SCVAL(cli->outbuf,0,0x81);
+
+        cli_send_smb(cli);
+        DEBUG(5,("Sent session request\n"));
+
+        if (!cli_receive_smb(cli))
+                return False;
+
+        if (CVAL(cli->inbuf,0) != 0x82) {
+                /* This is the wrong place to put the error... JRA. */
+                cli->rap_error = CVAL(cli->inbuf,4);
+                return False;
+        }
+        return(True);
+}
+
+static struct cli_state *open_bad_nbt_connection(void)
+{
+       struct nmb_name called, calling;
+       struct sockaddr_storage ss;
+       struct cli_state *c;
+       NTSTATUS status;
+
+       make_nmb_name(&calling, myname, 0x0);
+       make_nmb_name(&called , host, 0x20);
+
+        zero_sockaddr(&ss);
+
+       if (!(c = cli_initialise_ex(signing_state))) {
+               printf("Failed initialize cli_struct to connect with %s\n", host);
+               return NULL;
+       }
+
+       c->port = 139;
+
+       status = cli_connect(c, host, &ss);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to connect with %s. Error %s\n", host, nt_errstr(status) );
+               return NULL;
+       }
+
+       c->timeout = 4000; /* set a short timeout (4 seconds) */
+
+       if (!cli_bad_session_request(c, &calling, &called)) {
+               printf("Failed to connect with %s. Error %s\n", host, nt_errstr(status) );
+               return NULL;
+       }
+
+       return c;
+}
+
+
 /* Insert a NULL at the first separator of the given path and return a pointer
  * to the remainder of the string.
  */
@@ -285,7 +404,6 @@ static bool torture_open_connection_share(struct cli_state **c,
                                   const char *hostname, 
                                   const char *sharename)
 {
-       bool retry;
        int flags = 0;
        NTSTATUS status;
 
@@ -300,7 +418,7 @@ static bool torture_open_connection_share(struct cli_state **c,
                                     hostname, NULL, port_to_use, 
                                     sharename, "?????", 
                                     username, workgroup, 
-                                    password, flags, Undefined, &retry);
+                                    password, flags, signing_state);
        if (!NT_STATUS_IS_OK(status)) {
                printf("failed to open share connection: //%s/%s port:%d - %s\n",
                        hostname, sharename, port_to_use, nt_errstr(status));
@@ -375,8 +493,11 @@ bool torture_cli_session_setup2(struct cli_state *cli, uint16 *new_vuid)
 bool torture_close_connection(struct cli_state *c)
 {
        bool ret = True;
-       if (!cli_tdis(c)) {
-               printf("tdis failed (%s)\n", cli_errstr(c));
+       NTSTATUS status;
+
+       status = cli_tdis(c);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("tdis failed (%s)\n", nt_errstr(status));
                ret = False;
        }
 
@@ -459,6 +580,7 @@ static bool rw_torture(struct cli_state *c)
 
        for (i=0;i<torture_numops;i++) {
                unsigned n = (unsigned)sys_random()%10;
+
                if (i % 10 == 0) {
                        printf("%d\r", i); fflush(stdout);
                }
@@ -474,16 +596,20 @@ static bool rw_torture(struct cli_state *c)
                        break;
                }
 
-               if (cli_write(c, fnum, 0, (char *)&pid, 0, sizeof(pid)) != sizeof(pid)) {
-                       printf("write failed (%s)\n", cli_errstr(c));
+               status = cli_writeall(c, fnum, 0, (uint8_t *)&pid, 0,
+                                     sizeof(pid), NULL);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("write failed (%s)\n", nt_errstr(status));
                        correct = False;
                }
 
                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));
+                       status = cli_writeall(c, fnum, 0, (uint8_t *)buf,
+                                             sizeof(pid)+(j*sizeof(buf)),
+                                             sizeof(buf), NULL);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               printf("write failed (%s)\n",
+                                      nt_errstr(status));
                                correct = False;
                        }
                }
@@ -505,7 +631,7 @@ static bool rw_torture(struct cli_state *c)
                        correct = False;
                }
 
-               if (!NT_STATUS_IS_OK(cli_unlink(c, fname, aSYSTEM | aHIDDEN))) {
+               if (!NT_STATUS_IS_OK(cli_unlink(c, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                        printf("unlink failed (%s)\n", cli_errstr(c));
                        correct = False;
                }
@@ -517,7 +643,7 @@ static bool rw_torture(struct cli_state *c)
        }
 
        cli_close(c, fnum2);
-       cli_unlink(c, lockfname, aSYSTEM | aHIDDEN);
+       cli_unlink(c, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        printf("%d\n", i);
 
@@ -552,7 +678,7 @@ static bool rw_torture3(struct cli_state *c, char *lockfname)
        unsigned countprev = 0;
        ssize_t sent = 0;
        bool correct = True;
-       NTSTATUS status;
+       NTSTATUS status = NT_STATUS_OK;
 
        srandom(1);
        for (i = 0; i < sizeof(buf); i += sizeof(uint32))
@@ -562,6 +688,10 @@ static bool rw_torture3(struct cli_state *c, char *lockfname)
 
        if (procnum == 0)
        {
+               if (!NT_STATUS_IS_OK(cli_unlink(c, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
+                       printf("unlink failed (%s) (normal, this file should not exist)\n", cli_errstr(c));
+               }
+
                if (!NT_STATUS_IS_OK(cli_open(c, lockfname, O_RDWR | O_CREAT | O_EXCL, 
                                 DENY_NONE, &fnum))) {
                        printf("first open read/write of %s failed (%s)\n",
@@ -605,8 +735,11 @@ static bool rw_torture3(struct cli_state *c, char *lockfname)
                                sent = sizeof(buf) - count;
                        }
 
-                       if (cli_write(c, fnum, 0, buf+count, count, (size_t)sent) != sent) {
-                               printf("write failed (%s)\n", cli_errstr(c));
+                       status = cli_writeall(c, fnum, 0, (uint8_t *)buf+count,
+                                             count, (size_t)sent, NULL);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               printf("write failed (%s)\n",
+                                      nt_errstr(status));
                                correct = False;
                        }
                }
@@ -655,7 +788,7 @@ static bool rw_torture2(struct cli_state *c1, struct cli_state *c2)
        bool correct = True;
        ssize_t bytes_read;
 
-       if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, aSYSTEM | aHIDDEN))) {
+       if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                printf("unlink failed (%s) (normal, this file should not exist)\n", cli_errstr(c1));
        }
 
@@ -675,6 +808,7 @@ static bool rw_torture2(struct cli_state *c1, struct cli_state *c2)
 
        for (i=0;i<torture_numops;i++)
        {
+               NTSTATUS status;
                size_t buf_size = ((unsigned)sys_random()%(sizeof(buf)-1))+ 1;
                if (i % 10 == 0) {
                        printf("%d\r", i); fflush(stdout);
@@ -682,8 +816,10 @@ static bool rw_torture2(struct cli_state *c1, struct cli_state *c2)
 
                generate_random_buffer((unsigned char *)buf, buf_size);
 
-               if (cli_write(c1, fnum1, 0, buf, 0, buf_size) != buf_size) {
-                       printf("write failed (%s)\n", cli_errstr(c1));
+               status = cli_writeall(c1, fnum1, 0, (uint8_t *)buf, 0,
+                                     buf_size, NULL);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("write failed (%s)\n", nt_errstr(status));
                        correct = False;
                        break;
                }
@@ -713,7 +849,7 @@ static bool rw_torture2(struct cli_state *c1, struct cli_state *c2)
                correct = False;
        }
 
-       if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, aSYSTEM | aHIDDEN))) {
+       if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                printf("unlink failed (%s)\n", cli_errstr(c1));
                correct = False;
        }
@@ -772,7 +908,7 @@ static bool run_readwritemulti(int dummy)
        return test;
 }
 
-static bool run_readwritelarge(int dummy)
+static bool run_readwritelarge_internal(int max_xmit_k)
 {
        static struct cli_state *cli1;
        uint16_t fnum1;
@@ -787,29 +923,39 @@ static bool run_readwritelarge(int dummy)
        cli_sockopt(cli1, sockops);
        memset(buf,'\0',sizeof(buf));
 
-       cli1->max_xmit = 128*1024;
+       cli1->max_xmit = max_xmit_k*1024;
+
+       if (signing_state == Required) {
+               /* Horrible cheat to force
+                  multiple signed outstanding
+                  packets against a Samba server.
+               */
+               cli1->is_samba = false;
+       }
 
-       printf("starting readwritelarge\n");
+       printf("starting readwritelarge_internal\n");
 
-       cli_unlink(cli1, lockfname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_open(cli1, lockfname, O_RDWR | O_CREAT | O_EXCL, DENY_NONE, &fnum1))) {
                printf("open read/write of %s failed (%s)\n", lockfname, cli_errstr(cli1));
                return False;
        }
 
-       cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf));
+       cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 0, sizeof(buf), NULL);
 
-       if (!cli_qfileinfo(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+       if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
+                                    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 1 succeeded (size = %lx)\n", 
+               printf("readwritelarge_internal test 1 succeeded (size = %lx)\n",
                       (unsigned long)fsize);
        else {
-               printf("readwritelarge test 1 failed (size = %lx)\n", 
+               printf("readwritelarge_internal test 1 failed (size = %lx)\n",
                       (unsigned long)fsize);
                correct = False;
        }
@@ -819,7 +965,7 @@ static bool run_readwritelarge(int dummy)
                correct = False;
        }
 
-       if (!NT_STATUS_IS_OK(cli_unlink(cli1, lockfname, aSYSTEM | aHIDDEN))) {
+       if (!NT_STATUS_IS_OK(cli_unlink(cli1, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                printf("unlink failed (%s)\n", cli_errstr(cli1));
                correct = False;
        }
@@ -831,18 +977,20 @@ static bool run_readwritelarge(int dummy)
 
        cli1->max_xmit = 4*1024;
 
-       cli_smbwrite(cli1, fnum1, buf, 0, sizeof(buf));
+       cli_smbwrite(cli1, fnum1, buf, 0, sizeof(buf), NULL);
 
-       if (!cli_qfileinfo(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+       if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
+                                    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 = %lx)\n", 
+               printf("readwritelarge_internal test 2 succeeded (size = %lx)\n",
                       (unsigned long)fsize);
        else {
-               printf("readwritelarge test 2 failed (size = %lx)\n", 
+               printf("readwritelarge_internal test 2 failed (size = %lx)\n",
                       (unsigned long)fsize);
                correct = False;
        }
@@ -853,7 +1001,8 @@ static bool run_readwritelarge(int dummy)
                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)) {
+       if (!cli_qfileinfo_basic(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL,
+                                NULL, NULL)) {
                printf("qfileinfo failed (%s)\n", cli_errstr(cli1));
                correct = False;
        }
@@ -872,6 +1021,20 @@ static bool run_readwritelarge(int dummy)
        return correct;
 }
 
+static bool run_readwritelarge(int dummy)
+{
+       return run_readwritelarge_internal(128);
+}
+
+static bool run_readwritelarge_signtest(int dummy)
+{
+       bool ret;
+       signing_state = Required;
+       ret = run_readwritelarge_internal(2);
+       signing_state = Undefined;
+       return ret;
+}
+
 int line_count = 0;
 int nbio_id;
 
@@ -1019,7 +1182,7 @@ static bool run_locktest1(int dummy)
 
        printf("starting locktest1\n");
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) {
                printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
@@ -1091,7 +1254,7 @@ static bool run_locktest1(int dummy)
                return False;
        }
 
-       if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | aHIDDEN))) {
+       if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                printf("unlink failed (%s)\n", cli_errstr(cli1));
                return False;
        }
@@ -1133,7 +1296,7 @@ static bool run_tcon_test(int dummy)
 
        printf("starting tcontest\n");
 
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) {
                printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
@@ -1143,8 +1306,9 @@ static bool run_tcon_test(int dummy)
        cnum1 = cli->cnum;
        vuid1 = cli->vuid;
 
-       if (cli_write(cli, fnum1, 0, buf, 130, 4) != 4) {
-               printf("initial write failed (%s)", cli_errstr(cli));
+       status = cli_writeall(cli, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("initial write failed (%s)", nt_errstr(status));
                return False;
        }
 
@@ -1164,33 +1328,39 @@ static bool run_tcon_test(int dummy)
        /* try a write with the wrong tid */
        cli->cnum = cnum2;
 
-       if (cli_write(cli, fnum1, 0, buf, 130, 4) == 4) {
+       status = cli_writeall(cli, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+       if (NT_STATUS_IS_OK(status)) {
                printf("* server allows write with wrong TID\n");
                ret = False;
        } else {
-               printf("server fails write with wrong TID : %s\n", cli_errstr(cli));
+               printf("server fails write with wrong TID : %s\n",
+                      nt_errstr(status));
        }
 
 
        /* try a write with an invalid tid */
        cli->cnum = cnum3;
 
-       if (cli_write(cli, fnum1, 0, buf, 130, 4) == 4) {
+       status = cli_writeall(cli, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+       if (NT_STATUS_IS_OK(status)) {
                printf("* server allows write with invalid TID\n");
                ret = False;
        } else {
-               printf("server fails write with invalid TID : %s\n", cli_errstr(cli));
+               printf("server fails write with invalid TID : %s\n",
+                      nt_errstr(status));
        }
 
        /* try a write with an invalid vuid */
        cli->vuid = vuid2;
        cli->cnum = cnum1;
 
-       if (cli_write(cli, fnum1, 0, buf, 130, 4) == 4) {
+       status = cli_writeall(cli, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+       if (NT_STATUS_IS_OK(status)) {
                printf("* server allows write with invalid VUID\n");
                ret = False;
        } else {
-               printf("server fails write with invalid VUID : %s\n", cli_errstr(cli));
+               printf("server fails write with invalid VUID : %s\n",
+                      nt_errstr(status));
        }
 
        cli->cnum = cnum1;
@@ -1203,8 +1373,9 @@ static bool run_tcon_test(int dummy)
 
        cli->cnum = cnum2;
 
-       if (!cli_tdis(cli)) {
-               printf("secondary tdis failed (%s)\n", cli_errstr(cli));
+       status = cli_tdis(cli);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("secondary tdis failed (%s)\n", nt_errstr(status));
                return False;
        }
 
@@ -1241,11 +1412,13 @@ static bool run_tcon2_test(int dummy)
 
        status = cli_raw_tcon(cli, service, password, "?????", &max_xmit, &cnum);
 
+       SAFE_FREE(service);
+
        if (!NT_STATUS_IS_OK(status)) {
-               printf("tcon2 failed : %s\n", cli_errstr(cli));
+               printf("tcon2 failed : %s\n", nt_errstr(status));
        } else {
-               printf("tcon OK : max_xmit=%d cnum=%d tid=%d\n", 
-                      (int)max_xmit, (int)cnum, SVAL(cli->inbuf, smb_tid));
+               printf("tcon OK : max_xmit=%d cnum=%d\n",
+                      (int)max_xmit, (int)cnum);
        }
 
        if (!torture_close_connection(cli)) {
@@ -1310,7 +1483,6 @@ static bool tcon_devtest(struct cli_state *cli,
 static bool run_tcon_devtype_test(int dummy)
 {
        static struct cli_state *cli1 = NULL;
-       bool retry;
        int flags = 0;
        NTSTATUS status;
        bool ret = True;
@@ -1319,7 +1491,7 @@ static bool run_tcon_devtype_test(int dummy)
                                     host, NULL, port_to_use,
                                     NULL, NULL,
                                     username, workgroup,
-                                    password, flags, Undefined, &retry);
+                                    password, flags, signing_state);
 
        if (!NT_STATUS_IS_OK(status)) {
                printf("could not open connection\n");
@@ -1391,7 +1563,7 @@ static bool run_locktest2(int dummy)
 
        printf("starting locktest2\n");
 
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        cli_setpid(cli, 1);
 
@@ -1528,7 +1700,7 @@ static bool run_locktest3(int dummy)
 
        printf("starting locktest3\n");
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) {
                printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
@@ -1608,7 +1780,7 @@ static bool run_locktest3(int dummy)
                return False;
        }
 
-       if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | aHIDDEN))) {
+       if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                printf("unlink failed (%s)\n", cli_errstr(cli1));
                return False;
        }
@@ -1641,6 +1813,7 @@ static bool run_locktest4(int dummy)
        bool ret;
        char buf[1000];
        bool correct = True;
+       NTSTATUS status;
 
        if (!torture_open_connection(&cli1, 0) || !torture_open_connection(&cli2, 1)) {
                return False;
@@ -1651,15 +1824,17 @@ static bool run_locktest4(int dummy)
 
        printf("starting locktest4\n");
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
        cli_open(cli2, fname, O_RDWR, DENY_NONE, &fnum2);
 
        memset(buf, 0, sizeof(buf));
 
-       if (cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
-               printf("Failed to create file\n");
+       status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 0, sizeof(buf),
+                             NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to create file: %s\n", nt_errstr(status));
                correct = False;
                goto fail;
        }
@@ -1731,8 +1906,12 @@ static bool run_locktest4(int dummy)
        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);
+       ret = cli_lock(cli1, fnum1, 130, 4, 0, READ_LOCK);
+       if (ret) {
+               status = cli_writeall(cli2, fnum2, 0, (uint8_t *)buf, 130, 4,
+                                     NULL);
+               ret = NT_STATUS_IS_OK(status);
+       }
        EXPECTED(ret, False);
        printf("this server %s strict read locking\n", ret?"doesn't do":"does");
 
@@ -1749,21 +1928,24 @@ static bool run_locktest4(int dummy)
              cli_lock(cli1, fnum1, 150, 4, 0, READ_LOCK) &&
              NT_STATUS_IS_OK(cli_unlock(cli1, fnum1, 150, 4)) &&
              (cli_read(cli2, fnum2, buf, 150, 4) == 4) &&
-             !(cli_write(cli2, fnum2, 0, buf, 150, 4) == 4) &&
+             !(NT_STATUS_IS_OK(cli_writeall(cli2, fnum2, 0, (uint8_t *)buf,
+                                            150, 4, NULL))) &&
              NT_STATUS_IS_OK(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) &&
              NT_STATUS_IS_OK(cli_unlock(cli1, fnum1, 160, 4)) &&
-             (cli_write(cli2, fnum2, 0, buf, 160, 4) == 4) &&          
+             NT_STATUS_IS_OK(cli_writeall(cli2, fnum2, 0, (uint8_t *)buf,
+                                          160, 4, NULL)) &&
              (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) &&
              NT_STATUS_IS_OK(cli_unlock(cli1, fnum1, 170, 4)) &&
-             (cli_write(cli2, fnum2, 0, buf, 170, 4) == 4) &&          
+             NT_STATUS_IS_OK(cli_writeall(cli2, fnum2, 0, (uint8_t *)buf,
+                                          170, 4, NULL)) &&
              (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");
@@ -1771,7 +1953,8 @@ static bool run_locktest4(int dummy)
        ret = cli_lock(cli1, fnum1, 190, 4, 0, WRITE_LOCK) &&
              cli_lock(cli1, fnum1, 190, 4, 0, READ_LOCK) &&
              NT_STATUS_IS_OK(cli_unlock(cli1, fnum1, 190, 4)) &&
-             !(cli_write(cli2, fnum2, 0, buf, 190, 4) == 4) &&         
+             !NT_STATUS_IS_OK(cli_writeall(cli2, fnum2, 0, (uint8_t *)buf,
+                                           190, 4, NULL)) &&
              (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");
@@ -1793,7 +1976,7 @@ static bool run_locktest4(int dummy)
  fail:
        cli_close(cli1, fnum1);
        cli_close(cli2, fnum2);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        torture_close_connection(cli1);
        torture_close_connection(cli2);
 
@@ -1812,6 +1995,7 @@ static bool run_locktest5(int dummy)
        bool ret;
        char buf[1000];
        bool correct = True;
+       NTSTATUS status;
 
        if (!torture_open_connection(&cli1, 0) || !torture_open_connection(&cli2, 1)) {
                return False;
@@ -1822,7 +2006,7 @@ static bool run_locktest5(int dummy)
 
        printf("starting locktest5\n");
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
        cli_open(cli2, fname, O_RDWR, DENY_NONE, &fnum2);
@@ -1830,8 +2014,10 @@ static bool run_locktest5(int dummy)
 
        memset(buf, 0, sizeof(buf));
 
-       if (cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
-               printf("Failed to create file\n");
+       status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 0, sizeof(buf),
+                             NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to create file: %s\n", nt_errstr(status));
                correct = False;
                goto fail;
        }
@@ -1912,7 +2098,7 @@ static bool run_locktest5(int dummy)
  fail:
        cli_close(cli1, fnum1);
        cli_close(cli2, fnum2);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        if (!torture_close_connection(cli1)) {
                correct = False;
        }
@@ -1947,7 +2133,7 @@ static bool run_locktest6(int dummy)
        for (i=0;i<1;i++) {
                printf("Testing %s\n", fname[i]);
 
-               cli_unlink(cli, fname[i], aSYSTEM | aHIDDEN);
+               cli_unlink(cli, fname[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
                cli_open(cli, fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum);
                status = cli_locktype(cli, fnum, 0, 8, 0, LOCKING_ANDX_CHANGE_LOCKTYPE);
@@ -1959,7 +2145,7 @@ static bool run_locktest6(int dummy)
                cli_close(cli, fnum);
                printf("CANCEL_LOCK gave %s\n", nt_errstr(status));
 
-               cli_unlink(cli, fname[i], aSYSTEM | aHIDDEN);
+               cli_unlink(cli, fname[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        }
 
        torture_close_connection(cli);
@@ -1975,6 +2161,7 @@ static bool run_locktest7(int dummy)
        uint16_t fnum1;
        char buf[200];
        bool correct = False;
+       NTSTATUS status;
 
        if (!torture_open_connection(&cli1, 0)) {
                return False;
@@ -1984,14 +2171,16 @@ static bool run_locktest7(int dummy)
 
        printf("starting locktest7\n");
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
 
        memset(buf, 0, sizeof(buf));
 
-       if (cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
-               printf("Failed to create file\n");
+       status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 0, sizeof(buf),
+                             NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to create file: %s\n", nt_errstr(status));
                goto fail;
        }
 
@@ -2011,9 +2200,11 @@ static bool run_locktest7(int dummy)
                printf("pid1 successfully read the range 130:4\n");
        }
 
-       if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
-               printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
-               if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+       status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("pid1 unable to write to the range 130:4, error was "
+                      "%s\n", nt_errstr(status));
+               if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_LOCK_CONFLICT)) {
                        printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
                        goto fail;
                }
@@ -2030,9 +2221,11 @@ static bool run_locktest7(int dummy)
                printf("pid2 successfully read the range 130:4\n");
        }
 
-       if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
-               printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
-               if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+       status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("pid2 unable to write to the range 130:4, error was "
+                      "%s\n", nt_errstr(status));
+               if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_LOCK_CONFLICT)) {
                        printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
                        goto fail;
                }
@@ -2058,8 +2251,10 @@ static bool run_locktest7(int dummy)
                printf("pid1 successfully read the range 130:4\n");
        }
 
-       if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
-               printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
+       status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("pid1 unable to write to the range 130:4, error was "
+                      "%s\n", nt_errstr(status));
                goto fail;
        } else {
                printf("pid1 successfully wrote to the range 130:4\n");
@@ -2078,9 +2273,11 @@ static bool run_locktest7(int dummy)
                goto fail;
        }
 
-       if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
-               printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
-               if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+       status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("pid2 unable to write to the range 130:4, error was "
+                      "%s\n", nt_errstr(status));
+               if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_LOCK_CONFLICT)) {
                        printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
                        goto fail;
                }
@@ -2094,7 +2291,7 @@ static bool run_locktest7(int dummy)
 
 fail:
        cli_close(cli1, fnum1);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        torture_close_connection(cli1);
 
        printf("finished locktest7\n");
@@ -2126,7 +2323,7 @@ static bool run_locktest8(int dummy)
 
        printf("starting locktest8\n");
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        status = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_WRITE,
                          &fnum1);
@@ -2168,13 +2365,216 @@ static bool run_locktest8(int dummy)
 fail:
        cli_close(cli1, fnum1);
        cli_close(cli1, fnum2);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        torture_close_connection(cli1);
 
        printf("finished locktest8\n");
        return correct;
 }
 
+/*
+ * This test is designed to be run in conjunction with
+ * external NFS or POSIX locks taken in the filesystem.
+ * It checks that the smbd server will block until the
+ * lock is released and then acquire it. JRA.
+ */
+
+static bool got_alarm;
+static int alarm_fd;
+
+static void alarm_handler(int dummy)
+{
+        got_alarm = True;
+}
+
+static void alarm_handler_parent(int dummy)
+{
+       close(alarm_fd);
+}
+
+static void do_local_lock(int read_fd, int write_fd)
+{
+       int fd;
+       char c = '\0';
+       struct flock lock;
+       const char *local_pathname = NULL;
+       int ret;
+
+       local_pathname = talloc_asprintf(talloc_tos(),
+                       "%s/lockt9.lck", local_path);
+       if (!local_pathname) {
+               printf("child: alloc fail\n");
+               exit(1);
+       }
+
+       unlink(local_pathname);
+       fd = open(local_pathname, O_RDWR|O_CREAT, 0666);
+       if (fd == -1) {
+               printf("child: open of %s failed %s.\n",
+                       local_pathname, strerror(errno));
+               exit(1);
+       }
+
+       /* Now take a fcntl lock. */
+       lock.l_type = F_WRLCK;
+       lock.l_whence = SEEK_SET;
+       lock.l_start = 0;
+       lock.l_len = 4;
+       lock.l_pid = getpid();
+
+       ret = fcntl(fd,F_SETLK,&lock);
+       if (ret == -1) {
+               printf("child: failed to get lock 0:4 on file %s. Error %s\n",
+                       local_pathname, strerror(errno));
+               exit(1);
+       } else {
+               printf("child: got lock 0:4 on file %s.\n",
+                       local_pathname );
+               fflush(stdout);
+       }
+
+       CatchSignal(SIGALRM, alarm_handler);
+       alarm(5);
+       /* Signal the parent. */
+       if (write(write_fd, &c, 1) != 1) {
+               printf("child: start signal fail %s.\n",
+                       strerror(errno));
+               exit(1);
+       }
+       alarm(0);
+
+       alarm(10);
+       /* Wait for the parent to be ready. */
+       if (read(read_fd, &c, 1) != 1) {
+               printf("child: reply signal fail %s.\n",
+                       strerror(errno));
+               exit(1);
+       }
+       alarm(0);
+
+       sleep(5);
+       close(fd);
+       printf("child: released lock 0:4 on file %s.\n",
+               local_pathname );
+       fflush(stdout);
+       exit(0);
+}
+
+static bool run_locktest9(int dummy)
+{
+       struct cli_state *cli1;
+       const char *fname = "\\lockt9.lck";
+       uint16_t fnum;
+       bool correct = False;
+       int pipe_in[2], pipe_out[2];
+       pid_t child_pid;
+       char c = '\0';
+       int ret;
+       struct timeval start;
+       double seconds;
+       NTSTATUS status;
+
+       printf("starting locktest9\n");
+
+       if (local_path == NULL) {
+               d_fprintf(stderr, "locktest9 must be given a local path via -l <localpath>\n");
+               return false;
+       }
+
+       if (pipe(pipe_in) == -1 || pipe(pipe_out) == -1) {
+               return false;
+       }
+
+       child_pid = fork();
+       if (child_pid == -1) {
+               return false;
+       }
+
+       if (child_pid == 0) {
+               /* Child. */
+               do_local_lock(pipe_out[0], pipe_in[1]);
+               exit(0);
+       }
+
+       close(pipe_out[0]);
+       close(pipe_in[1]);
+       pipe_out[0] = -1;
+       pipe_in[1] = -1;
+
+       /* Parent. */
+       ret = read(pipe_in[0], &c, 1);
+       if (ret != 1) {
+               d_fprintf(stderr, "failed to read start signal from child. %s\n",
+                       strerror(errno));
+               return false;
+       }
+
+       if (!torture_open_connection(&cli1, 0)) {
+               return false;
+       }
+
+       cli_sockopt(cli1, sockops);
+
+       status = cli_open(cli1, fname, O_RDWR, DENY_NONE,
+                         &fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, "cli_open returned %s\n", cli_errstr(cli1));
+               return false;
+       }
+
+       /* Ensure the child has the lock. */
+       if (cli_lock(cli1, fnum, 0, 4, 0, WRITE_LOCK)) {
+               d_fprintf(stderr, "Got the lock on range 0:4 - this should not happen !\n");
+               goto fail;
+       } else {
+               d_printf("Child has the lock.\n");
+       }
+
+       /* Tell the child to wait 5 seconds then exit. */
+       ret = write(pipe_out[1], &c, 1);
+       if (ret != 1) {
+               d_fprintf(stderr, "failed to send exit signal to child. %s\n",
+                       strerror(errno));
+               goto fail;
+       }
+
+       /* Wait 20 seconds for the lock. */
+       alarm_fd = cli1->fd;
+       CatchSignal(SIGALRM, alarm_handler_parent);
+       alarm(20);
+
+       start = timeval_current();
+
+       if (!cli_lock(cli1, fnum, 0, 4, -1, WRITE_LOCK)) {
+               d_fprintf(stderr, "Unable to apply write lock on range 0:4, error was "
+                      "%s\n", cli_errstr(cli1));
+               goto fail_nofd;
+       }
+       alarm(0);
+
+       seconds = timeval_elapsed(&start);
+
+       printf("Parent got the lock after %.2f seconds.\n",
+               seconds);
+
+       status = cli_close(cli1, fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, "cli_close(fnum1) %s\n", cli_errstr(cli1));
+               goto fail;
+       }
+
+       correct = true;
+
+fail:
+       cli_close(cli1, fnum);
+       torture_close_connection(cli1);
+
+fail_nofd:
+
+       printf("finished locktest9\n");
+       return correct;
+}
+
 /*
 test whether fnums and tids open on one VC are available on another (a major
 security hole)
@@ -2185,6 +2585,7 @@ static bool run_fdpasstest(int dummy)
        const char *fname = "\\fdpass.tst";
        uint16_t fnum1;
        char buf[1024];
+       NTSTATUS status;
 
        if (!torture_open_connection(&cli1, 0) || !torture_open_connection(&cli2, 1)) {
                return False;
@@ -2194,15 +2595,17 @@ static bool run_fdpasstest(int dummy)
 
        printf("starting fdpasstest\n");
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) {
                printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
 
-       if (cli_write(cli1, fnum1, 0, "hello world\n", 0, 13) != 13) {
-               printf("write failed (%s)\n", cli_errstr(cli1));
+       status = cli_writeall(cli1, fnum1, 0, (const uint8_t *)"hello world\n", 0,
+                             13, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("write failed (%s)\n", nt_errstr(status));
                return False;
        }
 
@@ -2217,7 +2620,7 @@ static bool run_fdpasstest(int dummy)
        }
 
        cli_close(cli1, fnum1);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        torture_close_connection(cli1);
        torture_close_connection(cli2);
@@ -2239,6 +2642,7 @@ static bool run_fdsesstest(int dummy)
        uint16_t fnum2;
        char buf[1024];
        bool ret = True;
+       NTSTATUS status;
 
        if (!torture_open_connection(&cli, 0))
                return False;
@@ -2255,16 +2659,18 @@ static bool run_fdsesstest(int dummy)
 
        printf("starting fdsesstest\n");
 
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
-       cli_unlink(cli, fname1, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) {
                printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
                return False;
        }
 
-       if (cli_write(cli, fnum1, 0, "hello world\n", 0, 13) != 13) {
-               printf("write failed (%s)\n", cli_errstr(cli));
+       status = cli_writeall(cli, fnum1, 0, (const uint8_t *)"hello world\n", 0, 13,
+                             NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("write failed (%s)\n", nt_errstr(status));
                return False;
        }
 
@@ -2280,7 +2686,7 @@ static bool run_fdsesstest(int dummy)
        if (NT_STATUS_IS_OK(cli_open(cli, fname1, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum2))) {
                printf("create with different vuid, same cnum succeeded.\n");
                cli_close(cli, fnum2);
-               cli_unlink(cli, fname1, aSYSTEM | aHIDDEN);
+               cli_unlink(cli, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        } else {
                printf("create with different vuid, same cnum failed.\n");
                printf("This will cause problems with service clients.\n");
@@ -2300,7 +2706,7 @@ static bool run_fdsesstest(int dummy)
 
        cli->cnum = saved_cnum;
        cli_close(cli, fnum1);
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        torture_close_connection(cli);
 
@@ -2328,7 +2734,7 @@ static bool run_unlinktest(int dummy)
 
        printf("starting unlink test\n");
 
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        cli_setpid(cli, 1);
 
@@ -2337,7 +2743,7 @@ static bool run_unlinktest(int dummy)
                return False;
        }
 
-       if (NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | aHIDDEN))) {
+       if (NT_STATUS_IS_OK(cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                printf("error: server allowed unlink on an open file\n");
                correct = False;
        } else {
@@ -2346,7 +2752,7 @@ static bool run_unlinktest(int dummy)
        }
 
        cli_close(cli, fnum);
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!torture_close_connection(cli)) {
                correct = False;
@@ -2364,7 +2770,6 @@ test how many open files this server supports on the one socket
 static bool run_maxfidtest(int dummy)
 {
        struct cli_state *cli;
-       const char *ftemplate = "\\maxfid.%d.%d";
        fstring fname;
        uint16_t fnums[0x11000];
        int i;
@@ -2381,7 +2786,7 @@ static bool run_maxfidtest(int dummy)
        cli_sockopt(cli, sockops);
 
        for (i=0; i<0x11000; i++) {
-               slprintf(fname,sizeof(fname)-1,ftemplate, i,(int)getpid());
+               slprintf(fname,sizeof(fname)-1,"\\maxfid.%d.%d", i,(int)getpid());
                if (!NT_STATUS_IS_OK(cli_open(cli, fname, 
                                        O_RDWR|O_CREAT|O_TRUNC, DENY_NONE, &fnums[i]))) {
                        printf("open of %s failed (%s)\n", 
@@ -2396,9 +2801,9 @@ static bool run_maxfidtest(int dummy)
 
        printf("cleaning up\n");
        for (;i>=0;i--) {
-               slprintf(fname,sizeof(fname)-1,ftemplate, i,(int)getpid());
+               slprintf(fname,sizeof(fname)-1,"\\maxfid.%d.%d", i,(int)getpid());
                cli_close(cli, fnums[i]);
-               if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | aHIDDEN))) {
+               if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                        printf("unlink of %s failed (%s)\n", 
                               fname, cli_errstr(cli));
                        correct = False;
@@ -2426,21 +2831,41 @@ static void rand_buf(char *buf, int len)
 /* send smb negprot commands, not reading the response */
 static bool run_negprot_nowait(int dummy)
 {
+       struct tevent_context *ev;
        int i;
-       static struct cli_state *cli;
+       struct cli_state *cli;
        bool correct = True;
 
        printf("starting negprot nowait test\n");
 
+       ev = tevent_context_init(talloc_tos());
+       if (ev == NULL) {
+               return false;
+       }
+
        if (!(cli = open_nbt_connection())) {
+               TALLOC_FREE(ev);
                return False;
        }
 
        for (i=0;i<50000;i++) {
-               cli_negprot_sendsync(cli);
+               struct tevent_req *req;
+
+               req = cli_negprot_send(ev, ev, cli);
+               if (req == NULL) {
+                       TALLOC_FREE(ev);
+                       return false;
+               }
+               if (!tevent_req_poll(req, ev)) {
+                       d_fprintf(stderr, "tevent_req_poll failed: %s\n",
+                                 strerror(errno));
+                       TALLOC_FREE(ev);
+                       return false;
+               }
+               TALLOC_FREE(req);
        }
 
-       if (!torture_close_connection(cli)) {
+       if (torture_close_connection(cli)) {
                correct = False;
        }
 
@@ -2449,6 +2874,21 @@ static bool run_negprot_nowait(int dummy)
        return correct;
 }
 
+/* send smb negprot commands, not reading the response */
+static bool run_bad_nbt_session(int dummy)
+{
+       static struct cli_state *cli;
+
+       printf("starting bad nbt session test\n");
+
+       if (!(cli = open_bad_nbt_connection())) {
+               return False;
+       }
+
+       cli_shutdown(cli);
+       printf("finished bad nbt session test\n");
+       return true;
+}
 
 /* send random IPC commands */
 static bool run_randomipc(int dummy)
@@ -2559,7 +2999,7 @@ static bool run_attrtest(int dummy)
                return False;
        }
 
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        cli_open(cli, fname, 
                        O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum);
        cli_close(cli, fnum);
@@ -2594,7 +3034,7 @@ static bool run_attrtest(int dummy)
                correct = True;
        }
 
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!torture_close_connection(cli)) {
                correct = False;
@@ -2621,6 +3061,8 @@ static bool run_trans2test(int dummy)
        const char *fname2 = "\\trans2\\trans2.tst";
        char pname[1024];
        bool correct = True;
+       NTSTATUS status;
+       uint32_t fs_attr;
 
        printf("starting trans2 test\n");
 
@@ -2628,16 +3070,25 @@ static bool run_trans2test(int dummy)
                return False;
        }
 
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+       status = cli_get_fs_attr_info(cli, &fs_attr);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ERROR: cli_get_fs_attr_info returned %s\n",
+                      nt_errstr(status));
+               correct = false;
+       }
+
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        cli_open(cli, fname, 
                        O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum);
-       if (!cli_qfileinfo(cli, fnum, NULL, &size, &c_time_ts, &a_time_ts, &w_time_ts,
-                          &m_time_ts, NULL)) {
+       if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
+                                    cli, fnum, NULL, &size, &c_time_ts,
+                                    &a_time_ts, &w_time_ts,
+                                    &m_time_ts, NULL))) {
                printf("ERROR: qfileinfo failed (%s)\n", cli_errstr(cli));
                correct = False;
        }
 
-       if (!cli_qfilename(cli, fnum, pname, sizeof(pname))) {
+       if (!NT_STATUS_IS_OK(cli_qfilename(cli, fnum, pname, sizeof(pname)))) {
                printf("ERROR: qfilename failed (%s)\n", cli_errstr(cli));
                correct = False;
        }
@@ -2652,7 +3103,7 @@ static bool run_trans2test(int dummy)
 
        sleep(2);
 
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        if (!NT_STATUS_IS_OK(cli_open(cli, fname, 
                        O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum))) {
                printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
@@ -2660,8 +3111,10 @@ static bool run_trans2test(int dummy)
        }
        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));
+       status = cli_qpathinfo1(cli, fname, &c_time, &a_time, &m_time, &size,
+                               NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ERROR: qpathinfo failed (%s)\n", nt_errstr(status));
                correct = False;
        } else {
                if (c_time != m_time) {
@@ -2682,13 +3135,14 @@ static bool run_trans2test(int dummy)
        }
 
 
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        cli_open(cli, fname, 
                        O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum);
        cli_close(cli, fnum);
-       if (!cli_qpathinfo2(cli, fname, &c_time_ts, &a_time_ts, &w_time_ts, 
-                           &m_time_ts, &size, NULL, NULL)) {
-               printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli));
+       status = cli_qpathinfo2(cli, fname, &c_time_ts, &a_time_ts, &w_time_ts,
+                               &m_time_ts, &size, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ERROR: qpathinfo2 failed (%s)\n", nt_errstr(status));
                correct = False;
        } else {
                if (w_time_ts.tv_sec < 60*60*24*2) {
@@ -2698,7 +3152,7 @@ static bool run_trans2test(int dummy)
                }
        }
 
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
 
        /* check if the server updates the directory modification time
@@ -2708,19 +3162,21 @@ static bool run_trans2test(int dummy)
                correct = False;
        }
        sleep(3);
-       if (!cli_qpathinfo2(cli, "\\trans2\\", &c_time_ts, &a_time_ts, &w_time_ts, 
-                           &m_time_ts, &size, NULL, NULL)) {
-               printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli));
+       status = cli_qpathinfo2(cli, "\\trans2\\", &c_time_ts, &a_time_ts,
+                               &w_time_ts, &m_time_ts, &size, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ERROR: qpathinfo2 failed (%s)\n", nt_errstr(status));
                correct = False;
        }
 
        cli_open(cli, fname2, 
                        O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum);
-       cli_write(cli, fnum,  0, (char *)&fnum, 0, sizeof(fnum));
+       cli_writeall(cli, fnum,  0, (uint8_t *)&fnum, 0, sizeof(fnum), NULL);
        cli_close(cli, fnum);
-       if (!cli_qpathinfo2(cli, "\\trans2\\", &c_time_ts, &a_time_ts, &w_time_ts, 
-                           &m_time2_ts, &size, NULL, NULL)) {
-               printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli));
+       status = cli_qpathinfo2(cli, "\\trans2\\", &c_time_ts, &a_time_ts,
+                               &w_time_ts, &m_time2_ts, &size, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ERROR: qpathinfo2 failed (%s)\n", nt_errstr(status));
                correct = False;
        } else {
                if (memcmp(&m_time_ts, &m_time2_ts, sizeof(struct timespec))
@@ -2729,7 +3185,7 @@ static bool run_trans2test(int dummy)
                        correct = False;
                }
        }
-       cli_unlink(cli, fname2, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname2, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        cli_rmdir(cli, dname);
 
        if (!torture_close_connection(cli)) {
@@ -2745,22 +3201,24 @@ static bool run_trans2test(int dummy)
   This checks new W2K calls.
 */
 
-static bool new_trans(struct cli_state *pcli, int fnum, int level)
+static NTSTATUS new_trans(struct cli_state *pcli, int fnum, int level)
 {
-       char *buf = NULL;
+       uint8_t *buf = NULL;
        uint32 len;
-       bool correct = True;
+       NTSTATUS status;
 
-       if (!cli_qfileinfo_test(pcli, fnum, level, &buf, &len)) {
-               printf("ERROR: qfileinfo (%d) failed (%s)\n", level, cli_errstr(pcli));
-               correct = False;
+       status = cli_qfileinfo(talloc_tos(), pcli, fnum, level, 0,
+                              pcli->max_xmit, &buf, &len);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ERROR: qfileinfo (%d) failed (%s)\n", level,
+                      nt_errstr(status));
        } else {
                printf("qfileinfo: level %d, len = %u\n", level, len);
                dump_data(0, (uint8 *)buf, len);
                printf("\n");
        }
-       SAFE_FREE(buf);
-       return correct;
+       TALLOC_FREE(buf);
+       return status;
 }
 
 static bool run_w2ktest(int dummy)
@@ -2812,7 +3270,7 @@ static bool run_oplock1(int dummy)
                return False;
        }
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        cli_sockopt(cli1, sockops);
 
@@ -2825,15 +3283,15 @@ static bool run_oplock1(int dummy)
 
        cli1->use_oplocks = False;
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
                printf("close2 failed (%s)\n", cli_errstr(cli1));
                return False;
        }
 
-       if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | aHIDDEN))) {
+       if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                printf("unlink failed (%s)\n", cli_errstr(cli1));
                return False;
        }
@@ -2883,7 +3341,7 @@ static bool run_oplock2(int dummy)
        cli2->use_oplocks = True;
        cli2->use_level_II_oplocks = True;
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        cli_sockopt(cli1, sockops);
        cli_sockopt(cli2, sockops);
@@ -2948,13 +3406,6 @@ static bool run_oplock2(int dummy)
 
        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));
-               correct = False;
-       }
-#endif
-
        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
                printf("close1 failed (%s)\n", cli_errstr(cli1));
                correct = False;
@@ -2962,7 +3413,7 @@ static bool run_oplock2(int dummy)
 
        sleep(4);
 
-       if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | aHIDDEN))) {
+       if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                printf("unlink failed (%s)\n", cli_errstr(cli1));
                correct = False;
        }
@@ -3013,7 +3464,7 @@ static bool run_oplock3(int dummy)
                sleep(2);
                /* try to trigger a oplock break in parent */
                cli_open(cli, fname, O_RDWR, DENY_NONE, &fnum);
-               cli_write(cli, fnum, 0, buf, 0, 4);
+               cli_writeall(cli, fnum, 0, (uint8_t *)buf, 0, 4, NULL);
                exit(0);
        }
 
@@ -3025,7 +3476,7 @@ static bool run_oplock3(int dummy)
        }
        cli_oplock_handler(cli, oplock3_handler);
        cli_open(cli, fname, O_RDWR|O_CREAT, DENY_NONE, &fnum);
-       cli_write(cli, fnum, 0, buf, 0, 4);
+       cli_writeall(cli, fnum, 0, (uint8_t *)buf, 0, 4, NULL);
        cli_close(cli, fnum);
        cli_open(cli, fname, O_RDWR, DENY_NONE, &fnum);
        cli->timeout = 20000;
@@ -3037,8 +3488,153 @@ static bool run_oplock3(int dummy)
 /* What are we looking for here?  What's sucess and what's FAILURE? */
 }
 
+/* handler for oplock 4 tests */
+bool *oplock4_shared_correct;
+
+static NTSTATUS oplock4_handler(struct cli_state *cli, uint16_t fnum, unsigned char level)
+{
+       printf("got oplock break fnum=%d level=%d\n",
+              fnum, level);
+       *oplock4_shared_correct = true;
+       cli_oplock_ack(cli, fnum, level);
+       return NT_STATUS_UNSUCCESSFUL; /* Cause cli_receive_smb to return. */
+}
+
+static bool run_oplock4(int dummy)
+{
+       struct cli_state *cli1, *cli2;
+       const char *fname = "\\lockt4.lck";
+       const char *fname_ln = "\\lockt4_ln.lck";
+       uint16_t fnum1, fnum2;
+       int saved_use_oplocks = use_oplocks;
+       NTSTATUS status;
+       bool correct = true;
+
+       oplock4_shared_correct = (bool *)shm_setup(sizeof(bool));
+       *oplock4_shared_correct = false;
+
+       printf("starting oplock test 4\n");
+
+       if (!torture_open_connection(&cli1, 0)) {
+               use_level_II_oplocks = false;
+               use_oplocks = saved_use_oplocks;
+               return false;
+       }
+
+       if (!torture_open_connection(&cli2, 1)) {
+               use_level_II_oplocks = false;
+               use_oplocks = saved_use_oplocks;
+               return false;
+       }
+
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli1, fname_ln, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       cli_sockopt(cli1, sockops);
+       cli_sockopt(cli2, sockops);
+
+       /* Create the file. */
+       if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) {
+               printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
+               return false;
+       }
+
+       if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
+               printf("close1 failed (%s)\n", cli_errstr(cli1));
+               return false;
+       }
+
+       /* Now create a hardlink. */
+       if (!NT_STATUS_IS_OK(cli_nt_hardlink(cli1, fname, fname_ln))) {
+               printf("nt hardlink failed (%s)\n", cli_errstr(cli1));
+               return false;
+       }
+
+       /* Prove that opening hardlinks cause deny modes to conflict. */
+       if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR, DENY_ALL, &fnum1))) {
+               printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
+               return false;
+       }
+
+       status = cli_open(cli1, fname_ln, O_RDWR, DENY_NONE, &fnum2);
+       if (NT_STATUS_IS_OK(status)) {
+               printf("open of %s succeeded - should fail with sharing violation.\n",
+                       fname_ln);
+               return false;
+       }
+
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_SHARING_VIOLATION)) {
+               printf("open of %s should fail with sharing violation. Got %s\n",
+                       fname_ln, nt_errstr(status));
+               return false;
+       }
+
+       if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
+               printf("close1 failed (%s)\n", cli_errstr(cli1));
+               return false;
+       }
+
+       cli1->use_oplocks = true;
+       cli1->use_level_II_oplocks = true;
+
+       cli2->use_oplocks = true;
+       cli2->use_level_II_oplocks = true;
+
+       cli_oplock_handler(cli1, oplock4_handler);
+       if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR, DENY_NONE, &fnum1))) {
+               printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
+               return false;
+       }
+
+       if (fork() == 0) {
+               /* Child code */
+               if (!NT_STATUS_IS_OK(cli_open(cli2, fname_ln, O_RDWR, DENY_NONE, &fnum2))) {
+                       printf("open of %s failed (%s)\n", fname_ln, cli_errstr(cli1));
+                       *oplock4_shared_correct = false;
+                       exit(0);
+               }
+
+               if (!NT_STATUS_IS_OK(cli_close(cli2, fnum2))) {
+                       printf("close2 failed (%s)\n", cli_errstr(cli1));
+                       *oplock4_shared_correct = false;
+               }
+
+               exit(0);
+       }
+
+       sleep(2);
+
+       /* Process the oplock break. */
+       cli_receive_smb(cli1);
+
+       if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
+               printf("close1 failed (%s)\n", cli_errstr(cli1));
+               correct = false;
+       }
+
+       if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
+               printf("unlink failed (%s)\n", cli_errstr(cli1));
+               correct = false;
+       }
+       if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname_ln, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
+               printf("unlink failed (%s)\n", cli_errstr(cli1));
+               correct = false;
+       }
+
+       if (!torture_close_connection(cli1)) {
+               correct = false;
+       }
+
+       if (!*oplock4_shared_correct) {
+               correct = false;
+       }
+
+       printf("finished oplock test 4\n");
+
+       return correct;
+}
+
 
-
 /*
   Test delete on close semantics.
  */
@@ -3062,7 +3658,7 @@ static bool run_deletetest(int dummy)
        /* Test 1 - this should delete the file on close. */
 
        cli_setatr(cli1, fname, 0, 0);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS|DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL,
                                   0, FILE_OVERWRITE_IF, 
@@ -3072,17 +3668,6 @@ static bool run_deletetest(int dummy)
                goto fail;
        }
 
-#if 0 /* JRATEST */
-        {
-                uint32 *accinfo = NULL;
-                uint32 len;
-                cli_qfileinfo_test(cli1, fnum1, SMB_FILE_ACCESS_INFORMATION, (char **)&accinfo, &len);
-               if (accinfo)
-                       printf("access mode = 0x%lx\n", *accinfo);
-                SAFE_FREE(accinfo);
-        }
-#endif
-
        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
                printf("[1] close failed (%s)\n", cli_errstr(cli1));
                correct = False;
@@ -3100,7 +3685,7 @@ static bool run_deletetest(int dummy)
        /* Test 2 - this should delete the file on close. */
 
        cli_setatr(cli1, fname, 0, 0);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS,
                                   FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, 
@@ -3129,13 +3714,13 @@ static bool run_deletetest(int dummy)
                        correct = False;
                        goto fail;
                }
-               cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+               cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        } else
                printf("second delete on close test succeeded.\n");
 
        /* Test 3 - ... */
        cli_setatr(cli1, fname, 0, 0);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
@@ -3188,7 +3773,7 @@ static bool run_deletetest(int dummy)
                if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
                        printf("[3] close failed (%s)\n", cli_errstr(cli1));
                }
-               cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+               cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
                correct = False;
                goto fail;
        } else
@@ -3196,7 +3781,7 @@ static bool run_deletetest(int dummy)
 
        /* Test 4 ... */
        cli_setatr(cli1, fname, 0, 0);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
                        FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
@@ -3243,7 +3828,7 @@ static bool run_deletetest(int dummy)
 
        /* Test 5 ... */
        cli_setatr(cli1, fname, 0, 0);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT, DENY_NONE, &fnum1))) {
                printf("[5] open of %s failed (%s)\n", fname, cli_errstr(cli1));
@@ -3269,7 +3854,7 @@ static bool run_deletetest(int dummy)
 
        /* Test 6 ... */
        cli_setatr(cli1, fname, 0, 0);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA,
                                   FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
@@ -3297,7 +3882,7 @@ static bool run_deletetest(int dummy)
 
        /* Test 7 ... */
        cli_setatr(cli1, fname, 0, 0);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
                                   FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
@@ -3342,7 +3927,7 @@ static bool run_deletetest(int dummy)
 
        /* Test 7 ... */
        cli_setatr(cli1, fname, 0, 0);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!torture_open_connection(&cli2, 1)) {
                printf("[8] failed to open second connection.\n");
@@ -3427,7 +4012,7 @@ static bool run_deletetest(int dummy)
                printf("tenth delete on close test succeeded.\n");
 
        cli_setatr(cli1, fname, 0, 0);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        /* What error do we get when attempting to open a read-only file with
           delete access ? */
@@ -3475,7 +4060,7 @@ static bool run_deletetest(int dummy)
        if (fnum1 != (uint16_t)-1) cli_close(cli1, fnum1);
        if (fnum2 != (uint16_t)-1) cli_close(cli1, fnum2);
        cli_setatr(cli1, fname, 0, 0);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (cli1 && !torture_close_connection(cli1)) {
                correct = False;
@@ -3486,6 +4071,116 @@ static bool run_deletetest(int dummy)
        return correct;
 }
 
+static bool run_deletetest_ln(int dummy)
+{
+       struct cli_state *cli;
+       const char *fname = "\\delete1";
+       const char *fname_ln = "\\delete1_ln";
+       uint16_t fnum;
+       uint16_t fnum1;
+       NTSTATUS status;
+       bool correct = true;
+       time_t t;
+
+       printf("starting deletetest-ln\n");
+
+       if (!torture_open_connection(&cli, 0)) {
+               return false;
+       }
+
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli, fname_ln, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       cli_sockopt(cli, sockops);
+
+       /* Create the file. */
+       if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum))) {
+               printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
+               return false;
+       }
+
+       if (!NT_STATUS_IS_OK(cli_close(cli, fnum))) {
+               printf("close1 failed (%s)\n", cli_errstr(cli));
+               return false;
+       }
+
+       /* Now create a hardlink. */
+       if (!NT_STATUS_IS_OK(cli_nt_hardlink(cli, fname, fname_ln))) {
+               printf("nt hardlink failed (%s)\n", cli_errstr(cli));
+               return false;
+       }
+
+       /* Open the original file. */
+       status = cli_ntcreate(cli, fname, 0, FILE_READ_DATA,
+                       FILE_ATTRIBUTE_NORMAL,
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                       FILE_OPEN_IF, 0, 0, &fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ntcreate of %s failed (%s)\n", fname, nt_errstr(status));
+               return false;
+       }
+
+       /* Unlink the hard link path. */
+       status = cli_ntcreate(cli, fname_ln, 0, DELETE_ACCESS,
+                       FILE_ATTRIBUTE_NORMAL,
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                       FILE_OPEN_IF, 0, 0, &fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ntcreate of %s failed (%s)\n", fname_ln, nt_errstr(status));
+               return false;
+       }
+       status = cli_nt_delete_on_close(cli, fnum1, true);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_printf("(%s) failed to set delete_on_close %s: %s\n",
+                       __location__, fname_ln, nt_errstr(status));
+               return false;
+       }
+
+       status = cli_close(cli, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close %s failed (%s)\n",
+                       fname_ln, nt_errstr(status));
+               return false;
+       }
+
+       status = cli_close(cli, fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close %s failed (%s)\n",
+                       fname, nt_errstr(status));
+               return false;
+       }
+
+       /* Ensure the original file is still there. */
+        status = cli_getatr(cli, fname, NULL, NULL, &t);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("%s getatr on file %s failed (%s)\n",
+                       __location__,
+                       fname,
+                       nt_errstr(status));
+                correct = False;
+        }
+
+       /* Ensure the link path is gone. */
+       status = cli_getatr(cli, fname_ln, NULL, NULL, &t);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+                printf("%s, getatr for file %s returned wrong error code %s "
+                       "- should have been deleted\n",
+                       __location__,
+                       fname_ln, nt_errstr(status));
+                correct = False;
+        }
+
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli, fname_ln, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       if (!torture_close_connection(cli)) {
+               correct = false;
+       }
+
+       printf("finished deletetest-ln\n");
+
+       return correct;
+}
 
 /*
   print out server properties
@@ -3584,6 +4279,7 @@ static bool run_rename(int dummy)
        const char *fname1 = "\\test1.txt";
        bool correct = True;
        uint16_t fnum1;
+       uint16_t attr;
        NTSTATUS status;
 
        printf("starting rename test\n");
@@ -3592,8 +4288,8 @@ static bool run_rename(int dummy)
                return False;
        }
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-       cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_READ, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
                printf("First open failed - %s\n", cli_errstr(cli1));
@@ -3612,8 +4308,8 @@ static bool run_rename(int dummy)
                return False;
        }
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-       cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        status = cli_ntcreate(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
 #if 0
                              FILE_SHARE_DELETE|FILE_SHARE_NONE,
@@ -3638,8 +4334,8 @@ static bool run_rename(int dummy)
                return False;
        }
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-       cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, READ_CONTROL_ACCESS, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
@@ -3681,8 +4377,8 @@ static bool run_rename(int dummy)
                return False;
        }
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-       cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         /*----*/
 
@@ -3704,8 +4400,8 @@ static bool run_rename(int dummy)
                return False;
        }
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-       cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         /*--*/
 
@@ -3738,15 +4434,32 @@ static bool run_rename(int dummy)
           } */
 
         /*--*/
-
-
        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
                printf("close - 5 failed (%s)\n", cli_errstr(cli1));
                return False;
        }
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-       cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
+       /* Check that the renamed file has FILE_ATTRIBUTE_ARCHIVE. */
+       if (!NT_STATUS_IS_OK(cli_getatr(cli1, fname1, &attr, NULL, NULL))) {
+               printf("getatr on file %s failed - %s ! \n",
+                       fname1,
+                       cli_errstr(cli1));
+               correct = False;
+       } else {
+               if (attr != FILE_ATTRIBUTE_ARCHIVE) {
+                       printf("Renamed file %s has wrong attr 0x%x "
+                               "(should be 0x%x)\n",
+                               fname1,
+                               attr,
+                               (unsigned int)FILE_ATTRIBUTE_ARCHIVE);
+                       correct = False;
+               } else {
+                       printf("Renamed file %s has archive bit set\n", fname1);
+               }
+       }
+
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!torture_close_connection(cli1)) {
                correct = False;
@@ -3796,6 +4509,7 @@ static bool run_opentest(int dummy)
        SMB_OFF_T fsize;
        bool correct = True;
        char *tmp_path;
+       NTSTATUS status;
 
        printf("starting open test\n");
 
@@ -3804,7 +4518,7 @@ static bool run_opentest(int dummy)
        }
 
        cli_setatr(cli1, fname, 0, 0);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        cli_sockopt(cli1, sockops);
 
@@ -3818,7 +4532,7 @@ static bool run_opentest(int dummy)
                return False;
        }
 
-       if (!NT_STATUS_IS_OK(cli_setatr(cli1, fname, aRONLY, 0))) {
+       if (!NT_STATUS_IS_OK(cli_setatr(cli1, fname, FILE_ATTRIBUTE_READONLY, 0))) {
                printf("cli_setatr failed (%s)\n", cli_errstr(cli1));
                return False;
        }
@@ -3862,7 +4576,7 @@ static bool run_opentest(int dummy)
                return False;
        }
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        printf("finished open test 2\n");
 
@@ -3877,8 +4591,9 @@ static bool run_opentest(int dummy)
 
        memset(buf, '\0', 20);
 
-       if (cli_write(cli1, fnum1, 0, buf, 0, 20) != 20) {
-               printf("write failed (%s)\n", cli_errstr(cli1));
+       status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 0, 20, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("write failed (%s)\n", nt_errstr(status));
                correct = False;
        }
 
@@ -3922,10 +4637,9 @@ static bool run_opentest(int dummy)
        }
        printf("finished open test 3\n");
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
-       printf("testing ctemp\n");
+       printf("Do ctemp tests\n");
        if (!NT_STATUS_IS_OK(cli_ctemp(cli1, talloc_tos(), "\\", &fnum1, &tmp_path))) {
                printf("ctemp failed (%s)\n", cli_errstr(cli1));
                return False;
@@ -3934,7 +4648,7 @@ static bool run_opentest(int dummy)
        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
                printf("close of temp failed (%s)\n", cli_errstr(cli1));
        }
-       if (!NT_STATUS_IS_OK(cli_unlink(cli1, tmp_path, aSYSTEM | aHIDDEN))) {
+       if (!NT_STATUS_IS_OK(cli_unlink(cli1, tmp_path, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                printf("unlink of temp failed (%s)\n", cli_errstr(cli1));
        }
 
@@ -3945,7 +4659,7 @@ static bool run_opentest(int dummy)
        }
 
        cli_setatr(cli2, fname, 0, 0);
-       cli_unlink(cli2, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli2, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        cli_sockopt(cli2, sockops);
 
@@ -3953,129 +4667,129 @@ static bool run_opentest(int dummy)
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-               printf("test 1 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #1 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_NONE, FILE_OPEN_IF, 0, 0, &fnum2))) {
-               printf("test 1 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+               printf("TEST #1 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                return False;
        }
 
        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-               printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
        if (!NT_STATUS_IS_OK(cli_close(cli2, fnum2))) {
-               printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+               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, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        printf("TEST #2 testing 2 non-io opens (first with delete)\n");
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-               printf("test 2 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #2 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_NONE, FILE_OPEN_IF, 0, 0, &fnum2))) {
-               printf("test 2 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+               printf("TEST #2 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                return False;
        }
 
        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-               printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #2 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
        if (!NT_STATUS_IS_OK(cli_close(cli2, fnum2))) {
-               printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #2 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, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        printf("TEST #3 testing 2 non-io opens (second with delete)\n");
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-               printf("test 3 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #3 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_NONE, FILE_OPEN_IF, 0, 0, &fnum2))) {
-               printf("test 3 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+               printf("TEST #3 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                return False;
        }
 
        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-               printf("test 3 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #3 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
        if (!NT_STATUS_IS_OK(cli_close(cli2, fnum2))) {
-               printf("test 3 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+               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, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        printf("TEST #4 testing 2 non-io opens (both with delete)\n");
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-               printf("test 4 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #4 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
 
        if (NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_NONE, FILE_OPEN_IF, 0, 0, &fnum2))) {
-               printf("test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2));
+               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");
+       printf("TEST #4 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2), "sharing violation");
 
        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-               printf("test 4 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               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, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        printf("TEST #5 testing 2 non-io opens (both with delete - both with file share delete)\n");
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_DELETE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-               printf("test 5 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #5 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_DELETE, FILE_OPEN_IF, 0, 0, &fnum2))) {
-               printf("test 5 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+               printf("TEST #5 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                return False;
        }
 
        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-               printf("test 5 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #5 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
 
        if (!NT_STATUS_IS_OK(cli_close(cli2, fnum2))) {
-               printf("test 5 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+               printf("TEST #5 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                return False;
        }
 
@@ -4083,27 +4797,27 @@ static bool run_opentest(int dummy)
 
        printf("TEST #6 testing 1 non-io open, one io open\n");
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-               printf("test 6 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #6 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_READ, FILE_OPEN_IF, 0, 0, &fnum2))) {
-               printf("test 6 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+               printf("TEST #6 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                return False;
        }
 
        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-               printf("test 6 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #6 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
 
        if (!NT_STATUS_IS_OK(cli_close(cli2, fnum2))) {
-               printf("test 6 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+               printf("TEST #6 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                return False;
        }
 
@@ -4111,30 +4825,57 @@ static bool run_opentest(int dummy)
 
        printf("TEST #7 testing 1 non-io open, one io open with delete\n");
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-               printf("test 7 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #7 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
 
        if (NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                   FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_OPEN_IF, 0, 0, &fnum2))) {
-               printf("test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2));
+               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");
+       printf("TEST #7 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2), "sharing violation");
 
        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-               printf("test 7 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+               printf("TEST #7 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                return False;
        }
 
        printf("non-io open test #7 passed.\n");
 
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       printf("TEST #8 testing open without WRITE_ATTRIBUTES, updating close write time.\n");
+       status = cli_ntcreate(cli1, fname, 0, FILE_WRITE_DATA, FILE_ATTRIBUTE_NORMAL,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                               FILE_OVERWRITE_IF, 0, 0, &fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #8 open of %s failed (%s)\n", fname, nt_errstr(status));
+               correct = false;
+               goto out;
+       }
+
+       /* Write to ensure we have to update the file time. */
+       status = cli_writeall(cli1, fnum1, 0, (const uint8_t *)"TEST DATA\n", 0, 10,
+                             NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #8 cli_write failed: %s\n", nt_errstr(status));
+               correct = false;
+               goto out;
+       }
+
+        status = cli_close(cli1, fnum1);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("TEST #8 close of %s failed (%s)\n", fname, nt_errstr(status));
+               correct = false;
+        }
+
+  out:
 
        if (!torture_close_connection(cli1)) {
                correct = False;
@@ -4146,6 +4887,36 @@ static bool run_opentest(int dummy)
        return correct;
 }
 
+NTSTATUS torture_setup_unix_extensions(struct cli_state *cli)
+{
+       uint16 major, minor;
+       uint32 caplow, caphigh;
+       NTSTATUS status;
+
+       if (!SERVER_HAS_UNIX_CIFS(cli)) {
+               printf("Server doesn't support UNIX CIFS extensions.\n");
+               return NT_STATUS_NOT_SUPPORTED;
+       }
+
+       status = cli_unix_extensions_version(cli, &major, &minor, &caplow,
+                                            &caphigh);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Server didn't return UNIX CIFS extensions: %s\n",
+                      nt_errstr(status));
+               return status;
+       }
+
+       status = cli_set_unix_extensions_capabilities(cli, major, minor,
+                                                     caplow, caphigh);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Server doesn't support setting UNIX CIFS extensions: "
+                      "%s.\n", nt_errstr(status));
+               return status;
+        }
+
+       return NT_STATUS_OK;
+}
+
 /*
   Test POSIX open /mkdir calls.
  */
@@ -4158,11 +4929,10 @@ static bool run_simple_posix_open_test(int dummy)
        const char *dname = "posix:dir";
        char buf[10];
        char namebuf[11];
-       uint16 major, minor;
-       uint32 caplow, caphigh;
        uint16_t fnum1 = (uint16_t)-1;
        SMB_STRUCT_STAT sbuf;
        bool correct = false;
+       NTSTATUS status;
 
        printf("Starting simple POSIX open test\n");
 
@@ -4172,23 +4942,11 @@ static bool run_simple_posix_open_test(int dummy)
 
        cli_sockopt(cli1, sockops);
 
-       if (!SERVER_HAS_UNIX_CIFS(cli1)) {
-               printf("Server doesn't support UNIX CIFS extensions.\n");
-               return false;
-       }
-
-       if (!cli_unix_extensions_version(cli1, &major,
-                       &minor, &caplow, &caphigh)) {
-               printf("Server didn't return UNIX CIFS extensions.\n");
+       status = torture_setup_unix_extensions(cli1);
+       if (!NT_STATUS_IS_OK(status)) {
                return false;
        }
 
-       if (!cli_set_unix_extensions_capabilities(cli1,
-                       major, minor, caplow, caphigh)) {
-               printf("Server doesn't support setting UNIX CIFS extensions.\n");
-               return false;
-        }
-
        cli_setatr(cli1, fname, 0, 0);
        cli_posix_unlink(cli1, fname);
        cli_setatr(cli1, dname, 0, 0);
@@ -4260,8 +5018,71 @@ static bool run_simple_posix_open_test(int dummy)
                goto out;
        }
 
-       /* What happens when we try and POSIX open a directory ? */
-       if (NT_STATUS_IS_OK(cli_posix_open(cli1, dname, O_RDONLY, 0, &fnum1))) {
+       /* Create again to test open with O_TRUNC. */
+       if (!NT_STATUS_IS_OK(cli_posix_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, 0600, &fnum1))) {
+               printf("POSIX create of %s failed (%s)\n", fname, cli_errstr(cli1));
+               goto out;
+       }
+
+       /* Test ftruncate - set file size. */
+       if (!NT_STATUS_IS_OK(cli_ftruncate(cli1, fnum1, 1000))) {
+               printf("ftruncate failed (%s)\n", cli_errstr(cli1));
+               goto out;
+       }
+
+       /* Ensure st_size == 1000 */
+       if (!NT_STATUS_IS_OK(cli_posix_stat(cli1, fname, &sbuf))) {
+               printf("stat failed (%s)\n", cli_errstr(cli1));
+               goto out;
+       }
+
+       if (sbuf.st_ex_size != 1000) {
+               printf("ftruncate - stat size (%u) != 1000\n", (unsigned int)sbuf.st_ex_size);
+               goto out;
+       }
+
+       if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
+               printf("close(2) failed (%s)\n", cli_errstr(cli1));
+               goto out;
+       }
+
+       /* Re-open with O_TRUNC. */
+       if (!NT_STATUS_IS_OK(cli_posix_open(cli1, fname, O_WRONLY|O_TRUNC, 0600, &fnum1))) {
+               printf("POSIX create of %s failed (%s)\n", fname, cli_errstr(cli1));
+               goto out;
+       }
+
+       /* Ensure st_size == 0 */
+       if (!NT_STATUS_IS_OK(cli_posix_stat(cli1, fname, &sbuf))) {
+               printf("stat failed (%s)\n", cli_errstr(cli1));
+               goto out;
+       }
+
+       if (sbuf.st_ex_size != 0) {
+               printf("O_TRUNC - stat size (%u) != 0\n", (unsigned int)sbuf.st_ex_size);
+               goto out;
+       }
+
+       if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
+               printf("close failed (%s)\n", cli_errstr(cli1));
+               goto out;
+       }
+
+       if (!NT_STATUS_IS_OK(cli_posix_unlink(cli1, fname))) {
+               printf("POSIX unlink of %s failed (%s)\n", fname, cli_errstr(cli1));
+               goto out;
+       }
+
+       if (!NT_STATUS_IS_OK(cli_posix_open(cli1, dname, O_RDONLY, 0, &fnum1))) {
+               printf("POSIX open directory O_RDONLY of %s failed (%s)\n",
+                       dname, cli_errstr(cli1));
+               goto out;
+       }
+
+       cli_close(cli1, fnum1);
+
+       /* What happens when we try and POSIX open a directory for write ? */
+       if (NT_STATUS_IS_OK(cli_posix_open(cli1, dname, O_RDWR, 0, &fnum1))) {
                printf("POSIX open of directory %s succeeded, should have failed.\n", fname);
                goto out;
        } else {
@@ -4278,8 +5099,10 @@ static bool run_simple_posix_open_test(int dummy)
        }
 
        /* Write some data into it. */
-       if (cli_write(cli1, fnum1, 0, "TEST DATA\n", 0, 10) != 10) {
-               printf("cli_write failed: %s\n", cli_errstr(cli1));
+       status = cli_writeall(cli1, fnum1, 0, (const uint8_t *)"TEST DATA\n", 0, 10,
+                             NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_write failed: %s\n", nt_errstr(status));
                goto out;
        }
 
@@ -4461,7 +5284,7 @@ static bool run_openattrtest(int dummy)
 
        for (k = 0, i = 0; i < sizeof(open_attrs_table)/sizeof(uint32); i++) {
                cli_setatr(cli1, fname, 0, 0);
-               cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+               cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
                if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_WRITE_DATA, open_attrs_table[i],
                                   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
                        printf("open %d (1) of %s failed (%s)\n", i, fname, cli_errstr(cli1));
@@ -4533,7 +5356,7 @@ static bool run_openattrtest(int dummy)
        }
 
        cli_setatr(cli1, fname, 0, 0);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        printf("open attr test %s.\n", correct ? "passed" : "failed");
 
@@ -4543,9 +5366,14 @@ static bool run_openattrtest(int dummy)
        return correct;
 }
 
-static void list_fn(const char *mnt, file_info *finfo, const char *name, void *state)
+static NTSTATUS list_fn(const char *mnt, struct file_info *finfo,
+                   const char *name, void *state)
 {
-
+       int *matched = (int *)state;
+       if (matched != NULL) {
+               *matched += 1;
+       }
+       return NT_STATUS_OK;
 }
 
 /*
@@ -4556,8 +5384,9 @@ static bool run_dirtest(int dummy)
        int i;
        static struct cli_state *cli;
        uint16_t fnum;
-       double t1;
+       struct timeval core_start;
        bool correct = True;
+       int matched;
 
        printf("starting directory test\n");
 
@@ -4578,19 +5407,27 @@ static bool run_dirtest(int dummy)
                cli_close(cli, fnum);
        }
 
-       t1 = end_timer();
+       core_start = timeval_current();
 
-       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));
+       matched = 0;
+       cli_list(cli, "a*.*", 0, list_fn, &matched);
+       printf("Matched %d\n", matched);
+
+       matched = 0;
+       cli_list(cli, "b*.*", 0, list_fn, &matched);
+       printf("Matched %d\n", matched);
+
+       matched = 0;
+       cli_list(cli, "xyzabc", 0, list_fn, &matched);
+       printf("Matched %d\n", matched);
 
-       printf("dirtest core %g seconds\n", end_timer() - t1);
+       printf("dirtest core %g seconds\n", timeval_elapsed(&core_start));
 
        srandom(0);
        for (i=0;i<torture_numops;i++) {
                fstring fname;
                slprintf(fname, sizeof(fname), "\\%x", (int)random());
-               cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+               cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        }
 
        if (!torture_close_connection(cli)) {
@@ -4602,22 +5439,24 @@ static bool run_dirtest(int dummy)
        return correct;
 }
 
-static void del_fn(const char *mnt, file_info *finfo, const char *mask, void *state)
+static NTSTATUS del_fn(const char *mnt, struct file_info *finfo, const char *mask,
+                  void *state)
 {
        struct cli_state *pcli = (struct cli_state *)state;
        fstring fname;
        slprintf(fname, sizeof(fname), "\\LISTDIR\\%s", finfo->name);
 
        if (strcmp(finfo->name, ".") == 0 || strcmp(finfo->name, "..") == 0)
-               return;
+               return NT_STATUS_OK;
 
-       if (finfo->mode & aDIR) {
+       if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) {
                if (!NT_STATUS_IS_OK(cli_rmdir(pcli, fname)))
                        printf("del_fn: failed to rmdir %s\n,", fname );
        } else {
-               if (!NT_STATUS_IS_OK(cli_unlink(pcli, fname, aSYSTEM | aHIDDEN)))
+               if (!NT_STATUS_IS_OK(cli_unlink(pcli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN)))
                        printf("del_fn: failed to unlink %s\n,", fname );
        }
+       return NT_STATUS_OK;
 }
 
 
@@ -4639,7 +5478,7 @@ bool torture_ioctl_test(int dummy)
 
        printf("starting ioctl test\n");
 
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
        if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum))) {
                printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
@@ -4647,13 +5486,13 @@ bool torture_ioctl_test(int dummy)
        }
 
        status = cli_raw_ioctl(cli, fnum, 0x2d0000 | (0x0420<<2), &blob);
-       printf("ioctl device info: %s\n", cli_errstr(cli));
+       printf("ioctl device info: %s\n", nt_errstr(status));
 
        status = cli_raw_ioctl(cli, fnum, IOCTL_QUERY_JOB_INFO, &blob);
-       printf("ioctl job info: %s\n", cli_errstr(cli));
+       printf("ioctl job info: %s\n", nt_errstr(status));
 
        for (device=0;device<0x100;device++) {
-               printf("testing device=0x%x\n", device);
+               printf("ioctl test with device = 0x%x\n", device);
                for (function=0;function<0x100;function++) {
                        uint32 code = (device<<16) | function;
 
@@ -4692,7 +5531,7 @@ bool torture_chkpath_test(int dummy)
 
        /* cleanup from an old run */
        cli_rmdir(cli, "\\chkpath.dir\\dir2");
-       cli_unlink(cli, "\\chkpath.dir\\*", aSYSTEM | aHIDDEN);
+       cli_unlink(cli, "\\chkpath.dir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        cli_rmdir(cli, "\\chkpath.dir");
 
        if (!NT_STATUS_IS_OK(cli_mkdir(cli, "\\chkpath.dir"))) {
@@ -4746,7 +5585,7 @@ bool torture_chkpath_test(int dummy)
        }
 
        cli_rmdir(cli, "\\chkpath.dir\\dir2");
-       cli_unlink(cli, "\\chkpath.dir\\*", aSYSTEM | aHIDDEN);
+       cli_unlink(cli, "\\chkpath.dir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        cli_rmdir(cli, "\\chkpath.dir");
 
        if (!torture_close_connection(cli)) {
@@ -4766,6 +5605,7 @@ static bool run_eatest(int dummy)
        size_t num_eas;
        struct ea_struct *ea_list = NULL;
        TALLOC_CTX *mem_ctx = talloc_init("eatest");
+       NTSTATUS status;
 
        printf("starting eatest\n");
 
@@ -4774,7 +5614,7 @@ static bool run_eatest(int dummy)
                return False;
        }
 
-       cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        if (!NT_STATUS_IS_OK(cli_ntcreate(cli, fname, 0,
                                   FIRST_DESIRED_ACCESS, FILE_ATTRIBUTE_ARCHIVE,
                                   FILE_SHARE_NONE, FILE_OVERWRITE_IF, 
@@ -4789,8 +5629,10 @@ static bool run_eatest(int dummy)
 
                slprintf(ea_name, sizeof(ea_name), "EA_%d", i);
                memset(ea_val, (char)i+1, i+1);
-               if (!cli_set_ea_fnum(cli, fnum, ea_name, ea_val, i+1)) {
-                       printf("ea_set of name %s failed - %s\n", ea_name, cli_errstr(cli));
+               status = cli_set_ea_fnum(cli, fnum, ea_name, ea_val, i+1);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("ea_set of name %s failed - %s\n", ea_name,
+                              nt_errstr(status));
                        talloc_destroy(mem_ctx);
                        return False;
                }
@@ -4802,15 +5644,18 @@ static bool run_eatest(int dummy)
 
                slprintf(ea_name, sizeof(ea_name), "EA_%d", i+10);
                memset(ea_val, (char)i+1, i+1);
-               if (!cli_set_ea_path(cli, fname, ea_name, ea_val, i+1)) {
-                       printf("ea_set of name %s failed - %s\n", ea_name, cli_errstr(cli));
+               status = cli_set_ea_path(cli, fname, ea_name, ea_val, i+1);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("ea_set of name %s failed - %s\n", ea_name,
+                              nt_errstr(status));
                        talloc_destroy(mem_ctx);
                        return False;
                }
        }
 
-       if (!cli_get_ea_list_path(cli, fname, mem_ctx, &num_eas, &ea_list)) {
-               printf("ea_get list failed - %s\n", cli_errstr(cli));
+       status = cli_get_ea_list_path(cli, fname, mem_ctx, &num_eas, &ea_list);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ea_get list failed - %s\n", nt_errstr(status));
                correct = False;
        }
 
@@ -4836,16 +5681,19 @@ static bool run_eatest(int dummy)
        for (i = 0; i < 20; i++) {
                fstring ea_name;
                slprintf(ea_name, sizeof(ea_name), "ea_%d", i);
-               if (!cli_set_ea_path(cli, fname, ea_name, "", 0)) {
-                       printf("ea_set of name %s failed - %s\n", ea_name, cli_errstr(cli));
+               status = cli_set_ea_path(cli, fname, ea_name, "", 0);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("ea_set of name %s failed - %s\n", ea_name,
+                              nt_errstr(status));
                        talloc_destroy(mem_ctx);
                        return False;
                }
        }
 #endif
 
-       if (!cli_get_ea_list_path(cli, fname, mem_ctx, &num_eas, &ea_list)) {
-               printf("ea_get list failed - %s\n", cli_errstr(cli));
+       status = cli_get_ea_list_path(cli, fname, mem_ctx, &num_eas, &ea_list);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ea_get list failed - %s\n", nt_errstr(status));
                correct = False;
        }
 
@@ -4862,8 +5710,10 @@ static bool run_eatest(int dummy)
        }
 
        /* Try and delete a non existant EA. */
-       if (!cli_set_ea_path(cli, fname, "foo", "", 0)) {
-               printf("deleting non-existant EA 'foo' should succeed. %s\n", cli_errstr(cli));
+       status = cli_set_ea_path(cli, fname, "foo", "", 0);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("deleting non-existant EA 'foo' should succeed. %s\n",
+                      nt_errstr(status));
                correct = False;
        }
 
@@ -4892,7 +5742,7 @@ static bool run_dirtest1(int dummy)
        cli_sockopt(cli, sockops);
 
        cli_list(cli, "\\LISTDIR\\*", 0, del_fn, cli);
-       cli_list(cli, "\\LISTDIR\\*", aDIR, del_fn, cli);
+       cli_list(cli, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, del_fn, cli);
        cli_rmdir(cli, "\\LISTDIR");
        cli_mkdir(cli, "\\LISTDIR");
 
@@ -4917,7 +5767,8 @@ static bool run_dirtest1(int dummy)
        }
 
        /* Now ensure that doing an old list sees both files and directories. */
-       num_seen = cli_list_old(cli, "\\LISTDIR\\*", aDIR, list_fn, NULL);
+       num_seen = 0;
+       cli_list_old(cli, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, list_fn, &num_seen);
        printf("num_seen = %d\n", num_seen );
        /* We should see 100 files + 1000 directories + . and .. */
        if (num_seen != 2002)
@@ -4926,19 +5777,21 @@ static bool run_dirtest1(int dummy)
        /* Ensure if we have the "must have" bits we only see the
         * relevent entries.
         */
-       num_seen = cli_list_old(cli, "\\LISTDIR\\*", (aDIR<<8)|aDIR, list_fn, NULL);
+       num_seen = 0;
+       cli_list_old(cli, "\\LISTDIR\\*", (FILE_ATTRIBUTE_DIRECTORY<<8)|FILE_ATTRIBUTE_DIRECTORY, list_fn, &num_seen);
        printf("num_seen = %d\n", num_seen );
        if (num_seen != 1002)
                correct = False;
 
-       num_seen = cli_list_old(cli, "\\LISTDIR\\*", (aARCH<<8)|aDIR, list_fn, NULL);
+       num_seen = 0;
+       cli_list_old(cli, "\\LISTDIR\\*", (FILE_ATTRIBUTE_ARCHIVE<<8)|FILE_ATTRIBUTE_DIRECTORY, list_fn, &num_seen);
        printf("num_seen = %d\n", num_seen );
        if (num_seen != 1000)
                correct = False;
 
        /* Delete everything. */
        cli_list(cli, "\\LISTDIR\\*", 0, del_fn, cli);
-       cli_list(cli, "\\LISTDIR\\*", aDIR, del_fn, cli);
+       cli_list(cli, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, del_fn, cli);
        cli_rmdir(cli, "\\LISTDIR");
 
 #if 0
@@ -5057,14 +5910,14 @@ static bool run_error_map_extract(int dummy) {
 
                if (NT_STATUS_V(nt_status) != error) { 
                        printf("/*\t{ This NT error code was 'sqashed'\n\t from %s to %s \n\t during the session setup }\n*/\n", 
-                              get_nt_error_c_code(NT_STATUS(error)), 
-                              get_nt_error_c_code(nt_status));
+                              get_nt_error_c_code(talloc_tos(), NT_STATUS(error)), 
+                              get_nt_error_c_code(talloc_tos(), nt_status));
                }
 
                printf("\t{%s,\t%s,\t%s},\n", 
                       smb_dos_err_class(errclass), 
                       smb_dos_err_name(errclass, errnum), 
-                      get_nt_error_c_code(NT_STATUS(error)));
+                      get_nt_error_c_code(talloc_tos(), NT_STATUS(error)));
        }
        return True;
 }
@@ -5103,9 +5956,10 @@ static bool run_sesssetup_bench(int dummy)
 
                d_printf("\r%d   ", (int)c->vuid);
 
-               if (!cli_ulogoff(c)) {
+               status = cli_ulogoff(c);
+               if (!NT_STATUS_IS_OK(status)) {
                        d_printf("(%s) cli_ulogoff failed: %s\n",
-                                __location__, cli_errstr(c));
+                                __location__, nt_errstr(status));
                        return false;
                }
                c->vuid = 0;
@@ -5193,7 +6047,7 @@ static bool run_chain1(int dummy)
 
 
        reqs[1] = cli_write_andx_create(talloc_tos(), evt, cli1, 0, 0,
-                                       (uint8_t *)str, 0, strlen(str)+1,
+                                       (const uint8_t *)str, 0, strlen(str)+1,
                                        smbreqs, 1, &smbreqs[1]);
        if (reqs[1] == NULL) return false;
        tevent_req_set_callback(reqs[1], chain1_write_completion, NULL);
@@ -5241,7 +6095,7 @@ static bool run_chain2(int dummy)
 
        printf("starting chain2 test\n");
        status = cli_start_connection(&cli1, global_myname(), host, NULL,
-                                     port_to_use, Undefined, 0, NULL);
+                                     port_to_use, Undefined, 0);
        if (!NT_STATUS_IS_OK(status)) {
                return False;
        }
@@ -5271,6 +6125,409 @@ static bool run_chain2(int dummy)
        return True;
 }
 
+
+struct torture_createdel_state {
+       struct tevent_context *ev;
+       struct cli_state *cli;
+};
+
+static void torture_createdel_created(struct tevent_req *subreq);
+static void torture_createdel_closed(struct tevent_req *subreq);
+
+static struct tevent_req *torture_createdel_send(TALLOC_CTX *mem_ctx,
+                                                struct tevent_context *ev,
+                                                struct cli_state *cli,
+                                                const char *name)
+{
+       struct tevent_req *req, *subreq;
+       struct torture_createdel_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct torture_createdel_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->ev = ev;
+       state->cli = cli;
+
+       subreq = cli_ntcreate_send(
+               state, ev, cli, name, 0,
+               FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
+               FILE_ATTRIBUTE_NORMAL,
+               FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+               FILE_OPEN_IF, FILE_DELETE_ON_CLOSE, 0);
+
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, torture_createdel_created, req);
+       return req;
+}
+
+static void torture_createdel_created(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct torture_createdel_state *state = tevent_req_data(
+               req, struct torture_createdel_state);
+       NTSTATUS status;
+       uint16_t fnum;
+
+       status = cli_ntcreate_recv(subreq, &fnum);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("cli_ntcreate_recv returned %s\n",
+                          nt_errstr(status)));
+               tevent_req_nterror(req, status);
+               return;
+       }
+
+       subreq = cli_close_send(state, state->ev, state->cli, fnum);
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, torture_createdel_closed, req);
+}
+
+static void torture_createdel_closed(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       NTSTATUS status;
+
+       status = cli_close_recv(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("cli_close_recv returned %s\n", nt_errstr(status)));
+               tevent_req_nterror(req, status);
+               return;
+       }
+       tevent_req_done(req);
+}
+
+static NTSTATUS torture_createdel_recv(struct tevent_req *req)
+{
+       return tevent_req_simple_recv_ntstatus(req);
+}
+
+struct torture_createdels_state {
+       struct tevent_context *ev;
+       struct cli_state *cli;
+       const char *base_name;
+       int sent;
+       int received;
+       int num_files;
+       struct tevent_req **reqs;
+};
+
+static void torture_createdels_done(struct tevent_req *subreq);
+
+static struct tevent_req *torture_createdels_send(TALLOC_CTX *mem_ctx,
+                                                 struct tevent_context *ev,
+                                                 struct cli_state *cli,
+                                                 const char *base_name,
+                                                 int num_parallel,
+                                                 int num_files)
+{
+       struct tevent_req *req;
+       struct torture_createdels_state *state;
+       int i;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct torture_createdels_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->ev = ev;
+       state->cli = cli;
+       state->base_name = talloc_strdup(state, base_name);
+       if (tevent_req_nomem(state->base_name, req)) {
+               return tevent_req_post(req, ev);
+       }
+       state->num_files = MAX(num_parallel, num_files);
+       state->sent = 0;
+       state->received = 0;
+
+       state->reqs = talloc_array(state, struct tevent_req *, num_parallel);
+       if (tevent_req_nomem(state->reqs, req)) {
+               return tevent_req_post(req, ev);
+       }
+
+       for (i=0; i<num_parallel; i++) {
+               char *name;
+
+               name = talloc_asprintf(state, "%s%8.8d", state->base_name,
+                                      state->sent);
+               if (tevent_req_nomem(name, req)) {
+                       return tevent_req_post(req, ev);
+               }
+               state->reqs[i] = torture_createdel_send(
+                       state->reqs, state->ev, state->cli, name);
+               if (tevent_req_nomem(state->reqs[i], req)) {
+                       return tevent_req_post(req, ev);
+               }
+               name = talloc_move(state->reqs[i], &name);
+               tevent_req_set_callback(state->reqs[i],
+                                       torture_createdels_done, req);
+               state->sent += 1;
+       }
+       return req;
+}
+
+static void torture_createdels_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct torture_createdels_state *state = tevent_req_data(
+               req, struct torture_createdels_state);
+       size_t num_parallel = talloc_array_length(state->reqs);
+       NTSTATUS status;
+       char *name;
+       int i;
+
+       status = torture_createdel_recv(subreq);
+       if (!NT_STATUS_IS_OK(status)){
+               DEBUG(10, ("torture_createdel_recv returned %s\n",
+                          nt_errstr(status)));
+               TALLOC_FREE(subreq);
+               tevent_req_nterror(req, status);
+               return;
+       }
+
+       for (i=0; i<num_parallel; i++) {
+               if (subreq == state->reqs[i]) {
+                       break;
+               }
+       }
+       if (i == num_parallel) {
+               DEBUG(10, ("received something we did not send\n"));
+               tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
+               return;
+       }
+       TALLOC_FREE(state->reqs[i]);
+
+       if (state->sent >= state->num_files) {
+               tevent_req_done(req);
+               return;
+       }
+
+       name = talloc_asprintf(state, "%s%8.8d", state->base_name,
+                              state->sent);
+       if (tevent_req_nomem(name, req)) {
+               return;
+       }
+       state->reqs[i] = torture_createdel_send(state->reqs, state->ev,
+                                               state->cli, name);
+       if (tevent_req_nomem(state->reqs[i], req)) {
+               return;
+       }
+       name = talloc_move(state->reqs[i], &name);
+       tevent_req_set_callback(state->reqs[i], torture_createdels_done, req);
+       state->sent += 1;
+}
+
+static NTSTATUS torture_createdels_recv(struct tevent_req *req)
+{
+       return tevent_req_simple_recv_ntstatus(req);
+}
+
+struct swallow_notify_state {
+       struct tevent_context *ev;
+       struct cli_state *cli;
+       uint16_t fnum;
+       uint32_t completion_filter;
+       bool recursive;
+       bool (*fn)(uint32_t action, const char *name, void *priv);
+       void *priv;
+};
+
+static void swallow_notify_done(struct tevent_req *subreq);
+
+static struct tevent_req *swallow_notify_send(TALLOC_CTX *mem_ctx,
+                                             struct tevent_context *ev,
+                                             struct cli_state *cli,
+                                             uint16_t fnum,
+                                             uint32_t completion_filter,
+                                             bool recursive,
+                                             bool (*fn)(uint32_t action,
+                                                        const char *name,
+                                                        void *priv),
+                                             void *priv)
+{
+       struct tevent_req *req, *subreq;
+       struct swallow_notify_state *state;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct swallow_notify_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->ev = ev;
+       state->cli = cli;
+       state->fnum = fnum;
+       state->completion_filter = completion_filter;
+       state->recursive = recursive;
+       state->fn = fn;
+       state->priv = priv;
+
+       subreq = cli_notify_send(state, state->ev, state->cli, state->fnum,
+                                0xffff, state->completion_filter,
+                                state->recursive);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, swallow_notify_done, req);
+       return req;
+}
+
+static void swallow_notify_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct swallow_notify_state *state = tevent_req_data(
+               req, struct swallow_notify_state);
+       NTSTATUS status;
+       uint32_t i, num_changes;
+       struct notify_change *changes;
+
+       status = cli_notify_recv(subreq, state, &num_changes, &changes);
+       TALLOC_FREE(subreq);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("cli_notify_recv returned %s\n",
+                          nt_errstr(status)));
+               tevent_req_nterror(req, status);
+               return;
+       }
+
+       for (i=0; i<num_changes; i++) {
+               state->fn(changes[i].action, changes[i].name, state->priv);
+       }
+       TALLOC_FREE(changes);
+
+       subreq = cli_notify_send(state, state->ev, state->cli, state->fnum,
+                                0xffff, state->completion_filter,
+                                state->recursive);
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, swallow_notify_done, req);
+}
+
+static bool print_notifies(uint32_t action, const char *name, void *priv)
+{
+       if (DEBUGLEVEL > 5) {
+               d_printf("%d %s\n", (int)action, name);
+       }
+       return true;
+}
+
+static void notify_bench_done(struct tevent_req *req)
+{
+       int *num_finished = (int *)tevent_req_callback_data_void(req);
+       *num_finished += 1;
+}
+
+static bool run_notify_bench(int dummy)
+{
+       const char *dname = "\\notify-bench";
+       struct tevent_context *ev;
+       NTSTATUS status;
+       uint16_t dnum;
+       struct tevent_req *req1;
+       struct tevent_req *req2 = NULL;
+       int i, num_unc_names;
+       int num_finished = 0;
+
+       printf("starting notify-bench test\n");
+
+       if (use_multishare_conn) {
+               char **unc_list;
+               unc_list = file_lines_load(multishare_conn_fname,
+                                          &num_unc_names, 0, NULL);
+               if (!unc_list || num_unc_names <= 0) {
+                       d_printf("Failed to load unc names list from '%s'\n",
+                                multishare_conn_fname);
+                       return false;
+               }
+               TALLOC_FREE(unc_list);
+       } else {
+               num_unc_names = 1;
+       }
+
+       ev = tevent_context_init(talloc_tos());
+       if (ev == NULL) {
+               d_printf("tevent_context_init failed\n");
+               return false;
+       }
+
+       for (i=0; i<num_unc_names; i++) {
+               struct cli_state *cli;
+               char *base_fname;
+
+               base_fname = talloc_asprintf(talloc_tos(), "%s\\file%3.3d.",
+                                            dname, i);
+               if (base_fname == NULL) {
+                       return false;
+               }
+
+               if (!torture_open_connection(&cli, i)) {
+                       return false;
+               }
+
+               status = cli_ntcreate(cli, dname, 0,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     0, FILE_SHARE_READ|FILE_SHARE_WRITE|
+                                     FILE_SHARE_DELETE,
+                                     FILE_OPEN_IF, FILE_DIRECTORY_FILE, 0,
+                                     &dnum);
+
+               if (!NT_STATUS_IS_OK(status)) {
+                       d_printf("Could not create %s: %s\n", dname,
+                                nt_errstr(status));
+                       return false;
+               }
+
+               req1 = swallow_notify_send(talloc_tos(), ev, cli, dnum,
+                                          FILE_NOTIFY_CHANGE_FILE_NAME |
+                                          FILE_NOTIFY_CHANGE_DIR_NAME |
+                                          FILE_NOTIFY_CHANGE_ATTRIBUTES |
+                                          FILE_NOTIFY_CHANGE_LAST_WRITE,
+                                          false, print_notifies, NULL);
+               if (req1 == NULL) {
+                       d_printf("Could not create notify request\n");
+                       return false;
+               }
+
+               req2 = torture_createdels_send(talloc_tos(), ev, cli,
+                                              base_fname, 10, torture_numops);
+               if (req2 == NULL) {
+                       d_printf("Could not create createdels request\n");
+                       return false;
+               }
+               TALLOC_FREE(base_fname);
+
+               tevent_req_set_callback(req2, notify_bench_done,
+                                       &num_finished);
+       }
+
+       while (num_finished < num_unc_names) {
+               int ret;
+               ret = tevent_loop_once(ev);
+               if (ret != 0) {
+                       d_printf("tevent_loop_once failed\n");
+                       return false;
+               }
+       }
+
+       if (!tevent_req_poll(req2, ev)) {
+               d_printf("tevent_req_poll failed\n");
+       }
+
+       status = torture_createdels_recv(req2);
+       d_printf("torture_createdels_recv returned %s\n", nt_errstr(status));
+
+       return true;
+}
+
 static bool run_mangle1(int dummy)
 {
        struct cli_state *cli;
@@ -5312,10 +6569,11 @@ static bool run_mangle1(int dummy)
        }
        cli_close(cli, fnum);
 
-       if (!cli_qpathinfo(cli, alt_name, &change_time, &access_time,
-                          &write_time, &size, &mode)) {
-               d_printf("cli_qpathinfo(%s) failed: %s\n", alt_name,
-                        cli_errstr(cli));
+       status = cli_qpathinfo1(cli, alt_name, &change_time, &access_time,
+                               &write_time, &size, &mode);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_printf("cli_qpathinfo1(%s) failed: %s\n", alt_name,
+                        nt_errstr(status));
                return false;
        }
 
@@ -5344,6 +6602,7 @@ static bool run_windows_write(int dummy)
        int i;
        bool ret = false;
        const char *fname = "\\writetest.txt";
+       struct timeval start_time;
        double seconds;
        double kbytes;
 
@@ -5359,17 +6618,18 @@ static bool run_windows_write(int dummy)
 
        cli_sockopt(cli1, sockops);
 
-       start_timer();
+       start_time = timeval_current();
 
        for (i=0; i<torture_numops; i++) {
-               char c = 0;
+               uint8_t c = 0;
                off_t start = i * torture_blocksize;
                NTSTATUS status;
                size_t to_pull = torture_blocksize - 1;
 
-               if (cli_write(cli1, fnum, 0, &c,
-                             start + torture_blocksize - 1, 1) != 1) {
-                       printf("cli_write failed: %s\n", cli_errstr(cli1));
+               status = cli_writeall(cli1, fnum, 0, &c,
+                                     start + torture_blocksize - 1, 1, NULL);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("cli_write failed: %s\n", nt_errstr(status));
                        goto fail;
                }
 
@@ -5381,7 +6641,7 @@ static bool run_windows_write(int dummy)
                }
        }
 
-       seconds = end_timer();
+       seconds = timeval_elapsed(&start_time);
        kbytes = (double)torture_blocksize * torture_numops;
        kbytes /= 1024;
 
@@ -5391,7 +6651,7 @@ static bool run_windows_write(int dummy)
        ret = true;
  fail:
        cli_close(cli1, fnum);
-       cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        torture_close_connection(cli1);
        return ret;
 }
@@ -5421,6 +6681,7 @@ static bool run_uid_regression_test(int dummy)
        int16_t old_vuid;
        int16_t old_cnum;
        bool correct = True;
+       NTSTATUS status;
 
        printf("starting uid regression test\n");
 
@@ -5433,9 +6694,10 @@ static bool run_uid_regression_test(int dummy)
        /* Ok - now save then logoff our current user. */
        old_vuid = cli->vuid;
 
-       if (!cli_ulogoff(cli)) {
+       status = cli_ulogoff(cli);
+       if (!NT_STATUS_IS_OK(status)) {
                d_printf("(%s) cli_ulogoff failed: %s\n",
-                       __location__, cli_errstr(cli));
+                        __location__, nt_errstr(status));
                correct = false;
                goto out;
        }
@@ -5443,11 +6705,18 @@ static bool run_uid_regression_test(int dummy)
        cli->vuid = old_vuid;
 
        /* Try an operation. */
-       if (!NT_STATUS_IS_OK(cli_mkdir(cli, "\\uid_reg_test"))) {
-               /* We expect bad uid. */
+       status = cli_mkdir(cli, "\\uid_reg_test");
+       if (NT_STATUS_IS_OK(status)) {
+               d_printf("(%s) cli_mkdir succeeded\n",
+                        __location__);
+               correct = false;
+               goto out;
+       } else {
+               /* Should be bad uid. */
                if (!check_error(__LINE__, cli, ERRSRV, ERRbaduid,
-                               NT_STATUS_NO_SUCH_USER)) {
-                       return False;
+                               NT_STATUS_USER_SESSION_DELETED)) {
+                       correct = false;
+                       goto out;
                }
        }
 
@@ -5457,23 +6726,31 @@ static bool run_uid_regression_test(int dummy)
        cli->vuid = 0;
 
        /* This should succeed. */
-       if (cli_tdis(cli)) {
-               printf("First tdis with invalid vuid should succeed.\n");
+       status = cli_tdis(cli);
+
+       if (NT_STATUS_IS_OK(status)) {
+               d_printf("First tdis with invalid vuid should succeed.\n");
        } else {
-               printf("First tdis failed (%s)\n", cli_errstr(cli));
+               d_printf("First tdis failed (%s)\n", nt_errstr(status));
+               correct = false;
+               goto out;
        }
 
        cli->vuid = old_vuid;
        cli->cnum = old_cnum;
 
        /* This should fail. */
-       if (cli_tdis(cli)) {
-               printf("Second tdis with invalid vuid should fail - succeeded instead !.\n");
+       status = cli_tdis(cli);
+       if (NT_STATUS_IS_OK(status)) {
+               d_printf("Second tdis with invalid vuid should fail - succeeded instead !.\n");
+               correct = false;
+               goto out;
        } else {
                /* Should be bad tid. */
                if (!check_error(__LINE__, cli, ERRSRV, ERRinvnid,
                                NT_STATUS_NETWORK_NAME_DELETED)) {
-                       return False;
+                       correct = false;
+                       goto out;
                }
        }
 
@@ -5489,30 +6766,40 @@ static bool run_uid_regression_test(int dummy)
 static const char *illegal_chars = "*\\/?<>|\":";
 static char force_shortname_chars[] = " +,.[];=\177";
 
-static void shortname_del_fn(const char *mnt, file_info *finfo, const char *mask, void *state)
+static NTSTATUS shortname_del_fn(const char *mnt, struct file_info *finfo,
+                            const char *mask, void *state)
 {
        struct cli_state *pcli = (struct cli_state *)state;
        fstring fname;
+       NTSTATUS status = NT_STATUS_OK;
+
        slprintf(fname, sizeof(fname), "\\shortname\\%s", finfo->name);
 
        if (strcmp(finfo->name, ".") == 0 || strcmp(finfo->name, "..") == 0)
-               return;
+               return NT_STATUS_OK;
 
-       if (finfo->mode & aDIR) {
-               if (!NT_STATUS_IS_OK(cli_rmdir(pcli, fname)))
+       if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) {
+               status = cli_rmdir(pcli, fname);
+               if (!NT_STATUS_IS_OK(status)) {
                        printf("del_fn: failed to rmdir %s\n,", fname );
+               }
        } else {
-               if (!NT_STATUS_IS_OK(cli_unlink(pcli, fname, aSYSTEM | aHIDDEN)))
+               status = cli_unlink(pcli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+               if (!NT_STATUS_IS_OK(status)) {
                        printf("del_fn: failed to unlink %s\n,", fname );
+               }
        }
+       return status;
 }
 
 struct sn_state {
+       int matched;
        int i;
        bool val;
 };
 
-static void shortname_list_fn(const char *mnt, file_info *finfo, const char *name, void *state)
+static NTSTATUS shortname_list_fn(const char *mnt, struct file_info *finfo,
+                             const char *name, void *state)
 {
        struct sn_state *s = (struct sn_state  *)state;
        int i = s->i;
@@ -5535,6 +6822,8 @@ static void shortname_list_fn(const char *mnt, file_info *finfo, const char *nam
                        __location__, finfo->short_name, finfo->name);
                s->val = true;
        }
+       s->matched += 1;
+       return NT_STATUS_OK;
 }
 
 static bool run_shortname_test(int dummy)
@@ -5554,7 +6843,7 @@ static bool run_shortname_test(int dummy)
        cli_sockopt(cli, sockops);
 
        cli_list(cli, "\\shortname\\*", 0, shortname_del_fn, cli);
-       cli_list(cli, "\\shortname\\*", aDIR, shortname_del_fn, cli);
+       cli_list(cli, "\\shortname\\*", FILE_ATTRIBUTE_DIRECTORY, shortname_del_fn, cli);
        cli_rmdir(cli, "\\shortname");
 
        if (!NT_STATUS_IS_OK(cli_mkdir(cli, "\\shortname"))) {
@@ -5589,13 +6878,17 @@ static bool run_shortname_test(int dummy)
                        goto out;
                }
                cli_close(cli, fnum);
-               if (cli_list(cli, "\\shortname\\test*.*", 0, shortname_list_fn, &s) != 1) {
+
+               s.matched = 0;
+               cli_list(cli, "\\shortname\\test*.*", 0, shortname_list_fn,
+                        &s);
+               if (s.matched != 1) {
                        d_printf("(%s) failed to list %s: %s\n",
                                __location__, fname, cli_errstr(cli));
                        correct = false;
                        goto out;
                }
-               if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | aHIDDEN))) {
+               if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                        d_printf("(%s) failed to delete %s: %s\n",
                                __location__, fname, cli_errstr(cli));
                        correct = false;
@@ -5611,7 +6904,7 @@ static bool run_shortname_test(int dummy)
   out:
 
        cli_list(cli, "\\shortname\\*", 0, shortname_del_fn, cli);
-       cli_list(cli, "\\shortname\\*", aDIR, shortname_del_fn, cli);
+       cli_list(cli, "\\shortname\\*", FILE_ATTRIBUTE_DIRECTORY, shortname_del_fn, cli);
        cli_rmdir(cli, "\\shortname");
        torture_close_connection(cli);
        return correct;
@@ -5650,6 +6943,7 @@ static bool run_tldap(int dummy)
        struct tevent_context *ev;
        struct tevent_req *req;
        char *basedn;
+       const char *filter;
 
        if (!resolve_name(host, &addr, 0, false)) {
                d_printf("could not find host %s\n", host);
@@ -5703,10 +6997,95 @@ static bool run_tldap(int dummy)
 
        TALLOC_FREE(req);
 
+       /* test search filters against rootDSE */
+       filter = "(&(|(name=samba)(nextRid<=10000000)(usnChanged>=10)(samba~=ambas)(!(name=s*m*a)))"
+                  "(|(name:=samba)(name:dn:2.5.13.5:=samba)(:dn:2.5.13.5:=samba)(!(name=*samba))))";
+
+       rc = tldap_search(ld, "", TLDAP_SCOPE_BASE, filter,
+                         NULL, 0, 0, NULL, 0, NULL, 0, 0, 0, 0,
+                         talloc_tos(), NULL, NULL);
+       if (rc != TLDAP_SUCCESS) {
+               d_printf("tldap_search with complex filter failed: %s\n",
+                        tldap_errstr(talloc_tos(), ld, rc));
+               return false;
+       }
+
        TALLOC_FREE(ld);
        return true;
 }
 
+/* Torture test to ensure no regression of :
+https://bugzilla.samba.org/show_bug.cgi?id=7084
+*/
+
+static bool run_dir_createtime(int dummy)
+{
+       struct cli_state *cli;
+       const char *dname = "\\testdir";
+       const char *fname = "\\testdir\\testfile";
+       NTSTATUS status;
+       struct timespec create_time;
+       struct timespec create_time1;
+       uint16_t fnum;
+       bool ret = false;
+
+       if (!torture_open_connection(&cli, 0)) {
+               return false;
+       }
+
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_rmdir(cli, dname);
+
+       status = cli_mkdir(cli, dname);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("mkdir failed: %s\n", nt_errstr(status));
+               goto out;
+       }
+
+       status = cli_qpathinfo2(cli, dname, &create_time, NULL, NULL, NULL,
+                               NULL, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_qpathinfo2 returned %s\n",
+                      nt_errstr(status));
+               goto out;
+       }
+
+       /* Sleep 3 seconds, then create a file. */
+       sleep(3);
+
+       status = cli_open(cli, fname, O_RDWR | O_CREAT | O_EXCL,
+                         DENY_NONE, &fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_open failed: %s\n", nt_errstr(status));
+               goto out;
+       }
+
+       status = cli_qpathinfo2(cli, dname, &create_time1, NULL, NULL, NULL,
+                               NULL, NULL, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_qpathinfo2 (2) returned %s\n",
+                      nt_errstr(status));
+               goto out;
+       }
+
+       if (timespec_compare(&create_time1, &create_time)) {
+               printf("run_dir_createtime: create time was updated (error)\n");
+       } else {
+               printf("run_dir_createtime: create time was not updated (correct)\n");
+               ret = true;
+       }
+
+  out:
+
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_rmdir(cli, dname);
+       if (!torture_close_connection(cli)) {
+               ret = false;
+       }
+       return ret;
+}
+
+
 static bool run_streamerror(int dummy)
 {
        struct cli_state *cli;
@@ -5723,6 +7102,7 @@ static bool run_streamerror(int dummy)
                return false;
        }
 
+       cli_unlink(cli, "\\testdir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        cli_rmdir(cli, dname);
 
        status = cli_mkdir(cli, dname);
@@ -5731,7 +7111,7 @@ static bool run_streamerror(int dummy)
                return false;
        }
 
-       cli_qpathinfo(cli, streamname, &change_time, &access_time, &write_time,
+       cli_qpathinfo1(cli, streamname, &change_time, &access_time, &write_time,
                      &size, &mode);
        status = cli_nt_error(cli);
 
@@ -5825,6 +7205,11 @@ static bool run_local_gencache(int dummy)
                return False;
        }
 
+       if (!gencache_get("foo", NULL, NULL)) {
+               d_printf("%s: gencache_get() failed\n", __location__);
+               return False;
+       }
+
        if (!gencache_get("foo", &val, &tm)) {
                d_printf("%s: gencache_get() failed\n", __location__);
                return False;
@@ -5986,6 +7371,103 @@ static bool run_local_rbtree(int dummy)
        return ret;
 }
 
+
+/*
+  local test for character set functions
+
+  This is a very simple test for the functionality in convert_string_error()
+ */
+static bool run_local_convert_string(int dummy)
+{
+       TALLOC_CTX *tmp_ctx = talloc_new(NULL);
+       const char *test_strings[2] = { "March", "M\303\244rz" };
+       char dst[7];
+       int i;
+
+       for (i=0; i<2; i++) {
+               const char *str = test_strings[i];
+               int len = strlen(str);
+               size_t converted_size;
+               bool ret;
+
+               memset(dst, 'X', sizeof(dst));
+
+               /* first try with real source length */
+               ret = convert_string_error(CH_UNIX, CH_UTF8,
+                                          str, len,
+                                          dst, sizeof(dst),
+                                          &converted_size);
+               if (ret != true) {
+                       d_fprintf(stderr, "Failed to convert '%s' to CH_DISPLAY\n", str);
+                       goto failed;
+               }
+
+               if (converted_size != len) {
+                       d_fprintf(stderr, "Converted size of '%s' should be %d - got %d\n",
+                                 str, len, (int)converted_size);
+                       goto failed;
+               }
+
+               if (strncmp(str, dst, converted_size) != 0) {
+                       d_fprintf(stderr, "Expected '%s' to match '%s'\n", str, dst);
+                       goto failed;
+               }
+
+               if (strlen(str) != converted_size) {
+                       d_fprintf(stderr, "Expected '%s' length %d - got %d\n", str,
+                                 (int)strlen(str), (int)converted_size);
+                       goto failed;
+               }
+
+               if (dst[converted_size] != 'X') {
+                       d_fprintf(stderr, "Expected no termination of '%s'\n", dst);
+                       goto failed;
+               }
+
+               /* now with srclen==-1, this causes the nul to be
+                * converted too */
+               ret = convert_string_error(CH_UNIX, CH_UTF8,
+                                          str, -1,
+                                          dst, sizeof(dst),
+                                          &converted_size);
+               if (ret != true) {
+                       d_fprintf(stderr, "Failed to convert '%s' to CH_DISPLAY\n", str);
+                       goto failed;
+               }
+
+               if (converted_size != len+1) {
+                       d_fprintf(stderr, "Converted size of '%s' should be %d - got %d\n",
+                                 str, len, (int)converted_size);
+                       goto failed;
+               }
+
+               if (strncmp(str, dst, converted_size) != 0) {
+                       d_fprintf(stderr, "Expected '%s' to match '%s'\n", str, dst);
+                       goto failed;
+               }
+
+               if (len+1 != converted_size) {
+                       d_fprintf(stderr, "Expected '%s' length %d - got %d\n", str,
+                                 len+1, (int)converted_size);
+                       goto failed;
+               }
+
+               if (dst[converted_size] != 'X') {
+                       d_fprintf(stderr, "Expected no termination of '%s'\n", dst);
+                       goto failed;
+               }
+
+       }
+
+
+       TALLOC_FREE(tmp_ctx);
+       return true;
+failed:
+       TALLOC_FREE(tmp_ctx);
+       return false;
+}
+
+
 struct talloc_dict_test {
        int content;
 };
@@ -6033,6 +7515,134 @@ static bool run_local_talloc_dict(int dummy)
        return true;
 }
 
+static bool run_local_string_to_sid(int dummy) {
+       struct dom_sid sid;
+
+       if (string_to_sid(&sid, "S--1-5-32-545")) {
+               printf("allowing S--1-5-32-545\n");
+               return false;
+       }
+       if (string_to_sid(&sid, "S-1-5-32-+545")) {
+               printf("allowing S-1-5-32-+545\n");
+               return false;
+       }
+       if (string_to_sid(&sid, "S-1-2-3-4-5-6-7-8-9-0-1-2-3-4-5-6-7-8-9-0")) {
+               printf("allowing S-1-2-3-4-5-6-7-8-9-0-1-2-3-4-5-6-7-8-9-0\n");
+               return false;
+       }
+       if (string_to_sid(&sid, "S-1-5-32-545-abc")) {
+               printf("allowing S-1-5-32-545-abc\n");
+               return false;
+       }
+       if (!string_to_sid(&sid, "S-1-5-32-545")) {
+               printf("could not parse S-1-5-32-545\n");
+               return false;
+       }
+       if (!dom_sid_equal(&sid, &global_sid_Builtin_Users)) {
+               printf("mis-parsed S-1-5-32-545 as %s\n",
+                      sid_string_tos(&sid));
+               return false;
+       }
+       return true;
+}
+
+static bool run_local_binary_to_sid(int dummy) {
+       struct dom_sid *sid = talloc(NULL, struct dom_sid);
+       static const char good_binary_sid[] = {
+               0x1, /* revision number */
+               15, /* num auths */
+               0x1, 0x1, 0x1, 0x1, 0x1, 0x1, /* id_auth */
+               0x1, 0x1, 0x1, 0x1, /* auth[0] */
+               0x1, 0x1, 0x1, 0x1, /* auth[1] */
+               0x1, 0x1, 0x1, 0x1, /* auth[2] */
+               0x1, 0x1, 0x1, 0x1, /* auth[3] */
+               0x1, 0x1, 0x1, 0x1, /* auth[4] */
+               0x1, 0x1, 0x1, 0x1, /* auth[5] */
+               0x1, 0x1, 0x1, 0x1, /* auth[6] */
+               0x1, 0x1, 0x1, 0x1, /* auth[7] */
+               0x1, 0x1, 0x1, 0x1, /* auth[8] */
+               0x1, 0x1, 0x1, 0x1, /* auth[9] */
+               0x1, 0x1, 0x1, 0x1, /* auth[10] */
+               0x1, 0x1, 0x1, 0x1, /* auth[11] */
+               0x1, 0x1, 0x1, 0x1, /* auth[12] */
+               0x1, 0x1, 0x1, 0x1, /* auth[13] */
+               0x1, 0x1, 0x1, 0x1, /* auth[14] */
+       };
+
+       static const char long_binary_sid[] = {
+               0x1, /* revision number */
+               15, /* num auths */
+               0x1, 0x1, 0x1, 0x1, 0x1, 0x1, /* id_auth */
+               0x1, 0x1, 0x1, 0x1, /* auth[0] */
+               0x1, 0x1, 0x1, 0x1, /* auth[1] */
+               0x1, 0x1, 0x1, 0x1, /* auth[2] */
+               0x1, 0x1, 0x1, 0x1, /* auth[3] */
+               0x1, 0x1, 0x1, 0x1, /* auth[4] */
+               0x1, 0x1, 0x1, 0x1, /* auth[5] */
+               0x1, 0x1, 0x1, 0x1, /* auth[6] */
+               0x1, 0x1, 0x1, 0x1, /* auth[7] */
+               0x1, 0x1, 0x1, 0x1, /* auth[8] */
+               0x1, 0x1, 0x1, 0x1, /* auth[9] */
+               0x1, 0x1, 0x1, 0x1, /* auth[10] */
+               0x1, 0x1, 0x1, 0x1, /* auth[11] */
+               0x1, 0x1, 0x1, 0x1, /* auth[12] */
+               0x1, 0x1, 0x1, 0x1, /* auth[13] */
+               0x1, 0x1, 0x1, 0x1, /* auth[14] */
+               0x1, 0x1, 0x1, 0x1, /* auth[15] */
+               0x1, 0x1, 0x1, 0x1, /* auth[16] */
+               0x1, 0x1, 0x1, 0x1, /* auth[17] */
+       };
+
+       static const char long_binary_sid2[] = {
+               0x1, /* revision number */
+               32, /* num auths */
+               0x1, 0x1, 0x1, 0x1, 0x1, 0x1, /* id_auth */
+               0x1, 0x1, 0x1, 0x1, /* auth[0] */
+               0x1, 0x1, 0x1, 0x1, /* auth[1] */
+               0x1, 0x1, 0x1, 0x1, /* auth[2] */
+               0x1, 0x1, 0x1, 0x1, /* auth[3] */
+               0x1, 0x1, 0x1, 0x1, /* auth[4] */
+               0x1, 0x1, 0x1, 0x1, /* auth[5] */
+               0x1, 0x1, 0x1, 0x1, /* auth[6] */
+               0x1, 0x1, 0x1, 0x1, /* auth[7] */
+               0x1, 0x1, 0x1, 0x1, /* auth[8] */
+               0x1, 0x1, 0x1, 0x1, /* auth[9] */
+               0x1, 0x1, 0x1, 0x1, /* auth[10] */
+               0x1, 0x1, 0x1, 0x1, /* auth[11] */
+               0x1, 0x1, 0x1, 0x1, /* auth[12] */
+               0x1, 0x1, 0x1, 0x1, /* auth[13] */
+               0x1, 0x1, 0x1, 0x1, /* auth[14] */
+               0x1, 0x1, 0x1, 0x1, /* auth[15] */
+               0x1, 0x1, 0x1, 0x1, /* auth[16] */
+               0x1, 0x1, 0x1, 0x1, /* auth[17] */
+               0x1, 0x1, 0x1, 0x1, /* auth[18] */
+               0x1, 0x1, 0x1, 0x1, /* auth[19] */
+               0x1, 0x1, 0x1, 0x1, /* auth[20] */
+               0x1, 0x1, 0x1, 0x1, /* auth[21] */
+               0x1, 0x1, 0x1, 0x1, /* auth[22] */
+               0x1, 0x1, 0x1, 0x1, /* auth[23] */
+               0x1, 0x1, 0x1, 0x1, /* auth[24] */
+               0x1, 0x1, 0x1, 0x1, /* auth[25] */
+               0x1, 0x1, 0x1, 0x1, /* auth[26] */
+               0x1, 0x1, 0x1, 0x1, /* auth[27] */
+               0x1, 0x1, 0x1, 0x1, /* auth[28] */
+               0x1, 0x1, 0x1, 0x1, /* auth[29] */
+               0x1, 0x1, 0x1, 0x1, /* auth[30] */
+               0x1, 0x1, 0x1, 0x1, /* auth[31] */
+       };
+
+       if (!sid_parse(good_binary_sid, sizeof(good_binary_sid), sid)) {
+               return false;
+       }
+       if (sid_parse(long_binary_sid2, sizeof(long_binary_sid2), sid)) {
+               return false;
+       }
+       if (sid_parse(long_binary_sid, sizeof(long_binary_sid), sid)) {
+               return false;
+       }
+       return true;
+}
+
 /* Split a path name into filename and stream name components. Canonicalise
  * such that an implicit $DATA token is always explicit.
  *
@@ -6155,7 +7765,7 @@ static bool test_stream_name(const char *fname, const char *expected_base,
        return true;
 
  error:
-       d_fprintf(stderr, "test_stream(%s, %s, %s, %s)\n",
+       d_fprintf(stderr, "Do test_stream(%s, %s, %s, %s)\n",
                  fname, expected_base ? expected_base : "<NULL>",
                  expected_stream ? expected_stream : "<NULL>",
                  nt_errstr(expected_status));
@@ -6402,7 +8012,7 @@ static bool run_getaddrinfo_send(int dummy)
                        goto fail;
                }
                tevent_req_set_callback(reqs[i], getaddrinfo_finished,
-                                       (void *)names[i]);
+                                       discard_const_p(void, names[i]));
        }
 
        for (i=0; i<ARRAY_SIZE(reqs); i++) {
@@ -6415,6 +8025,177 @@ fail:
        return result;
 }
 
+static bool dbtrans_inc(struct db_context *db)
+{
+       struct db_record *rec;
+       uint32_t *val;
+       bool ret = false;
+       NTSTATUS status;
+
+       rec = db->fetch_locked(db, db, string_term_tdb_data("transtest"));
+       if (rec == NULL) {
+               printf(__location__ "fetch_lock failed\n");
+               return false;
+       }
+
+       if (rec->value.dsize != sizeof(uint32_t)) {
+               printf(__location__ "value.dsize = %d\n",
+                      (int)rec->value.dsize);
+               goto fail;
+       }
+
+       val = (uint32_t *)rec->value.dptr;
+       *val += 1;
+
+       status = rec->store(rec, make_tdb_data((uint8_t *)val,
+                                              sizeof(uint32_t)),
+                           0);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf(__location__ "store failed: %s\n",
+                      nt_errstr(status));
+               goto fail;
+       }
+
+       ret = true;
+fail:
+       TALLOC_FREE(rec);
+       return ret;
+}
+
+static bool run_local_dbtrans(int dummy)
+{
+       struct db_context *db;
+       struct db_record *rec;
+       NTSTATUS status;
+       uint32_t initial;
+       int res;
+
+       db = db_open(talloc_tos(), "transtest.tdb", 0, TDB_DEFAULT,
+                    O_RDWR|O_CREAT, 0600);
+       if (db == NULL) {
+               printf("Could not open transtest.db\n");
+               return false;
+       }
+
+       res = db->transaction_start(db);
+       if (res == -1) {
+               printf(__location__ "transaction_start failed\n");
+               return false;
+       }
+
+       rec = db->fetch_locked(db, db, string_term_tdb_data("transtest"));
+       if (rec == NULL) {
+               printf(__location__ "fetch_lock failed\n");
+               return false;
+       }
+
+       if (rec->value.dptr == NULL) {
+               initial = 0;
+               status = rec->store(
+                       rec, make_tdb_data((uint8_t *)&initial,
+                                          sizeof(initial)),
+                       0);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf(__location__ "store returned %s\n",
+                              nt_errstr(status));
+                       return false;
+               }
+       }
+
+       TALLOC_FREE(rec);
+
+       res = db->transaction_commit(db);
+       if (res == -1) {
+               printf(__location__ "transaction_commit failed\n");
+               return false;
+       }
+
+       while (true) {
+               uint32_t val, val2;
+               int i;
+
+               res = db->transaction_start(db);
+               if (res == -1) {
+                       printf(__location__ "transaction_start failed\n");
+                       break;
+               }
+
+               if (!dbwrap_fetch_uint32(db, "transtest", &val)) {
+                       printf(__location__ "dbwrap_fetch_uint32 failed\n");
+                       break;
+               }
+
+               for (i=0; i<10; i++) {
+                       if (!dbtrans_inc(db)) {
+                               return false;
+                       }
+               }
+
+               if (!dbwrap_fetch_uint32(db, "transtest", &val2)) {
+                       printf(__location__ "dbwrap_fetch_uint32 failed\n");
+                       break;
+               }
+
+               if (val2 != val + 10) {
+                       printf(__location__ "val=%d, val2=%d\n",
+                              (int)val, (int)val2);
+                       break;
+               }
+
+               printf("val2=%d\r", val2);
+
+               res = db->transaction_commit(db);
+               if (res == -1) {
+                       printf(__location__ "transaction_commit failed\n");
+                       break;
+               }
+       }
+
+       TALLOC_FREE(db);
+       return true;
+}
+
+/*
+ * Just a dummy test to be run under a debugger. There's no real way
+ * to inspect the tevent_select specific function from outside of
+ * tevent_select.c.
+ */
+
+static bool run_local_tevent_select(int dummy)
+{
+       struct tevent_context *ev;
+       struct tevent_fd *fd1, *fd2;
+       bool result = false;
+
+       ev = tevent_context_init_byname(NULL, "select");
+       if (ev == NULL) {
+               d_fprintf(stderr, "tevent_context_init_byname failed\n");
+               goto fail;
+       }
+
+       fd1 = tevent_add_fd(ev, ev, 2, 0, NULL, NULL);
+       if (fd1 == NULL) {
+               d_fprintf(stderr, "tevent_add_fd failed\n");
+               goto fail;
+       }
+       fd2 = tevent_add_fd(ev, ev, 3, 0, NULL, NULL);
+       if (fd2 == NULL) {
+               d_fprintf(stderr, "tevent_add_fd failed\n");
+               goto fail;
+       }
+       TALLOC_FREE(fd2);
+
+       fd2 = tevent_add_fd(ev, ev, 1, 0, NULL, NULL);
+       if (fd2 == NULL) {
+               d_fprintf(stderr, "tevent_add_fd failed\n");
+               goto fail;
+       }
+
+       result = true;
+fail:
+       TALLOC_FREE(ev);
+       return result;
+}
 
 static double create_procs(bool (*fn)(int), bool *result)
 {
@@ -6423,6 +8204,7 @@ static double create_procs(bool (*fn)(int), bool *result)
        volatile bool *child_status_out;
        int synccount;
        int tries = 8;
+       struct timeval start;
 
        synccount = 0;
 
@@ -6443,7 +8225,7 @@ static double create_procs(bool (*fn)(int), bool *result)
                child_status_out[i] = True;
        }
 
-       start_timer();
+       start = timeval_current();
 
        for (i=0;i<nprocs;i++) {
                procnum = i;
@@ -6464,7 +8246,7 @@ static double create_procs(bool (*fn)(int), bool *result)
 
                        child_status[i] = getpid();
 
-                       while (child_status[i] && end_timer() < 5) smb_msleep(2);
+                       while (child_status[i] && timeval_elapsed(&start) < 5) smb_msleep(2);
 
                        child_status_out[i] = fn(i);
                        _exit(0);
@@ -6478,16 +8260,16 @@ static double create_procs(bool (*fn)(int), bool *result)
                }
                if (synccount == nprocs) break;
                smb_msleep(10);
-       } while (end_timer() < 30);
+       } while (timeval_elapsed(&start) < 30);
 
        if (synccount != nprocs) {
                printf("FAILED TO START %d CLIENTS (started %d)\n", nprocs, synccount);
                *result = False;
-               return end_timer();
+               return timeval_elapsed(&start);
        }
 
        /* start the client load */
-       start_timer();
+       start = timeval_current();
 
        for (i=0;i<nprocs;i++) {
                child_status[i] = 0;
@@ -6506,7 +8288,7 @@ static double create_procs(bool (*fn)(int), bool *result)
                        *result = False;
                }
        }
-       return end_timer();
+       return timeval_elapsed(&start);
 }
 
 #define FLAG_MULTIPROC 1
@@ -6525,6 +8307,7 @@ static struct {
        {"LOCK6",  run_locktest6,  0},
        {"LOCK7",  run_locktest7,  0},
        {"LOCK8",  run_locktest8,  0},
+       {"LOCK9",  run_locktest9,  0},
        {"UNLINK", run_unlinktest, 0},
        {"BROWSE", run_browsetest, 0},
        {"ATTR",   run_attrtest,   0},
@@ -6534,11 +8317,14 @@ static struct {
        {"RANDOMIPC", run_randomipc, 0},
        {"NEGNOWAIT", run_negprot_nowait, 0},
        {"NBENCH",  run_nbench, 0},
+       {"NBENCH2", run_nbench2, 0},
        {"OPLOCK1",  run_oplock1, 0},
        {"OPLOCK2",  run_oplock2, 0},
        {"OPLOCK3",  run_oplock3, 0},
+       {"OPLOCK4",  run_oplock4, 0},
        {"DIR",  run_dirtest, 0},
        {"DIR1",  run_dirtest1, 0},
+       {"DIR-CREATETIME",  run_dir_createtime, 0},
        {"DENY1",  torture_denytest1, 0},
        {"DENY2",  torture_denytest2, 0},
        {"TCON",  run_tcon_test, 0},
@@ -6546,16 +8332,22 @@ static struct {
        {"RW1",  run_readwritetest, 0},
        {"RW2",  run_readwritemulti, FLAG_MULTIPROC},
        {"RW3",  run_readwritelarge, 0},
+       {"RW-SIGNING",  run_readwritelarge_signtest, 0},
        {"OPEN", run_opentest, 0},
        {"POSIX", run_simple_posix_open_test, 0},
+       {"POSIX-APPEND", run_posix_append, 0},
+       {"CASE-INSENSITIVE-CREATE", run_case_insensitive_create, 0},
+       {"ASYNC-ECHO", run_async_echo, 0},
        { "UID-REGRESSION-TEST", run_uid_regression_test, 0},
        { "SHORTNAME-TEST", run_shortname_test, 0},
+       { "ADDRCHANGE", run_addrchange, 0},
 #if 1
        {"OPENATTR", run_openattrtest, 0},
 #endif
        {"XCOPY", run_xcopy, 0},
        {"RENAME", run_rename, 0},
        {"DELETE", run_deletetest, 0},
+       {"DELETE-LN", run_deletetest_ln, 0},
        {"PROPERTIES", run_properties, 0},
        {"MANGLE", torture_mangle, 0},
        {"MANGLE1", run_mangle1, 0},
@@ -6579,6 +8371,10 @@ static struct {
        { "GETADDRINFO", run_getaddrinfo_send, 0},
        { "TLDAP", run_tldap },
        { "STREAMERROR", run_streamerror },
+       { "NOTIFY-BENCH", run_notify_bench },
+       { "BAD-NBT-SESSION", run_bad_nbt_session },
+       { "SMB-ANY-CONNECT", run_smb_any_connect },
+       { "NOTIFY-ONLINE", run_notify_online },
        { "LOCAL-SUBSTITUTE", run_local_substitute, 0},
        { "LOCAL-GENCACHE", run_local_gencache, 0},
        { "LOCAL-TALLOC-DICT", run_local_talloc_dict, 0},
@@ -6587,6 +8383,11 @@ static struct {
        { "LOCAL-MEMCACHE", run_local_memcache, 0},
        { "LOCAL-STREAM-NAME", run_local_stream_name, 0},
        { "LOCAL-WBCLIENT", run_local_wbclient, 0},
+       { "LOCAL-string_to_sid", run_local_string_to_sid, 0},
+       { "LOCAL-binary_to_sid", run_local_binary_to_sid, 0},
+       { "LOCAL-DBTRANS", run_local_dbtrans, 0},
+       { "LOCAL-TEVENT-SELECT", run_local_tevent_select, 0},
+       { "LOCAL-CONVERT-STRING", run_local_convert_string, 0},
        {NULL, NULL, 0}};
 
 
@@ -6622,12 +8423,13 @@ static bool run_test(const char *name)
                                        printf("TEST %s FAILED!\n", name);
                                }
                        } else {
-                               start_timer();
+                               struct timeval start;
+                               start = timeval_current();
                                if (!torture_ops[i].fn(0)) {
                                        ret = False;
                                        printf("TEST %s FAILED!\n", name);
                                }
-                               t = end_timer();
+                               t = timeval_elapsed(&start);
                        }
                        printf("%s took %g secs\n\n", name, t);
                }
@@ -6666,6 +8468,7 @@ static void usage(void)
        printf("\t-p port\n");
        printf("\t-s seed\n");
        printf("\t-b unclist_filename   specify multiple shares for multiple connections\n");
+       printf("\t-f filename   filename to test\n");
        printf("\n\n");
 
        printf("tests are:");
@@ -6692,12 +8495,12 @@ static void usage(void)
        TALLOC_CTX *frame = talloc_stackframe();
        int seed = time(NULL);
 
-       dbf = x_stdout;
-
 #ifdef HAVE_SETBUFFER
        setbuffer(stdout, NULL, 0);
 #endif
 
+       setup_logging("smbtorture", DEBUG_STDOUT);
+
        load_case_tables();
 
        if (is_default_dyn_CONFIGFILE()) {
@@ -6743,7 +8546,8 @@ static void usage(void)
 
        fstrcpy(workgroup, lp_workgroup());
 
-       while ((opt = getopt(argc, argv, "p:hW:U:n:N:O:o:m:Ld:Aec:ks:b:B:")) != EOF) {
+       while ((opt = getopt(argc, argv, "p:hW:U:n:N:O:o:m:Ll:d:Aec:ks:b:B:f:"))
+              != EOF) {
                switch (opt) {
                case 'p':
                        port_to_use = atoi(optarg);
@@ -6764,7 +8568,7 @@ static void usage(void)
                        torture_numops = atoi(optarg);
                        break;
                case 'd':
-                       DEBUGLEVEL = atoi(optarg);
+                       lp_set_cmdline("log level", optarg);
                        break;
                case 'O':
                        sockops = optarg;
@@ -6772,6 +8576,9 @@ static void usage(void)
                case 'L':
                        use_oplocks = True;
                        break;
+               case 'l':
+                       local_path = optarg;
+                       break;
                case 'A':
                        torture_showall = True;
                        break;
@@ -6809,6 +8616,9 @@ static void usage(void)
                case 'B':
                        torture_blocksize = atoi(optarg);
                        break;
+               case 'f':
+                       test_filename = SMB_STRDUP(optarg);
+                       break;
                default:
                        printf("Unknown option %c (%d)\n", (char)opt, opt);
                        usage();