selftest: Test hide new files timeout
[amitay/samba.git] / source3 / torture / torture.c
index 8196993fe4b2c42396802a47bb54ac65bf9fb444..22810f081b843a10089053459245f6b0c52bed88 100644 (file)
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/shmem.h"
+#include "libsmb/namequery.h"
 #include "wbc_async.h"
 #include "torture/proto.h"
 #include "libcli/security/security.h"
@@ -31,7 +32,6 @@
 #include "dbwrap/dbwrap.h"
 #include "dbwrap/dbwrap_open.h"
 #include "dbwrap/dbwrap_rbt.h"
-#include "talloc_dict.h"
 #include "async_smb.h"
 #include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
 #include "../libcli/smb/read_smb.h"
 #include "../libcli/smb/smbXcli_base.h"
 #include "lib/util/sys_rw_data.h"
+#include "lib/util/base64.h"
+#include "lib/util/time.h"
+#include "lib/crypto/md5.h"
+#include "lib/gencache.h"
 
 extern char *optarg;
 extern int optind;
 
 fstring host, workgroup, share, password, username, myname;
+struct cli_credentials *torture_creds;
 static const char *sockops="TCP_NODELAY";
 int torture_nprocs=1;
 static int port_to_use=0;
@@ -106,15 +111,7 @@ static bool force_cli_encryption(struct cli_state *c,
                return false;
        }
 
-       if (c->use_kerberos) {
-               status = cli_gss_smb_encryption_start(c);
-       } else {
-               status = cli_raw_ntlm_smb_encryption_start(c,
-                                               username,
-                                               password,
-                                               workgroup);
-       }
-
+       status = cli_smb1_setup_encryption(c, torture_creds);
        if (!NT_STATUS_IS_OK(status)) {
                d_printf("Encryption required and "
                        "setup failed with error %s.\n",
@@ -332,23 +329,21 @@ bool smbcli_parse_unc(const char *unc_name, TALLOC_CTX *mem_ctx,
 
 static bool torture_open_connection_share(struct cli_state **c,
                                   const char *hostname, 
-                                  const char *sharename)
+                                  const char *sharename,
+                                  int flags)
 {
-       int flags = 0;
        NTSTATUS status;
 
-       if (use_kerberos)
-               flags |= CLI_FULL_CONNECTION_USE_KERBEROS;
-       if (use_oplocks)
-               flags |= CLI_FULL_CONNECTION_OPLOCKS;
-       if (use_level_II_oplocks)
-               flags |= CLI_FULL_CONNECTION_LEVEL_II_OPLOCKS;
-
-       status = cli_full_connection(c, myname,
-                                    hostname, NULL, port_to_use, 
-                                    sharename, "?????", 
-                                    username, workgroup, 
-                                    password, flags, signing_state);
+       status = cli_full_connection_creds(c,
+                                          myname,
+                                          hostname,
+                                          NULL, /* dest_ss */
+                                          port_to_use,
+                                          sharename,
+                                          "?????",
+                                          torture_creds,
+                                          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));
@@ -364,7 +359,7 @@ static bool torture_open_connection_share(struct cli_state **c,
        return True;
 }
 
-bool torture_open_connection(struct cli_state **c, int conn_index)
+bool torture_open_connection_flags(struct cli_state **c, int conn_index, int flags)
 {
        char **unc_list = NULL;
        int num_unc_names = 0;
@@ -386,14 +381,28 @@ bool torture_open_connection(struct cli_state **c, int conn_index)
                        exit(1);
                }
 
-               result = torture_open_connection_share(c, h, s);
+               result = torture_open_connection_share(c, h, s, flags);
 
                /* h, s were copied earlier */
                TALLOC_FREE(unc_list);
                return result;
        }
 
-       return torture_open_connection_share(c, host, share);
+       return torture_open_connection_share(c, host, share, flags);
+}
+
+bool torture_open_connection(struct cli_state **c, int conn_index)
+{
+       int flags = CLI_FULL_CONNECTION_FORCE_SMB1;
+
+       if (use_oplocks) {
+               flags |= CLI_FULL_CONNECTION_OPLOCKS;
+       }
+       if (use_level_II_oplocks) {
+               flags |= CLI_FULL_CONNECTION_LEVEL_II_OPLOCKS;
+       }
+
+       return torture_open_connection_flags(c, conn_index, flags);
 }
 
 bool torture_init_connection(struct cli_state **pcli)
@@ -412,15 +421,11 @@ bool torture_init_connection(struct cli_state **pcli)
 bool torture_cli_session_setup2(struct cli_state *cli, uint16_t *new_vuid)
 {
        uint16_t old_vuid = cli_state_get_uid(cli);
-       size_t passlen = strlen(password);
        NTSTATUS status;
        bool ret;
 
        cli_state_set_uid(cli, 0);
-       status = cli_session_setup(cli, username,
-                                  password, passlen,
-                                  password, passlen,
-                                  workgroup);
+       status = cli_session_setup_creds(cli, torture_creds);
        ret = NT_STATUS_IS_OK(status);
        *new_vuid = cli_state_get_uid(cli);
        cli_state_set_uid(cli, old_vuid);
@@ -1308,7 +1313,8 @@ static bool run_tcon_test(int dummy)
        static struct cli_state *cli;
        const char *fname = "\\tcontest.tmp";
        uint16_t fnum1;
-       uint16_t cnum1, cnum2, cnum3;
+       uint32_t cnum1, cnum2, cnum3;
+       struct smbXcli_tcon *orig_tcon = NULL;
        uint16_t vuid1, vuid2;
        char buf[4];
        bool ret = True;
@@ -1340,8 +1346,12 @@ static bool run_tcon_test(int dummy)
                return False;
        }
 
-       status = cli_tree_connect(cli, share, "?????",
-                                 password, strlen(password)+1);
+       orig_tcon = cli_state_save_tcon(cli);
+       if (orig_tcon == NULL) {
+               return false;
+       }
+
+       status = cli_tree_connect_creds(cli, share, "?????", torture_creds);
        if (!NT_STATUS_IS_OK(status)) {
                printf("%s refused 2nd tree connect (%s)\n", host,
                       nt_errstr(status));
@@ -1408,6 +1418,8 @@ static bool run_tcon_test(int dummy)
                return False;
        }
 
+       cli_state_restore_tcon(cli, orig_tcon);
+
        cli_state_set_tid(cli, cnum1);
 
        if (!torture_close_connection(cli)) {
@@ -1466,12 +1478,12 @@ static bool tcon_devtest(struct cli_state *cli,
        NTSTATUS status;
        bool ret;
 
-       status = cli_tree_connect(cli, myshare, devtype,
-                                 password, strlen(password)+1);
+       status = cli_tree_connect_creds(cli, myshare, devtype, torture_creds);
 
        if (NT_STATUS_IS_OK(expected_error)) {
                if (NT_STATUS_IS_OK(status)) {
-                       if (strcmp(cli->dev, return_devtype) == 0) {
+                       if (return_devtype != NULL &&
+                           strequal(cli->dev, return_devtype)) {
                                ret = True;
                        } else { 
                                printf("tconX to share %s with type %s "
@@ -1511,15 +1523,20 @@ static bool tcon_devtest(struct cli_state *cli,
 static bool run_tcon_devtype_test(int dummy)
 {
        static struct cli_state *cli1 = NULL;
-       int flags = 0;
+       int flags = CLI_FULL_CONNECTION_FORCE_SMB1;
        NTSTATUS status;
        bool ret = True;
 
-       status = cli_full_connection(&cli1, myname,
-                                    host, NULL, port_to_use,
-                                    NULL, NULL,
-                                    username, workgroup,
-                                    password, flags, signing_state);
+       status = cli_full_connection_creds(&cli1,
+                                          myname,
+                                          host,
+                                          NULL, /* dest_ss */
+                                          port_to_use,
+                                          NULL, /* service */
+                                          NULL, /* service_type */
+                                          torture_creds,
+                                          flags,
+                                          signing_state);
 
        if (!NT_STATUS_IS_OK(status)) {
                printf("could not open connection\n");
@@ -2144,7 +2161,7 @@ static bool run_locktest5(int dummy)
        ret = NT_STATUS_IS_OK(status);
        EXPECTED(ret, False);
 
-       printf("a different processs %s get a read lock on the first process lock stack\n", ret?"can":"cannot");
+       printf("a different process %s get a read lock on the first process lock stack\n", ret?"can":"cannot");
 
        /* Unlock the process 2 lock. */
        cli_unlock(cli2, fnum2, 0, 4);
@@ -2153,7 +2170,7 @@ static bool run_locktest5(int dummy)
        ret = NT_STATUS_IS_OK(status);
        EXPECTED(ret, False);
 
-       printf("the same processs on a different fnum %s get a read lock\n", ret?"can":"cannot");
+       printf("the same process on a different fnum %s get a read lock\n", ret?"can":"cannot");
 
        /* Unlock the process 1 fnum3 lock. */
        cli_unlock(cli1, fnum3, 0, 4);
@@ -2196,7 +2213,7 @@ static bool run_locktest5(int dummy)
        ret = NT_STATUS_IS_OK(status);
        EXPECTED(ret, True);
 
-       printf("a different processs %s get a write lock on the unlocked stack\n", ret?"can":"cannot");
+       printf("a different process %s get a write lock on the unlocked stack\n", ret?"can":"cannot");
 
 
  fail:
@@ -2768,8 +2785,8 @@ static bool run_fdsesstest(int dummy)
        struct cli_state *cli;
        uint16_t new_vuid;
        uint16_t saved_vuid;
-       uint16_t new_cnum;
-       uint16_t saved_cnum;
+       uint32_t new_cnum;
+       uint32_t saved_cnum;
        const char *fname = "\\fdsess.tst";
        const char *fname1 = "\\fdsess1.tst";
        uint16_t fnum1;
@@ -2786,7 +2803,7 @@ static bool run_fdsesstest(int dummy)
                return False;
 
        saved_cnum = cli_state_get_tid(cli);
-       if (!NT_STATUS_IS_OK(cli_tree_connect(cli, share, "?????", "", 1)))
+       if (!NT_STATUS_IS_OK(cli_tree_connect(cli, share, "?????", NULL)))
                return False;
        new_cnum = cli_state_get_tid(cli);
        cli_state_set_tid(cli, saved_cnum);
@@ -2994,7 +3011,7 @@ static bool run_negprot_nowait(int dummy)
                struct tevent_req *req;
 
                req = smbXcli_negprot_send(ev, ev, cli->conn, cli->timeout,
-                                          PROTOCOL_CORE, PROTOCOL_NT1);
+                                          PROTOCOL_CORE, PROTOCOL_NT1, 0);
                if (req == NULL) {
                        TALLOC_FREE(ev);
                        return false;
@@ -3149,6 +3166,29 @@ static bool run_browsetest(int dummy)
 
 }
 
+static bool check_attributes(struct cli_state *cli,
+                               const char *fname,
+                               uint16_t expected_attrs)
+{
+       uint16_t attrs = 0;
+       NTSTATUS status = cli_getatr(cli,
+                               fname,
+                               &attrs,
+                               NULL,
+                               NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_getatr failed with %s\n",
+                       nt_errstr(status));
+               return false;
+       }
+       if (attrs != expected_attrs) {
+               printf("Attributes incorrect 0x%x, should be 0x%x\n",
+                       (unsigned int)attrs,
+                       (unsigned int)expected_attrs);
+               return false;
+       }
+       return true;
+}
 
 /*
   This checks how the getatr calls works
@@ -3179,7 +3219,7 @@ static bool run_attrtest(int dummy)
                correct = False;
        }
 
-       if (abs(t - time(NULL)) > 60*60*24*10) {
+       if (labs(t - time(NULL)) > 60*60*24*10) {
                printf("ERROR: SMBgetatr bug. time is %s",
                       ctime(&t));
                t = time(NULL);
@@ -3209,6 +3249,120 @@ static bool run_attrtest(int dummy)
 
        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
+       /* Check cli_setpathinfo_basic() */
+       /* Re-create the file. */
+       status = cli_openx(cli, fname,
+                       O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to recreate %s (%s)\n",
+                       fname, nt_errstr(status));
+               correct = false;
+       }
+       cli_close(cli, fnum);
+
+       status = cli_setpathinfo_basic(cli,
+                                       fname,
+                                       0, /* create */
+                                       0, /* access */
+                                       0, /* write */
+                                       0, /* change */
+                                       FILE_ATTRIBUTE_SYSTEM |
+                                       FILE_ATTRIBUTE_HIDDEN |
+                                       FILE_ATTRIBUTE_READONLY);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_setpathinfo_basic failed with %s\n",
+                       nt_errstr(status));
+               correct = false;
+       }
+
+       /* Check attributes are correct. */
+       correct = check_attributes(cli,
+                       fname,
+                       FILE_ATTRIBUTE_SYSTEM |
+                       FILE_ATTRIBUTE_HIDDEN |
+                       FILE_ATTRIBUTE_READONLY);
+       if (correct == false) {
+               goto out;
+       }
+
+       /* Setting to FILE_ATTRIBUTE_NORMAL should be ignored. */
+       status = cli_setpathinfo_basic(cli,
+                                       fname,
+                                       0, /* create */
+                                       0, /* access */
+                                       0, /* write */
+                                       0, /* change */
+                                       FILE_ATTRIBUTE_NORMAL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_setpathinfo_basic failed with %s\n",
+                       nt_errstr(status));
+               correct = false;
+       }
+
+       /* Check attributes are correct. */
+       correct = check_attributes(cli,
+                       fname,
+                       FILE_ATTRIBUTE_SYSTEM |
+                       FILE_ATTRIBUTE_HIDDEN |
+                       FILE_ATTRIBUTE_READONLY);
+       if (correct == false) {
+               goto out;
+       }
+
+       /* Setting to (uint16_t)-1 should also be ignored. */
+       status = cli_setpathinfo_basic(cli,
+                                       fname,
+                                       0, /* create */
+                                       0, /* access */
+                                       0, /* write */
+                                       0, /* change */
+                                       (uint16_t)-1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_setpathinfo_basic failed with %s\n",
+                       nt_errstr(status));
+               correct = false;
+       }
+
+       /* Check attributes are correct. */
+       correct = check_attributes(cli,
+                       fname,
+                       FILE_ATTRIBUTE_SYSTEM |
+                       FILE_ATTRIBUTE_HIDDEN |
+                       FILE_ATTRIBUTE_READONLY);
+       if (correct == false) {
+               goto out;
+       }
+
+       /* Setting to 0 should clear them all. */
+       status = cli_setpathinfo_basic(cli,
+                                       fname,
+                                       0, /* create */
+                                       0, /* access */
+                                       0, /* write */
+                                       0, /* change */
+                                       0);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_setpathinfo_basic failed with %s\n",
+                       nt_errstr(status));
+               correct = false;
+       }
+
+       /* Check attributes are correct. */
+       correct = check_attributes(cli,
+                       fname,
+                       FILE_ATTRIBUTE_NORMAL);
+       if (correct == false) {
+               goto out;
+       }
+
+  out:
+
+       cli_unlink(cli,
+               fname,
+               FILE_ATTRIBUTE_SYSTEM |
+               FILE_ATTRIBUTE_HIDDEN|
+               FILE_ATTRIBUTE_READONLY);
+
        if (!torture_close_connection(cli)) {
                correct = False;
        }
@@ -3296,13 +3450,13 @@ static bool run_trans2test(int dummy)
                        printf("modify time=%s", ctime(&m_time));
                        printf("This system appears to have sticky create times\n");
                }
-               if ((abs(a_time - t) > 60) && (a_time % (60*60) == 0)) {
+               if ((labs(a_time - t) > 60) && (a_time % (60*60) == 0)) {
                        printf("access time=%s", ctime(&a_time));
                        printf("This system appears to set a midnight access time\n");
                        correct = False;
                }
 
-               if (abs(m_time - t) > 60*60*24*7) {
+               if (labs(m_time - t) > 60*60*24*7) {
                        printf("ERROR: totally incorrect times - maybe word reversed? mtime=%s", ctime(&m_time));
                        correct = False;
                }
@@ -4409,6 +4563,78 @@ static bool run_deletetest(int dummy)
        return correct;
 }
 
+/*
+  Exercise delete on close semantics - use on the PRINT1 share in torture
+  testing.
+ */
+static bool run_delete_print_test(int dummy)
+{
+       struct cli_state *cli1 = NULL;
+       const char *fname = "print_delete.file";
+       uint16_t fnum1 = (uint16_t)-1;
+       bool correct = false;
+       const char *buf = "print file data\n";
+       NTSTATUS status;
+
+       printf("starting print delete test\n");
+
+       if (!torture_open_connection(&cli1, 0)) {
+               return false;
+       }
+
+       smbXcli_conn_set_sockopt(cli1->conn, sockops);
+
+       status = cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS|DELETE_ACCESS,
+                             FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF,
+                             0, 0, &fnum1, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("open of %s failed (%s)\n",
+                       fname,
+                       nt_errstr(status));
+               goto fail;
+       }
+
+       status = cli_writeall(cli1,
+                       fnum1,
+                       0,
+                       (const uint8_t *)buf,
+                       0, /* offset */
+                       strlen(buf), /* size */
+                       NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("writing print file data failed (%s)\n",
+                       nt_errstr(status));
+               goto fail;
+       }
+
+       status = cli_nt_delete_on_close(cli1, fnum1, true);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("setting delete_on_close failed (%s)\n",
+                       nt_errstr(status));
+               goto fail;
+       }
+
+       status = cli_close(cli1, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close failed (%s)\n", nt_errstr(status));
+               goto fail;
+       }
+
+       printf("finished print delete test\n");
+
+       correct = true;
+
+  fail:
+
+       if (fnum1 != (uint16_t)-1) {
+               cli_close(cli1, fnum1);
+       }
+
+       if (cli1 && !torture_close_connection(cli1)) {
+               correct = false;
+       }
+       return correct;
+}
 
 /*
   Test wildcard delete.
@@ -4707,7 +4933,7 @@ static bool run_rename(int dummy)
                return False;
        }
 
-       status = cli_rename(cli1, fname, fname1);
+       status = cli_rename(cli1, fname, fname1, false);
        if (!NT_STATUS_IS_OK(status)) {
                printf("First rename failed (SHARE_READ) (this is correct) - %s\n", nt_errstr(status));
        } else {
@@ -4735,7 +4961,7 @@ static bool run_rename(int dummy)
                return False;
        }
 
-       status = cli_rename(cli1, fname, fname1);
+       status = cli_rename(cli1, fname, fname1, false);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Second rename failed (SHARE_DELETE | SHARE_READ) - this should have succeeded - %s\n", nt_errstr(status));
                correct = False;
@@ -4782,7 +5008,7 @@ static bool run_rename(int dummy)
   }
 #endif
 
-       status = cli_rename(cli1, fname, fname1);
+       status = cli_rename(cli1, fname, fname1, false);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Third rename failed (SHARE_NONE) - this should have succeeded - %s\n", nt_errstr(status));
                correct = False;
@@ -4810,7 +5036,7 @@ static bool run_rename(int dummy)
                return False;
        }
 
-       status = cli_rename(cli1, fname, fname1);
+       status = cli_rename(cli1, fname, fname1, false);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Fourth rename failed (SHARE_READ | SHARE_WRITE) (this is correct) - %s\n", nt_errstr(status));
        } else {
@@ -4838,7 +5064,7 @@ static bool run_rename(int dummy)
                return False;
        }
 
-       status = cli_rename(cli1, fname, fname1);
+       status = cli_rename(cli1, fname, fname1, false);
        if (!NT_STATUS_IS_OK(status)) {
                printf("Fifth rename failed (SHARE_READ | SHARE_WRITE | SHARE_DELETE) - this should have succeeded - %s ! \n", nt_errstr(status));
                correct = False;
@@ -4897,925 +5123,2139 @@ static bool run_rename(int dummy)
        return correct;
 }
 
-static bool run_pipe_number(int dummy)
-{
-       struct cli_state *cli1;
-       const char *pipe_name = "\\SPOOLSS";
-       uint16_t fnum;
-       int num_pipes = 0;
+/*
+  Test rename into a directory with an ACL denying it.
+ */
+static bool run_rename_access(int dummy)
+{
+       static struct cli_state *cli = NULL;
+       static struct cli_state *posix_cli = NULL;
+       const char *src = "test.txt";
+       const char *dname = "dir";
+       const char *dst = "dir\\test.txt";
+       const char *dsrc = "test.dir";
+       const char *ddst = "dir\\test.dir";
+       uint16_t fnum = (uint16_t)-1;
+       struct security_descriptor *sd = NULL;
+       struct security_descriptor *newsd = NULL;
        NTSTATUS status;
+       TALLOC_CTX *frame = NULL;
 
-       printf("starting pipenumber test\n");
-       if (!torture_open_connection(&cli1, 0)) {
-               return False;
-       }
+       frame = talloc_stackframe();
+       printf("starting rename access test\n");
 
-       smbXcli_conn_set_sockopt(cli1->conn, sockops);
-       while(1) {
-               status = cli_ntcreate(cli1, pipe_name, 0, FILE_READ_DATA,
-                                     FILE_ATTRIBUTE_NORMAL,
-                                     FILE_SHARE_READ|FILE_SHARE_WRITE,
-                                     FILE_OPEN_IF, 0, 0, &fnum, NULL);
-               if (!NT_STATUS_IS_OK(status)) {
-                       printf("Open of pipe %s failed with error (%s)\n", pipe_name, nt_errstr(status));
-                       break;
-               }
-               num_pipes++;
-               printf("\r%6d", num_pipes);
+       /* Windows connection. */
+       if (!torture_open_connection(&cli, 0)) {
+               goto fail;
        }
 
-       printf("pipe_number test - we can open %d %s pipes.\n", num_pipes, pipe_name );
-       torture_close_connection(cli1);
-       return True;
-}
+       smbXcli_conn_set_sockopt(cli->conn, sockops);
 
-/*
-  Test open mode returns on read-only files.
- */
-static bool run_opentest(int dummy)
-{
-       static struct cli_state *cli1;
-       static struct cli_state *cli2;
-       const char *fname = "\\readonly.file";
-       uint16_t fnum1, fnum2;
-       char buf[20];
-       off_t fsize;
-       bool correct = True;
-       char *tmp_path;
-       NTSTATUS status;
+       /* Posix connection. */
+       if (!torture_open_connection(&posix_cli, 0)) {
+               goto fail;
+       }
 
-       printf("starting open test\n");
+       smbXcli_conn_set_sockopt(posix_cli->conn, sockops);
 
-       if (!torture_open_connection(&cli1, 0)) {
-               return False;
+       status = torture_setup_unix_extensions(posix_cli);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
        }
 
-       cli_setatr(cli1, fname, 0, 0);
-       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       /* Start with a clean slate. */
+       cli_unlink(cli, src, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli, dst, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_rmdir(cli, dsrc);
+       cli_rmdir(cli, ddst);
+       cli_rmdir(cli, dname);
 
-       smbXcli_conn_set_sockopt(cli1->conn, sockops);
+       /*
+        * Setup the destination directory with a DENY ACE to
+        * prevent new files within it.
+        */
+       status = cli_ntcreate(cli,
+                               dname,
+                               0,
+                               FILE_READ_ATTRIBUTES|READ_CONTROL_ACCESS|
+                                       WRITE_DAC_ACCESS|FILE_READ_DATA|
+                                       WRITE_OWNER_ACCESS,
+                               FILE_ATTRIBUTE_DIRECTORY,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE,
+                               FILE_CREATE,
+                               FILE_DIRECTORY_FILE,
+                               0,
+                               &fnum,
+                               NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Create of %s - %s\n", dname, nt_errstr(status));
+               goto fail;
+       }
 
-       status = cli_openx(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
+       status = cli_query_secdesc(cli,
+                               fnum,
+                               frame,
+                               &sd);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("open of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+               printf("cli_query_secdesc failed for %s (%s)\n",
+                       dname, nt_errstr(status));
+               goto fail;
        }
 
-       status = cli_close(cli1, fnum1);
+       newsd = security_descriptor_dacl_create(frame,
+                                       0,
+                                       NULL,
+                                       NULL,
+                                       SID_WORLD,
+                                       SEC_ACE_TYPE_ACCESS_DENIED,
+                                       SEC_DIR_ADD_FILE|SEC_DIR_ADD_SUBDIR,
+                                       0,
+                                       NULL);
+       if (newsd == NULL) {
+               goto fail;
+       }
+       sd->dacl = security_acl_concatenate(frame,
+                                       newsd->dacl,
+                                       sd->dacl);
+       if (sd->dacl == NULL) {
+               goto fail;
+       }
+       status = cli_set_secdesc(cli, fnum, sd);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("close2 failed (%s)\n", nt_errstr(status));
-               return False;
+               printf("cli_set_secdesc failed for %s (%s)\n",
+                       dname, nt_errstr(status));
+               goto fail;
+       }
+       status = cli_close(cli, fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close failed for %s (%s)\n",
+                       dname, nt_errstr(status));
+               goto fail;
+       }
+       /* Now go around the back and chmod to 777 via POSIX. */
+       status = cli_posix_chmod(posix_cli, dname, 0777);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_posix_chmod failed for %s (%s)\n",
+                       dname, nt_errstr(status));
+               goto fail;
        }
 
-       status = cli_setatr(cli1, fname, FILE_ATTRIBUTE_READONLY, 0);
+       /* Check we can't create a file within dname via Windows. */
+       status = cli_openx(cli, dst, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               cli_close(posix_cli, fnum);
+               printf("Create of %s should be ACCESS denied, was %s\n",
+                       dst, nt_errstr(status));
+               goto fail;
+       }
+
+       /* Make the sample file/directory. */
+       status = cli_openx(cli, src, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("cli_setatr failed (%s)\n", nt_errstr(status));
-               return False;
+               printf("open of %s failed (%s)\n", src, nt_errstr(status));
+               goto fail;
+       }
+       status = cli_close(cli, fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_close failed (%s)\n", nt_errstr(status));
+               goto fail;
        }
 
-       status = cli_openx(cli1, fname, O_RDONLY, DENY_WRITE, &fnum1);
+       status = cli_mkdir(cli, dsrc);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("open of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+               printf("cli_mkdir of %s failed (%s)\n",
+                       dsrc, nt_errstr(status));
+               goto fail;
        }
 
-       /* This will fail - but the error should be ERRnoaccess, not ERRbadshare. */
-       status = cli_openx(cli1, fname, O_RDWR, DENY_ALL, &fnum2);
+       /*
+        * OK - renames of the new file and directory into the
+        * dst directory should fail.
+        */
 
-        if (check_error(__LINE__, status, ERRDOS, ERRnoaccess,
-                       NT_STATUS_ACCESS_DENIED)) {
-               printf("correct error code ERRDOS/ERRnoaccess returned\n");
+       status = cli_rename(cli, src, dst, false);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("rename of %s -> %s should be ACCESS denied, was %s\n",
+                       src, dst, nt_errstr(status));
+               goto fail;
+       }
+       status = cli_rename(cli, dsrc, ddst, false);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("rename of %s -> %s should be ACCESS denied, was %s\n",
+                       src, dst, nt_errstr(status));
+               goto fail;
        }
 
-       printf("finished open test 1\n");
+       TALLOC_FREE(frame);
+       return true;
 
-       cli_close(cli1, fnum1);
+  fail:
 
-       /* Now try not readonly and ensure ERRbadshare is returned. */
-
-       cli_setatr(cli1, fname, 0, 0);
-
-       status = cli_openx(cli1, fname, O_RDONLY, DENY_WRITE, &fnum1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("open of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+       if (posix_cli) {
+               torture_close_connection(posix_cli);
        }
 
-       /* This will fail - but the error should be ERRshare. */
-       status = cli_openx(cli1, fname, O_RDWR, DENY_ALL, &fnum2);
+       if (cli) {
+               if (fnum != (uint16_t)-1) {
+                       cli_close(cli, fnum);
+               }
+               cli_unlink(cli, src,
+                       FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+               cli_unlink(cli, dst,
+                       FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+               cli_rmdir(cli, dsrc);
+               cli_rmdir(cli, ddst);
+               cli_rmdir(cli, dname);
 
-       if (check_error(__LINE__, status, ERRDOS, ERRbadshare,
-                       NT_STATUS_SHARING_VIOLATION)) {
-               printf("correct error code ERRDOS/ERRbadshare returned\n");
+               torture_close_connection(cli);
        }
 
-       status = cli_close(cli1, fnum1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("close2 failed (%s)\n", nt_errstr(status));
-               return False;
-       }
+       TALLOC_FREE(frame);
+       return false;
+}
 
-       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+/*
+  Test owner rights ACE.
+ */
+static bool run_owner_rights(int dummy)
+{
+       static struct cli_state *cli = NULL;
+       const char *fname = "owner_rights.txt";
+       uint16_t fnum = (uint16_t)-1;
+       struct security_descriptor *sd = NULL;
+       struct security_descriptor *newsd = NULL;
+       NTSTATUS status;
+       TALLOC_CTX *frame = NULL;
 
-       printf("finished open test 2\n");
+       frame = talloc_stackframe();
+       printf("starting owner rights test\n");
 
-       /* Test truncate open disposition on file opened for read. */
-       status = cli_openx(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("(3) open (1) of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+       /* Windows connection. */
+       if (!torture_open_connection(&cli, 0)) {
+               goto fail;
        }
 
-       /* write 20 bytes. */
+       smbXcli_conn_set_sockopt(cli->conn, sockops);
 
-       memset(buf, '\0', 20);
+       /* Start with a clean slate. */
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
-       status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 0, 20, NULL);
+       /* Create the test file. */
+       /* Now try and open for read and write-dac. */
+       status = cli_ntcreate(cli,
+                               fname,
+                               0,
+                               GENERIC_ALL_ACCESS,
+                               FILE_ATTRIBUTE_NORMAL,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE|
+                                       FILE_SHARE_DELETE,
+                               FILE_CREATE,
+                               0,
+                               0,
+                               &fnum,
+                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("write failed (%s)\n", nt_errstr(status));
-               correct = False;
+               printf("Create of %s - %s\n", fname, nt_errstr(status));
+               goto fail;
        }
 
-       status = cli_close(cli1, fnum1);
+       /* Get the original SD. */
+       status = cli_query_secdesc(cli,
+                               fnum,
+                               frame,
+                               &sd);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("(3) close1 failed (%s)\n", nt_errstr(status));
-               return False;
+               printf("cli_query_secdesc failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
        }
 
-       /* Ensure size == 20. */
-       status = cli_getatr(cli1, fname, NULL, &fsize, NULL);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("(3) getatr failed (%s)\n", nt_errstr(status));
-               return False;
-       }
+       /*
+        * Add an "owner-rights" ACE denying WRITE_DATA,
+        * and an "owner-rights" ACE allowing READ_DATA.
+        */
 
-       if (fsize != 20) {
-               printf("(3) file size != 20\n");
-               return False;
+       newsd = security_descriptor_dacl_create(frame,
+                                       0,
+                                       NULL,
+                                       NULL,
+                                       SID_OWNER_RIGHTS,
+                                       SEC_ACE_TYPE_ACCESS_DENIED,
+                                       FILE_WRITE_DATA,
+                                       0,
+                                       SID_OWNER_RIGHTS,
+                                       SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                       FILE_READ_DATA,
+                                       0,
+                                       NULL);
+       if (newsd == NULL) {
+               goto fail;
        }
-
-       /* Now test if we can truncate a file opened for readonly. */
-       status = cli_openx(cli1, fname, O_RDONLY|O_TRUNC, DENY_NONE, &fnum1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("(3) open (2) of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+       sd->dacl = security_acl_concatenate(frame,
+                                       newsd->dacl,
+                                       sd->dacl);
+       if (sd->dacl == NULL) {
+               goto fail;
        }
-
-       status = cli_close(cli1, fnum1);
+       status = cli_set_secdesc(cli, fnum, sd);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("close2 failed (%s)\n", nt_errstr(status));
-               return False;
+               printf("cli_set_secdesc failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
        }
-
-       /* Ensure size == 0. */
-       status = cli_getatr(cli1, fname, NULL, &fsize, NULL);
+       status = cli_close(cli, fnum);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("(3) getatr failed (%s)\n", nt_errstr(status));
-               return False;
+               printf("close failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
        }
-
-       if (fsize != 0) {
-               printf("(3) file size != 0\n");
-               return False;
+       fnum = (uint16_t)-1;
+
+       /* Try and open for FILE_WRITE_DATA */
+       status = cli_ntcreate(cli,
+                               fname,
+                               0,
+                               FILE_WRITE_DATA,
+                               FILE_ATTRIBUTE_NORMAL,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE|
+                                       FILE_SHARE_DELETE,
+                               FILE_OPEN,
+                               0,
+                               0,
+                               &fnum,
+                               NULL);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("Open of %s - %s\n", fname, nt_errstr(status));
+               goto fail;
        }
-       printf("finished open test 3\n");
 
-       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
-
-       printf("Do ctemp tests\n");
-       status = cli_ctemp(cli1, talloc_tos(), "\\", &fnum1, &tmp_path);
+       /* Now try and open for FILE_READ_DATA */
+       status = cli_ntcreate(cli,
+                               fname,
+                               0,
+                               FILE_READ_DATA,
+                               FILE_ATTRIBUTE_NORMAL,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE|
+                                       FILE_SHARE_DELETE,
+                               FILE_OPEN,
+                               0,
+                               0,
+                               &fnum,
+                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("ctemp failed (%s)\n", nt_errstr(status));
-               return False;
+               printf("Open of %s - %s\n", fname, nt_errstr(status));
+               goto fail;
        }
 
-       printf("ctemp gave path %s\n", tmp_path);
-       status = cli_close(cli1, fnum1);
+       status = cli_close(cli, fnum);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("close of temp failed (%s)\n", nt_errstr(status));
+               printf("close failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
        }
 
-       status = cli_unlink(cli1, tmp_path, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       /* Restore clean slate. */
+       TALLOC_FREE(sd);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       /* Create the test file. */
+       status = cli_ntcreate(cli,
+                               fname,
+                               0,
+                               GENERIC_ALL_ACCESS,
+                               FILE_ATTRIBUTE_NORMAL,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE|
+                                       FILE_SHARE_DELETE,
+                               FILE_CREATE,
+                               0,
+                               0,
+                               &fnum,
+                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("unlink of temp failed (%s)\n", nt_errstr(status));
+               printf("Create of %s - %s\n", fname, nt_errstr(status));
+               goto fail;
        }
 
-       /* Test the non-io opens... */
-
-       if (!torture_open_connection(&cli2, 1)) {
-               return False;
+       /* Get the original SD. */
+       status = cli_query_secdesc(cli,
+                               fnum,
+                               frame,
+                               &sd);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_query_secdesc failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
        }
 
-       cli_setatr(cli2, fname, 0, 0);
-       cli_unlink(cli2, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
-
-       smbXcli_conn_set_sockopt(cli2->conn, sockops);
+       /*
+        * Add an "owner-rights ACE denying WRITE_DATA,
+        * and an "owner-rights ACE allowing READ_DATA|WRITE_DATA.
+        */
 
-       printf("TEST #1 testing 2 non-io opens (no delete)\n");
-       status = cli_ntcreate(cli1, fname, 0, FILE_READ_ATTRIBUTES,
-                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
-                             FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
+       newsd = security_descriptor_dacl_create(frame,
+                                       0,
+                                       NULL,
+                                       NULL,
+                                       SID_OWNER_RIGHTS,
+                                       SEC_ACE_TYPE_ACCESS_DENIED,
+                                       FILE_WRITE_DATA,
+                                       0,
+                                       SID_OWNER_RIGHTS,
+                                       SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                       FILE_READ_DATA|FILE_WRITE_DATA,
+                                       0,
+                                       NULL);
+       if (newsd == NULL) {
+               goto fail;
+       }
+       sd->dacl = security_acl_concatenate(frame,
+                                       newsd->dacl,
+                                       sd->dacl);
+       if (sd->dacl == NULL) {
+               goto fail;
+       }
+       status = cli_set_secdesc(cli, fnum, sd);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #1 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+               printf("cli_set_secdesc failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
        }
-
-       status = cli_ntcreate(cli2, fname, 0, FILE_READ_ATTRIBUTES,
-                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
-                             FILE_OPEN_IF, 0, 0, &fnum2, NULL);
+       status = cli_close(cli, fnum);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #1 open 2 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+               printf("close failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
+       }
+       fnum = (uint16_t)-1;
+
+       /* Try and open for FILE_WRITE_DATA */
+       status = cli_ntcreate(cli,
+                               fname,
+                               0,
+                               FILE_WRITE_DATA,
+                               FILE_ATTRIBUTE_NORMAL,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE|
+                                       FILE_SHARE_DELETE,
+                               FILE_OPEN,
+                               0,
+                               0,
+                               &fnum,
+                               NULL);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("Open of %s - %s\n", fname, nt_errstr(status));
+               goto fail;
        }
 
-       status = cli_close(cli1, fnum1);
+       /* Now try and open for FILE_READ_DATA */
+       status = cli_ntcreate(cli,
+                               fname,
+                               0,
+                               FILE_READ_DATA,
+                               FILE_ATTRIBUTE_NORMAL,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE|
+                                       FILE_SHARE_DELETE,
+                               FILE_OPEN,
+                               0,
+                               0,
+                               &fnum,
+                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #1 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+               printf("Open of %s - %s\n", fname, nt_errstr(status));
+               goto fail;
        }
 
-       status = cli_close(cli2, fnum2);
+       status = cli_close(cli, fnum);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #1 close 2 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+               printf("close failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
        }
 
-       printf("non-io open test #1 passed.\n");
-
-       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       /* Restore clean slate. */
+       TALLOC_FREE(sd);
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
-       printf("TEST #2 testing 2 non-io opens (first with delete)\n");
 
-       status = cli_ntcreate(cli1, fname, 0,
-                             DELETE_ACCESS|FILE_READ_ATTRIBUTES,
-                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
-                             FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
+       /* Create the test file. */
+       status = cli_ntcreate(cli,
+                               fname,
+                               0,
+                               GENERIC_ALL_ACCESS,
+                               FILE_ATTRIBUTE_NORMAL,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE|
+                                       FILE_SHARE_DELETE,
+                               FILE_CREATE,
+                               0,
+                               0,
+                               &fnum,
+                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #2 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+               printf("Create of %s - %s\n", fname, nt_errstr(status));
+               goto fail;
        }
 
-       status = cli_ntcreate(cli2, fname, 0, FILE_READ_ATTRIBUTES,
-                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
-                             FILE_OPEN_IF, 0, 0, &fnum2, NULL);
+       /* Get the original SD. */
+       status = cli_query_secdesc(cli,
+                               fnum,
+                               frame,
+                               &sd);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #2 open 2 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+               printf("cli_query_secdesc failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
        }
 
-       status = cli_close(cli1, fnum1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #2 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
-       }
+       /*
+        * Add an "authenticated users" ACE allowing READ_DATA,
+        * add an "owner-rights" denying READ_DATA,
+        * and an "authenticated users" ACE allowing WRITE_DATA.
+        */
 
-       status = cli_close(cli2, fnum2);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #2 close 2 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+       newsd = security_descriptor_dacl_create(frame,
+                                       0,
+                                       NULL,
+                                       NULL,
+                                       SID_NT_AUTHENTICATED_USERS,
+                                       SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                       FILE_READ_DATA,
+                                       0,
+                                       SID_OWNER_RIGHTS,
+                                       SEC_ACE_TYPE_ACCESS_DENIED,
+                                       FILE_READ_DATA,
+                                       0,
+                                       SID_NT_AUTHENTICATED_USERS,
+                                       SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                       FILE_WRITE_DATA,
+                                       0,
+                                       NULL);
+       if (newsd == NULL) {
+               printf("newsd == NULL\n");
+               goto fail;
        }
-
-       printf("non-io open test #2 passed.\n");
-
-       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
-
-       printf("TEST #3 testing 2 non-io opens (second with delete)\n");
-
-       status = cli_ntcreate(cli1, fname, 0, FILE_READ_ATTRIBUTES,
-                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
-                             FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
+       sd->dacl = security_acl_concatenate(frame,
+                                       newsd->dacl,
+                                       sd->dacl);
+       if (sd->dacl == NULL) {
+               printf("sd->dacl == NULL\n");
+               goto fail;
+       }
+       status = cli_set_secdesc(cli, fnum, sd);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #3 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+               printf("cli_set_secdesc failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
        }
-
-       status = cli_ntcreate(cli2, fname, 0,
-                             DELETE_ACCESS|FILE_READ_ATTRIBUTES,
-                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
-                             FILE_OPEN_IF, 0, 0, &fnum2, NULL);
+       status = cli_close(cli, fnum);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #3 open 2 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+               printf("close failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
        }
-
-       status = cli_close(cli1, fnum1);
+       fnum = (uint16_t)-1;
+
+       /* Now try and open for FILE_READ_DATA|FILE_WRITE_DATA */
+       status = cli_ntcreate(cli,
+                               fname,
+                               0,
+                               FILE_READ_DATA|FILE_WRITE_DATA,
+                               FILE_ATTRIBUTE_NORMAL,
+                               FILE_SHARE_READ|FILE_SHARE_WRITE|
+                                       FILE_SHARE_DELETE,
+                               FILE_OPEN,
+                               0,
+                               0,
+                               &fnum,
+                               NULL);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #3 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+               printf("Open of %s - %s\n", fname, nt_errstr(status));
+               goto fail;
        }
 
-       status = cli_close(cli2, fnum2);
+       status = cli_close(cli, fnum);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #3 close 2 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+               printf("close failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
        }
 
-       printf("non-io open test #3 passed.\n");
+       cli_unlink(cli, fname,
+               FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
-       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       TALLOC_FREE(frame);
+       return true;
 
-       printf("TEST #4 testing 2 non-io opens (both with delete)\n");
+  fail:
 
-       status = cli_ntcreate(cli1, fname, 0,
-                              DELETE_ACCESS|FILE_READ_ATTRIBUTES,
-                              FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
-                              FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #4 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+       if (cli) {
+               if (fnum != (uint16_t)-1) {
+                       cli_close(cli, fnum);
+               }
+               cli_unlink(cli, fname,
+                       FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+               torture_close_connection(cli);
        }
 
-       status = cli_ntcreate(cli2, fname, 0,
-                             DELETE_ACCESS|FILE_READ_ATTRIBUTES,
-                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
-                             FILE_OPEN_IF, 0, 0, &fnum2, NULL);
-       if (NT_STATUS_IS_OK(status)) {
-               printf("TEST #4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, nt_errstr(status));
-               return False;
-       }
+       TALLOC_FREE(frame);
+       return false;
+}
 
-       printf("TEST #4 open 2 of %s gave %s (correct error should be %s)\n", fname, nt_errstr(status), "sharing violation");
+static bool run_pipe_number(int dummy)
+{
+       struct cli_state *cli1;
+       const char *pipe_name = "\\SPOOLSS";
+       uint16_t fnum;
+       int num_pipes = 0;
+       NTSTATUS status;
 
-       status = cli_close(cli1, fnum1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #4 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
+       printf("starting pipenumber test\n");
+       if (!torture_open_connection(&cli1, 0)) {
                return False;
        }
 
-       printf("non-io open test #4 passed.\n");
+       smbXcli_conn_set_sockopt(cli1->conn, sockops);
+       while(1) {
+               status = cli_ntcreate(cli1, pipe_name, 0, FILE_READ_DATA,
+                                     FILE_ATTRIBUTE_NORMAL,
+                                     FILE_SHARE_READ|FILE_SHARE_WRITE,
+                                     FILE_OPEN_IF, 0, 0, &fnum, NULL);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("Open of pipe %s failed with error (%s)\n", pipe_name, nt_errstr(status));
+                       break;
+               }
+               num_pipes++;
+               printf("\r%6d", num_pipes);
+       }
+
+       printf("pipe_number test - we can open %d %s pipes.\n", num_pipes, pipe_name );
+       torture_close_connection(cli1);
+       return True;
+}
 
+/*
+  Test open mode returns on read-only files.
+ */
+static bool run_opentest(int dummy)
+{
+       static struct cli_state *cli1;
+       static struct cli_state *cli2;
+       const char *fname = "\\readonly.file";
+       uint16_t fnum1, fnum2;
+       char buf[20];
+       off_t fsize;
+       bool correct = True;
+       char *tmp_path;
+       NTSTATUS status;
+
+       printf("starting open test\n");
+
+       if (!torture_open_connection(&cli1, 0)) {
+               return False;
+       }
+
+       cli_setatr(cli1, fname, 0, 0);
        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");
+       smbXcli_conn_set_sockopt(cli1->conn, sockops);
 
-       status = cli_ntcreate(cli1, fname, 0,
-                             DELETE_ACCESS|FILE_READ_ATTRIBUTES,
-                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_DELETE,
-                             FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
+       status = cli_openx(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #5 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("open of %s failed (%s)\n", fname, nt_errstr(status));
                return False;
        }
 
-       status = cli_ntcreate(cli2, fname, 0,
-                             DELETE_ACCESS|FILE_READ_ATTRIBUTES,
-                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_DELETE,
-                             FILE_OPEN_IF, 0, 0, &fnum2, NULL);
+       status = cli_close(cli1, fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #5 open 2 of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("close2 failed (%s)\n", nt_errstr(status));
                return False;
        }
 
-       status = cli_close(cli1, fnum1);
+       status = cli_setatr(cli1, fname, FILE_ATTRIBUTE_READONLY, 0);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #5 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("cli_setatr failed (%s)\n", nt_errstr(status));
                return False;
        }
 
-       status = cli_close(cli2, fnum2);
+       status = cli_openx(cli1, fname, O_RDONLY, DENY_WRITE, &fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #5 close 2 of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("open of %s failed (%s)\n", fname, nt_errstr(status));
                return False;
        }
 
-       printf("non-io open test #5 passed.\n");
+       /* This will fail - but the error should be ERRnoaccess, not ERRbadshare. */
+       status = cli_openx(cli1, fname, O_RDWR, DENY_ALL, &fnum2);
 
-       printf("TEST #6 testing 1 non-io open, one io open\n");
+        if (check_error(__LINE__, status, ERRDOS, ERRnoaccess,
+                       NT_STATUS_ACCESS_DENIED)) {
+               printf("correct error code ERRDOS/ERRnoaccess returned\n");
+       }
 
-       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       printf("finished open test 1\n");
 
-       status = cli_ntcreate(cli1, fname, 0, FILE_READ_DATA,
-                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
-                             FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
+       cli_close(cli1, fnum1);
+
+       /* Now try not readonly and ensure ERRbadshare is returned. */
+
+       cli_setatr(cli1, fname, 0, 0);
+
+       status = cli_openx(cli1, fname, O_RDONLY, DENY_WRITE, &fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #6 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("open of %s failed (%s)\n", fname, nt_errstr(status));
                return False;
        }
 
-       status = cli_ntcreate(cli2, fname, 0, FILE_READ_ATTRIBUTES,
-                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ,
-                             FILE_OPEN_IF, 0, 0, &fnum2, NULL);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #6 open 2 of %s failed (%s)\n", fname, nt_errstr(status));
-               return False;
+       /* This will fail - but the error should be ERRshare. */
+       status = cli_openx(cli1, fname, O_RDWR, DENY_ALL, &fnum2);
+
+       if (check_error(__LINE__, status, ERRDOS, ERRbadshare,
+                       NT_STATUS_SHARING_VIOLATION)) {
+               printf("correct error code ERRDOS/ERRbadshare returned\n");
        }
 
        status = cli_close(cli1, fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #6 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("close2 failed (%s)\n", nt_errstr(status));
                return False;
        }
 
-       status = cli_close(cli2, fnum2);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       printf("finished open test 2\n");
+
+       /* Test truncate open disposition on file opened for read. */
+       status = cli_openx(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #6 close 2 of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("(3) open (1) of %s failed (%s)\n", fname, nt_errstr(status));
                return False;
        }
 
-       printf("non-io open test #6 passed.\n");
+       /* write 20 bytes. */
 
-       printf("TEST #7 testing 1 non-io open, one io open with delete\n");
+       memset(buf, '\0', 20);
 
-       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       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;
+       }
 
-       status = cli_ntcreate(cli1, fname, 0, FILE_READ_DATA,
-                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
-                             FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
+       status = cli_close(cli1, fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #7 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("(3) close1 failed (%s)\n", nt_errstr(status));
                return False;
        }
 
-       status = 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, NULL);
-       if (NT_STATUS_IS_OK(status)) {
-               printf("TEST #7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, nt_errstr(status));
+       /* Ensure size == 20. */
+       status = cli_getatr(cli1, fname, NULL, &fsize, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("(3) getatr failed (%s)\n", nt_errstr(status));
                return False;
        }
 
-       printf("TEST #7 open 2 of %s gave %s (correct error should be %s)\n", fname, nt_errstr(status), "sharing violation");
+       if (fsize != 20) {
+               printf("(3) file size != 20\n");
+               return False;
+       }
+
+       /* Now test if we can truncate a file opened for readonly. */
+       status = cli_openx(cli1, fname, O_RDONLY|O_TRUNC, DENY_NONE, &fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("(3) open (2) of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
 
        status = cli_close(cli1, fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #7 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("close2 failed (%s)\n", nt_errstr(status));
                return False;
        }
 
-       printf("non-io open test #7 passed.\n");
+       /* Ensure size == 0. */
+       status = cli_getatr(cli1, fname, NULL, &fsize, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("(3) getatr failed (%s)\n", nt_errstr(status));
+               return False;
+       }
+
+       if (fsize != 0) {
+               printf("(3) file size != 0\n");
+               return False;
+       }
+       printf("finished open test 3\n");
 
        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, NULL);
+       printf("Do ctemp tests\n");
+       status = cli_ctemp(cli1, talloc_tos(), "\\", &fnum1, &tmp_path);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #8 open of %s failed (%s)\n", fname, nt_errstr(status));
-               correct = false;
-               goto out;
+               printf("ctemp failed (%s)\n", nt_errstr(status));
+               return False;
        }
 
-       /* 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);
+       printf("ctemp gave path %s\n", tmp_path);
+       status = cli_close(cli1, fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("TEST #8 cli_write failed: %s\n", nt_errstr(status));
-               correct = false;
-               goto out;
+               printf("close of temp failed (%s)\n", nt_errstr(status));
        }
 
-        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;
-        }
+       status = cli_unlink(cli1, tmp_path, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("unlink of temp failed (%s)\n", nt_errstr(status));
+       }
 
-  out:
+       /* Test the non-io opens... */
 
-       if (!torture_close_connection(cli1)) {
-               correct = False;
-       }
-       if (!torture_close_connection(cli2)) {
-               correct = False;
+       if (!torture_open_connection(&cli2, 1)) {
+               return False;
        }
 
-       return correct;
-}
+       cli_setatr(cli2, fname, 0, 0);
+       cli_unlink(cli2, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
-NTSTATUS torture_setup_unix_extensions(struct cli_state *cli)
-{
-       uint16_t major, minor;
-       uint32_t caplow, caphigh;
-       NTSTATUS status;
+       smbXcli_conn_set_sockopt(cli2->conn, sockops);
 
-       if (!SERVER_HAS_UNIX_CIFS(cli)) {
-               printf("Server doesn't support UNIX CIFS extensions.\n");
-               return NT_STATUS_NOT_SUPPORTED;
+       printf("TEST #1 testing 2 non-io opens (no delete)\n");
+       status = cli_ntcreate(cli1, fname, 0, FILE_READ_ATTRIBUTES,
+                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
+                             FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #1 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
        }
 
-       status = cli_unix_extensions_version(cli, &major, &minor, &caplow,
-                                            &caphigh);
+       status = cli_ntcreate(cli2, fname, 0, FILE_READ_ATTRIBUTES,
+                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
+                             FILE_OPEN_IF, 0, 0, &fnum2, NULL);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("Server didn't return UNIX CIFS extensions: %s\n",
-                      nt_errstr(status));
-               return status;
+               printf("TEST #1 open 2 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
        }
 
-       status = cli_set_unix_extensions_capabilities(cli, major, minor,
-                                                     caplow, caphigh);
+       status = cli_close(cli1, fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("Server doesn't support setting UNIX CIFS extensions: "
-                      "%s.\n", nt_errstr(status));
-               return status;
-        }
+               printf("TEST #1 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
 
-       return NT_STATUS_OK;
+       status = cli_close(cli2, fnum2);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #1 close 2 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       printf("non-io open test #1 passed.\n");
+
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       printf("TEST #2 testing 2 non-io opens (first with delete)\n");
+
+       status = cli_ntcreate(cli1, fname, 0,
+                             DELETE_ACCESS|FILE_READ_ATTRIBUTES,
+                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
+                             FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #2 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_ntcreate(cli2, fname, 0, FILE_READ_ATTRIBUTES,
+                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
+                             FILE_OPEN_IF, 0, 0, &fnum2, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #2 open 2 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_close(cli1, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #2 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_close(cli2, fnum2);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #2 close 2 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       printf("non-io open test #2 passed.\n");
+
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       printf("TEST #3 testing 2 non-io opens (second with delete)\n");
+
+       status = cli_ntcreate(cli1, fname, 0, FILE_READ_ATTRIBUTES,
+                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
+                             FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #3 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_ntcreate(cli2, fname, 0,
+                             DELETE_ACCESS|FILE_READ_ATTRIBUTES,
+                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
+                             FILE_OPEN_IF, 0, 0, &fnum2, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #3 open 2 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_close(cli1, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #3 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_close(cli2, fnum2);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #3 close 2 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       printf("non-io open test #3 passed.\n");
+
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       printf("TEST #4 testing 2 non-io opens (both with delete)\n");
+
+       status = cli_ntcreate(cli1, fname, 0,
+                              DELETE_ACCESS|FILE_READ_ATTRIBUTES,
+                              FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
+                              FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #4 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_ntcreate(cli2, fname, 0,
+                             DELETE_ACCESS|FILE_READ_ATTRIBUTES,
+                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
+                             FILE_OPEN_IF, 0, 0, &fnum2, NULL);
+       if (NT_STATUS_IS_OK(status)) {
+               printf("TEST #4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       printf("TEST #4 open 2 of %s gave %s (correct error should be %s)\n", fname, nt_errstr(status), "sharing violation");
+
+       status = cli_close(cli1, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #4 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       printf("non-io open test #4 passed.\n");
+
+       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");
+
+       status = cli_ntcreate(cli1, fname, 0,
+                             DELETE_ACCESS|FILE_READ_ATTRIBUTES,
+                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_DELETE,
+                             FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #5 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_ntcreate(cli2, fname, 0,
+                             DELETE_ACCESS|FILE_READ_ATTRIBUTES,
+                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_DELETE,
+                             FILE_OPEN_IF, 0, 0, &fnum2, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #5 open 2 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_close(cli1, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #5 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_close(cli2, fnum2);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #5 close 2 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       printf("non-io open test #5 passed.\n");
+
+       printf("TEST #6 testing 1 non-io open, one io open\n");
+
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       status = cli_ntcreate(cli1, fname, 0, FILE_READ_DATA,
+                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
+                             FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #6 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_ntcreate(cli2, fname, 0, FILE_READ_ATTRIBUTES,
+                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ,
+                             FILE_OPEN_IF, 0, 0, &fnum2, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #6 open 2 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_close(cli1, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #6 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_close(cli2, fnum2);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #6 close 2 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       printf("non-io open test #6 passed.\n");
+
+       printf("TEST #7 testing 1 non-io open, one io open with delete\n");
+
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       status = cli_ntcreate(cli1, fname, 0, FILE_READ_DATA,
+                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
+                             FILE_OVERWRITE_IF, 0, 0, &fnum1, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #7 open 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = 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, NULL);
+       if (NT_STATUS_IS_OK(status)) {
+               printf("TEST #7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       printf("TEST #7 open 2 of %s gave %s (correct error should be %s)\n", fname, nt_errstr(status), "sharing violation");
+
+       status = cli_close(cli1, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("TEST #7 close 1 of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       printf("non-io open test #7 passed.\n");
+
+       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, NULL);
+       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;
+       }
+       if (!torture_close_connection(cli2)) {
+               correct = False;
+       }
+
+       return correct;
+}
+
+NTSTATUS torture_setup_unix_extensions(struct cli_state *cli)
+{
+       uint16_t major, minor;
+       uint32_t 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.
+ */
+static bool run_simple_posix_open_test(int dummy)
+{
+       static struct cli_state *cli1;
+       const char *fname = "posix:file";
+       const char *hname = "posix:hlink";
+       const char *sname = "posix:symlink";
+       const char *dname = "posix:dir";
+       char buf[10];
+       char namebuf[11];
+       uint16_t fnum1 = (uint16_t)-1;
+       SMB_STRUCT_STAT sbuf;
+       bool correct = false;
+       NTSTATUS status;
+       size_t nread;
+       const char *fname_windows = "windows_file";
+       uint16_t fnum2 = (uint16_t)-1;
+
+       printf("Starting simple POSIX open test\n");
+
+       if (!torture_open_connection(&cli1, 0)) {
+               return false;
+       }
+
+       smbXcli_conn_set_sockopt(cli1->conn, sockops);
+
+       status = torture_setup_unix_extensions(cli1);
+       if (!NT_STATUS_IS_OK(status)) {
+               return false;
+       }
+
+       cli_setatr(cli1, fname, 0, 0);
+       cli_posix_unlink(cli1, fname);
+       cli_setatr(cli1, dname, 0, 0);
+       cli_posix_rmdir(cli1, dname);
+       cli_setatr(cli1, hname, 0, 0);
+       cli_posix_unlink(cli1, hname);
+       cli_setatr(cli1, sname, 0, 0);
+       cli_posix_unlink(cli1, sname);
+       cli_setatr(cli1, fname_windows, 0, 0);
+       cli_posix_unlink(cli1, fname_windows);
+
+       /* Create a directory. */
+       status = cli_posix_mkdir(cli1, dname, 0777);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX mkdir of %s failed (%s)\n", dname, nt_errstr(status));
+               goto out;
+       }
+
+       status = cli_posix_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL,
+                               0600, &fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX create of %s failed (%s)\n", fname, nt_errstr(status));
+               goto out;
+       }
+
+       /* Test ftruncate - set file size. */
+       status = cli_ftruncate(cli1, fnum1, 1000);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ftruncate failed (%s)\n", nt_errstr(status));
+               goto out;
+       }
+
+       /* Ensure st_size == 1000 */
+       status = cli_posix_stat(cli1, fname, &sbuf);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("stat failed (%s)\n", nt_errstr(status));
+               goto out;
+       }
+
+       if (sbuf.st_ex_size != 1000) {
+               printf("ftruncate - stat size (%u) != 1000\n", (unsigned int)sbuf.st_ex_size);
+               goto out;
+       }
+
+       /* Ensure st_mode == 0600 */
+       if ((sbuf.st_ex_mode & 07777) != 0600) {
+               printf("posix_open - bad permissions 0%o != 0600\n",
+                               (unsigned int)(sbuf.st_ex_mode & 07777));
+               goto out;
+       }
+
+       /* Test ftruncate - set file size back to zero. */
+       status = cli_ftruncate(cli1, fnum1, 0);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ftruncate failed (%s)\n", nt_errstr(status));
+               goto out;
+       }
+
+       status = cli_close(cli1, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close failed (%s)\n", nt_errstr(status));
+               goto out;
+       }
+
+       /* Now open the file again for read only. */
+       status = cli_posix_open(cli1, fname, O_RDONLY, 0, &fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX open of %s failed (%s)\n", fname, nt_errstr(status));
+               goto out;
+       }
+
+       /* Now unlink while open. */
+       status = cli_posix_unlink(cli1, fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX unlink of %s failed (%s)\n", fname, nt_errstr(status));
+               goto out;
+       }
+
+       status = cli_close(cli1, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close(2) failed (%s)\n", nt_errstr(status));
+               goto out;
+       }
+
+       /* Ensure the file has gone. */
+       status = cli_posix_open(cli1, fname, O_RDONLY, 0, &fnum1);
+       if (NT_STATUS_IS_OK(status)) {
+               printf("POSIX open of %s succeeded, should have been deleted.\n", fname);
+               goto out;
+       }
+
+       /* Create again to test open with O_TRUNC. */
+       status = cli_posix_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, 0600, &fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX create of %s failed (%s)\n", fname, nt_errstr(status));
+               goto out;
+       }
+
+       /* Test ftruncate - set file size. */
+       status = cli_ftruncate(cli1, fnum1, 1000);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("ftruncate failed (%s)\n", nt_errstr(status));
+               goto out;
+       }
+
+       /* Ensure st_size == 1000 */
+       status = cli_posix_stat(cli1, fname, &sbuf);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("stat failed (%s)\n", nt_errstr(status));
+               goto out;
+       }
+
+       if (sbuf.st_ex_size != 1000) {
+               printf("ftruncate - stat size (%u) != 1000\n", (unsigned int)sbuf.st_ex_size);
+               goto out;
+       }
+
+       status = cli_close(cli1, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close(2) failed (%s)\n", nt_errstr(status));
+               goto out;
+       }
+
+       /* Re-open with O_TRUNC. */
+       status = cli_posix_open(cli1, fname, O_WRONLY|O_TRUNC, 0600, &fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX create of %s failed (%s)\n", fname, nt_errstr(status));
+               goto out;
+       }
+
+       /* Ensure st_size == 0 */
+       status = cli_posix_stat(cli1, fname, &sbuf);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("stat failed (%s)\n", nt_errstr(status));
+               goto out;
+       }
+
+       if (sbuf.st_ex_size != 0) {
+               printf("O_TRUNC - stat size (%u) != 0\n", (unsigned int)sbuf.st_ex_size);
+               goto out;
+       }
+
+       status = cli_close(cli1, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close failed (%s)\n", nt_errstr(status));
+               goto out;
+       }
+
+       status = cli_posix_unlink(cli1, fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX unlink of %s failed (%s)\n", fname, nt_errstr(status));
+               goto out;
+       }
+
+       status = cli_posix_open(cli1, dname, O_RDONLY, 0, &fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX open directory O_RDONLY of %s failed (%s)\n",
+                       dname, nt_errstr(status));
+               goto out;
+       }
+
+       cli_close(cli1, fnum1);
+
+       /* What happens when we try and POSIX open a directory for write ? */
+       status = cli_posix_open(cli1, dname, O_RDWR, 0, &fnum1);
+       if (NT_STATUS_IS_OK(status)) {
+               printf("POSIX open of directory %s succeeded, should have failed.\n", fname);
+               goto out;
+       } else {
+               if (!check_both_error(__LINE__, status, ERRDOS, EISDIR,
+                               NT_STATUS_FILE_IS_A_DIRECTORY)) {
+                       goto out;
+               }
+       }
+
+       /* Create the file. */
+       status = cli_posix_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL,
+                               0600, &fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX create of %s failed (%s)\n", fname, nt_errstr(status));
+               goto out;
+       }
+
+       /* Write some data into it. */
+       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;
+       }
+
+       cli_close(cli1, fnum1);
+
+       /* Now create a hardlink. */
+       status = cli_posix_hardlink(cli1, fname, hname);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX hardlink of %s failed (%s)\n", hname, nt_errstr(status));
+               goto out;
+       }
+
+       /* Now create a symlink. */
+       status = cli_posix_symlink(cli1, fname, sname);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX symlink of %s failed (%s)\n", sname, nt_errstr(status));
+               goto out;
+       }
+
+       /* Open the hardlink for read. */
+       status = cli_posix_open(cli1, hname, O_RDONLY, 0, &fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX open of %s failed (%s)\n", hname, nt_errstr(status));
+               goto out;
+       }
+
+       status = cli_read(cli1, fnum1, buf, 0, 10, &nread);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX read of %s failed (%s)\n", hname,
+                      nt_errstr(status));
+               goto out;
+       } else if (nread != 10) {
+               printf("POSIX read of %s failed. Received %ld, expected %d\n",
+                      hname, (unsigned long)nread, 10);
+               goto out;
+       }
+
+       if (memcmp(buf, "TEST DATA\n", 10)) {
+               printf("invalid data read from hardlink\n");
+               goto out;
+       }
+
+       /* Do a POSIX lock/unlock. */
+       status = cli_posix_lock(cli1, fnum1, 0, 100, true, READ_LOCK);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX lock failed %s\n", nt_errstr(status));
+               goto out;
+       }
+
+       /* Punch a hole in the locked area. */
+       status = cli_posix_unlock(cli1, fnum1, 10, 80);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX unlock failed %s\n", nt_errstr(status));
+               goto out;
+       }
+
+       cli_close(cli1, fnum1);
+
+       /* Open the symlink for read - this should fail. A POSIX
+          client should not be doing opens on a symlink. */
+       status = cli_posix_open(cli1, sname, O_RDONLY, 0, &fnum1);
+       if (NT_STATUS_IS_OK(status)) {
+               printf("POSIX open of %s succeeded (should have failed)\n", sname);
+               goto out;
+       } else {
+               if (!check_both_error(__LINE__, status, ERRDOS, ERRbadpath,
+                               NT_STATUS_OBJECT_PATH_NOT_FOUND)) {
+                       printf("POSIX open of %s should have failed "
+                               "with NT_STATUS_OBJECT_PATH_NOT_FOUND, "
+                               "failed with %s instead.\n",
+                               sname, nt_errstr(status));
+                       goto out;
+               }
+       }
+
+       status = cli_posix_readlink(cli1, sname, namebuf, sizeof(namebuf));
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX readlink on %s failed (%s)\n", sname, nt_errstr(status));
+               goto out;
+       }
+
+       if (strcmp(namebuf, fname) != 0) {
+               printf("POSIX readlink on %s failed to match name %s (read %s)\n",
+                       sname, fname, namebuf);
+               goto out;
+       }
+
+       status = cli_posix_rmdir(cli1, dname);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX rmdir failed (%s)\n", nt_errstr(status));
+               goto out;
+       }
+
+       /* Check directory opens with a specific permission. */
+       status = cli_posix_mkdir(cli1, dname, 0700);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX mkdir of %s failed (%s)\n", dname, nt_errstr(status));
+               goto out;
+       }
+
+       /* Ensure st_mode == 0700 */
+       status = cli_posix_stat(cli1, dname, &sbuf);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("stat failed (%s)\n", nt_errstr(status));
+               goto out;
+       }
+
+       if ((sbuf.st_ex_mode & 07777) != 0700) {
+               printf("posix_mkdir - bad permissions 0%o != 0700\n",
+                               (unsigned int)(sbuf.st_ex_mode & 07777));
+               goto out;
+       }
+
+       /*
+        * Now create a Windows file, and attempt a POSIX unlink.
+        * This should fail with a sharing violation but due to:
+        *
+        * [Bug 9571] Unlink after open causes smbd to panic
+        *
+        * ensure we've fixed the lock ordering violation.
+        */
+
+       status = cli_ntcreate(cli1, fname_windows, 0,
+                       FILE_READ_DATA|FILE_WRITE_DATA, 0,
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                       FILE_CREATE,
+                       0x0, 0x0, &fnum2, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Windows create of %s failed (%s)\n", fname_windows,
+                       nt_errstr(status));
+               goto out;
+       }
+
+       /* Now try posix_unlink. */
+       status = cli_posix_unlink(cli1, fname_windows);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_SHARING_VIOLATION)) {
+               printf("POSIX unlink of %s should fail "
+                       "with NT_STATUS_SHARING_VIOLATION "
+                       "got %s instead !\n",
+                       fname_windows,
+                       nt_errstr(status));
+               goto out;
+       }
+
+       cli_close(cli1, fnum2);
+
+       printf("Simple POSIX open test passed\n");
+       correct = true;
+
+  out:
+
+       if (fnum1 != (uint16_t)-1) {
+               cli_close(cli1, fnum1);
+               fnum1 = (uint16_t)-1;
+       }
+
+       if (fnum2 != (uint16_t)-1) {
+               cli_close(cli1, fnum2);
+               fnum2 = (uint16_t)-1;
+       }
+
+       cli_setatr(cli1, sname, 0, 0);
+       cli_posix_unlink(cli1, sname);
+       cli_setatr(cli1, hname, 0, 0);
+       cli_posix_unlink(cli1, hname);
+       cli_setatr(cli1, fname, 0, 0);
+       cli_posix_unlink(cli1, fname);
+       cli_setatr(cli1, dname, 0, 0);
+       cli_posix_rmdir(cli1, dname);
+       cli_setatr(cli1, fname_windows, 0, 0);
+       cli_posix_unlink(cli1, fname_windows);
+
+       if (!torture_close_connection(cli1)) {
+               correct = false;
+       }
+
+       return correct;
 }
 
 /*
-  Test POSIX open /mkdir calls.
+  Test POSIX and Windows ACLs are rejected on symlinks.
  */
-static bool run_simple_posix_open_test(int dummy)
+static bool run_acl_symlink_test(int dummy)
 {
-       static struct cli_state *cli1;
-       const char *fname = "posix:file";
-       const char *hname = "posix:hlink";
-       const char *sname = "posix:symlink";
-       const char *dname = "posix:dir";
-       char buf[10];
-       char namebuf[11];
-       uint16_t fnum1 = (uint16_t)-1;
-       SMB_STRUCT_STAT sbuf;
+       static struct cli_state *cli;
+       const char *fname = "posix_file";
+       const char *sname = "posix_symlink";
+       uint16_t fnum = (uint16_t)-1;
        bool correct = false;
        NTSTATUS status;
-       size_t nread;
-       const char *fname_windows = "windows_file";
-       uint16_t fnum2 = (uint16_t)-1;
+       char *posix_acl = NULL;
+       size_t posix_acl_len = 0;
+       char *posix_acl_sym = NULL;
+       size_t posix_acl_len_sym = 0;
+       struct security_descriptor *sd = NULL;
+       struct security_descriptor *sd_sym = NULL;
+       TALLOC_CTX *frame = NULL;
 
-       printf("Starting simple POSIX open test\n");
+       frame = talloc_stackframe();
 
-       if (!torture_open_connection(&cli1, 0)) {
+       printf("Starting acl symlink test\n");
+
+       if (!torture_open_connection(&cli, 0)) {
+               TALLOC_FREE(frame);
                return false;
        }
 
-       smbXcli_conn_set_sockopt(cli1->conn, sockops);
+       smbXcli_conn_set_sockopt(cli->conn, sockops);
 
-       status = torture_setup_unix_extensions(cli1);
+       status = torture_setup_unix_extensions(cli);
        if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
                return false;
        }
 
-       cli_setatr(cli1, fname, 0, 0);
-       cli_posix_unlink(cli1, fname);
-       cli_setatr(cli1, dname, 0, 0);
-       cli_posix_rmdir(cli1, dname);
-       cli_setatr(cli1, hname, 0, 0);
-       cli_posix_unlink(cli1, hname);
-       cli_setatr(cli1, sname, 0, 0);
-       cli_posix_unlink(cli1, sname);
-       cli_setatr(cli1, fname_windows, 0, 0);
-       cli_posix_unlink(cli1, fname_windows);
+       cli_setatr(cli, fname, 0, 0);
+       cli_posix_unlink(cli, fname);
+       cli_setatr(cli, sname, 0, 0);
+       cli_posix_unlink(cli, sname);
+
+       status = cli_ntcreate(cli,
+                       fname,
+                       0,
+                       READ_CONTROL_ACCESS,
+                       0,
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                       FILE_CREATE,
+                       0x0,
+                       0x0,
+                       &fnum,
+                       NULL);
 
-       /* Create a directory. */
-       status = cli_posix_mkdir(cli1, dname, 0777);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX mkdir of %s failed (%s)\n", dname, nt_errstr(status));
+               printf("cli_ntcreate of %s failed (%s)\n",
+                       fname,
+                       nt_errstr(status));
                goto out;
        }
 
-       status = cli_posix_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL,
-                               0600, &fnum1);
+       /* Get the Windows ACL on the file. */
+       status = cli_query_secdesc(cli,
+                               fnum,
+                               frame,
+                               &sd);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX create of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("cli_query_secdesc failed (%s)\n",
+                       nt_errstr(status));
                goto out;
        }
 
-       /* Test ftruncate - set file size. */
-       status = cli_ftruncate(cli1, fnum1, 1000);
+       /* Get the POSIX ACL on the file. */
+       status = cli_posix_getacl(cli,
+                               fname,
+                               frame,
+                               &posix_acl_len,
+                               &posix_acl);
+
        if (!NT_STATUS_IS_OK(status)) {
-               printf("ftruncate failed (%s)\n", nt_errstr(status));
+               printf("cli_posix_getacl failed (%s)\n",
+                       nt_errstr(status));
                goto out;
        }
 
-       /* Ensure st_size == 1000 */
-       status = cli_posix_stat(cli1, fname, &sbuf);
+       status = cli_close(cli, fnum);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("stat failed (%s)\n", nt_errstr(status));
+               printf("close failed (%s)\n", nt_errstr(status));
                goto out;
        }
+       fnum = (uint16_t)-1;
 
-       if (sbuf.st_ex_size != 1000) {
-               printf("ftruncate - stat size (%u) != 1000\n", (unsigned int)sbuf.st_ex_size);
+       /* Now create a symlink. */
+       status = cli_posix_symlink(cli, fname, sname);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_posix_symlink of %s -> %s failed (%s)\n",
+                       sname,
+                       fname,
+                       nt_errstr(status));
                goto out;
        }
 
-       /* Ensure st_mode == 0600 */
-       if ((sbuf.st_ex_mode & 07777) != 0600) {
-               printf("posix_open - bad permissions 0%o != 0600\n",
-                               (unsigned int)(sbuf.st_ex_mode & 07777));
+       /* Open a handle on the symlink. */
+       status = cli_ntcreate(cli,
+                       sname,
+                       0,
+                       READ_CONTROL_ACCESS|SEC_STD_WRITE_DAC,
+                       0,
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                       FILE_OPEN,
+                       0x0,
+                       0x0,
+                       &fnum,
+                       NULL);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_posix_open of %s failed (%s)\n",
+                       sname,
+                       nt_errstr(status));
                goto out;
        }
 
-       /* Test ftruncate - set file size back to zero. */
-       status = cli_ftruncate(cli1, fnum1, 0);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("ftruncate failed (%s)\n", nt_errstr(status));
+       /* Get the Windows ACL on the symlink handle. Should fail */
+       status = cli_query_secdesc(cli,
+                               fnum,
+                               frame,
+                               &sd_sym);
+
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("cli_query_secdesc on a symlink gave %s. "
+                       "Should be NT_STATUS_ACCESS_DENIED.\n",
+                       nt_errstr(status));
                goto out;
        }
 
-       status = cli_close(cli1, fnum1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("close failed (%s)\n", nt_errstr(status));
+       /* Get the POSIX ACL on the symlink pathname. Should fail. */
+       status = cli_posix_getacl(cli,
+                               sname,
+                               frame,
+                               &posix_acl_len_sym,
+                               &posix_acl_sym);
+
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("cli_posix_getacl on a symlink gave %s. "
+                       "Should be NT_STATUS_ACCESS_DENIED.\n",
+                       nt_errstr(status));
                goto out;
        }
 
-       /* Now open the file again for read only. */
-       status = cli_posix_open(cli1, fname, O_RDONLY, 0, &fnum1);
+       /* Set the Windows ACL on the symlink handle. Should fail */
+       status = cli_set_security_descriptor(cli,
+                               fnum,
+                               SECINFO_DACL,
+                               sd);
+
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("cli_query_secdesc on a symlink gave %s. "
+                       "Should be NT_STATUS_ACCESS_DENIED.\n",
+                       nt_errstr(status));
+               goto out;
+       }
+
+       /* Set the POSIX ACL on the symlink pathname. Should fail. */
+       status = cli_posix_setacl(cli,
+                               sname,
+                               posix_acl,
+                               posix_acl_len);
+
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("cli_posix_getacl on a symlink gave %s. "
+                       "Should be NT_STATUS_ACCESS_DENIED.\n",
+                       nt_errstr(status));
+               goto out;
+       }
+
+       printf("ACL symlink test passed\n");
+       correct = true;
+
+  out:
+
+       if (fnum != (uint16_t)-1) {
+               cli_close(cli, fnum);
+               fnum = (uint16_t)-1;
+       }
+
+       cli_setatr(cli, sname, 0, 0);
+       cli_posix_unlink(cli, sname);
+       cli_setatr(cli, fname, 0, 0);
+       cli_posix_unlink(cli, fname);
+
+       if (!torture_close_connection(cli)) {
+               correct = false;
+       }
+
+       TALLOC_FREE(frame);
+       return correct;
+}
+
+/*
+  Test POSIX can delete a file containing streams.
+ */
+static bool run_posix_stream_delete(int dummy)
+{
+       struct cli_state *cli1 = NULL;
+       struct cli_state *cli2 = NULL;
+       const char *fname = "streamfile";
+       const char *stream_fname = "streamfile:Zone.Identifier:$DATA";
+       uint16_t fnum1 = (uint16_t)-1;
+       bool correct = false;
+       NTSTATUS status;
+       TALLOC_CTX *frame = NULL;
+
+       frame = talloc_stackframe();
+
+       printf("Starting POSIX stream delete test\n");
+
+       if (!torture_open_connection(&cli1, 0) ||
+                       !torture_open_connection(&cli2, 1)) {
+               TALLOC_FREE(frame);
+               return false;
+       }
+
+       smbXcli_conn_set_sockopt(cli1->conn, sockops);
+       smbXcli_conn_set_sockopt(cli2->conn, sockops);
+
+       status = torture_setup_unix_extensions(cli2);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX open of %s failed (%s)\n", fname, nt_errstr(status));
                goto out;
        }
 
-       /* Now unlink while open. */
-       status = cli_posix_unlink(cli1, fname);
+       cli_setatr(cli1, fname, 0, 0);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       /* Create the file. */
+       status = cli_ntcreate(cli1,
+                       fname,
+                       0,
+                       READ_CONTROL_ACCESS,
+                       0,
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                       FILE_CREATE,
+                       0x0,
+                       0x0,
+                       &fnum1,
+                       NULL);
+
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX unlink of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("cli_ntcreate of %s failed (%s)\n",
+                       fname,
+                       nt_errstr(status));
                goto out;
        }
 
        status = cli_close(cli1, fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("close(2) failed (%s)\n", nt_errstr(status));
+               printf("cli_close of %s failed (%s)\n",
+                       fname,
+                       nt_errstr(status));
                goto out;
        }
+       fnum1 = (uint16_t)-1;
 
-       /* Ensure the file has gone. */
-       status = cli_posix_open(cli1, fname, O_RDONLY, 0, &fnum1);
-       if (NT_STATUS_IS_OK(status)) {
-               printf("POSIX open of %s succeeded, should have been deleted.\n", fname);
-               goto out;
-       }
+       /* Now create the stream. */
+       status = cli_ntcreate(cli1,
+                       stream_fname,
+                       0,
+                       FILE_WRITE_DATA,
+                       0,
+                       FILE_SHARE_READ|FILE_SHARE_WRITE,
+                       FILE_CREATE,
+                       0x0,
+                       0x0,
+                       &fnum1,
+                       NULL);
 
-       /* Create again to test open with O_TRUNC. */
-       status = cli_posix_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, 0600, &fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX create of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("cli_ntcreate of %s failed (%s)\n",
+                       stream_fname,
+                       nt_errstr(status));
                goto out;
        }
 
-       /* Test ftruncate - set file size. */
-       status = cli_ftruncate(cli1, fnum1, 1000);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("ftruncate failed (%s)\n", nt_errstr(status));
-               goto out;
-       }
+       /* Leave the stream handle open... */
 
-       /* Ensure st_size == 1000 */
-       status = cli_posix_stat(cli1, fname, &sbuf);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("stat failed (%s)\n", nt_errstr(status));
+       /* POSIX unlink should fail. */
+       status = cli_posix_unlink(cli2, fname);
+       if (NT_STATUS_IS_OK(status)) {
+               printf("cli_posix_unlink of %s succeeded, should have failed\n",
+                       fname);
                goto out;
        }
 
-       if (sbuf.st_ex_size != 1000) {
-               printf("ftruncate - stat size (%u) != 1000\n", (unsigned int)sbuf.st_ex_size);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_SHARING_VIOLATION)) {
+               printf("cli_posix_unlink of %s failed with (%s) "
+                       "should have been NT_STATUS_SHARING_VIOLATION\n",
+                       fname,
+                       nt_errstr(status));
                goto out;
        }
 
+       /* Close the stream handle. */
        status = cli_close(cli1, fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("close(2) failed (%s)\n", nt_errstr(status));
+               printf("cli_close of %s failed (%s)\n",
+                       stream_fname,
+                       nt_errstr(status));
                goto out;
        }
+       fnum1 = (uint16_t)-1;
 
-       /* Re-open with O_TRUNC. */
-       status = cli_posix_open(cli1, fname, O_WRONLY|O_TRUNC, 0600, &fnum1);
+       /* POSIX unlink after stream handle closed should succeed. */
+       status = cli_posix_unlink(cli2, fname);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX create of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("cli_posix_unlink of %s failed (%s)\n",
+                       fname,
+                       nt_errstr(status));
                goto out;
        }
 
-       /* Ensure st_size == 0 */
-       status = cli_posix_stat(cli1, fname, &sbuf);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("stat failed (%s)\n", nt_errstr(status));
-               goto out;
-       }
+       printf("POSIX stream delete test passed\n");
+       correct = true;
 
-       if (sbuf.st_ex_size != 0) {
-               printf("O_TRUNC - stat size (%u) != 0\n", (unsigned int)sbuf.st_ex_size);
-               goto out;
+  out:
+
+       if (fnum1 != (uint16_t)-1) {
+               cli_close(cli1, fnum1);
+               fnum1 = (uint16_t)-1;
        }
 
-       status = cli_close(cli1, fnum1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("close failed (%s)\n", nt_errstr(status));
-               goto out;
+       cli_setatr(cli1, fname, 0, 0);
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       if (!torture_close_connection(cli1)) {
+               correct = false;
+       }
+       if (!torture_close_connection(cli2)) {
+               correct = false;
        }
 
-       status = cli_posix_unlink(cli1, fname);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX unlink of %s failed (%s)\n", fname, nt_errstr(status));
-               goto out;
+       TALLOC_FREE(frame);
+       return correct;
+}
+
+/*
+  Test setting EA's are rejected on symlinks.
+ */
+static bool run_ea_symlink_test(int dummy)
+{
+       static struct cli_state *cli;
+       const char *fname = "posix_file_ea";
+       const char *sname = "posix_symlink_ea";
+       const char *ea_name = "testea_name";
+       const char *ea_value = "testea_value";
+       uint16_t fnum = (uint16_t)-1;
+       bool correct = false;
+       NTSTATUS status;
+       size_t i, num_eas;
+       struct ea_struct *eas = NULL;
+       TALLOC_CTX *frame = NULL;
+
+       frame = talloc_stackframe();
+
+       printf("Starting EA symlink test\n");
+
+       if (!torture_open_connection(&cli, 0)) {
+               TALLOC_FREE(frame);
+               return false;
        }
 
-       status = cli_posix_open(cli1, dname, O_RDONLY, 0, &fnum1);
+       smbXcli_conn_set_sockopt(cli->conn, sockops);
+
+       status = torture_setup_unix_extensions(cli);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX open directory O_RDONLY of %s failed (%s)\n",
-                       dname, nt_errstr(status));
-               goto out;
+               TALLOC_FREE(frame);
+               return false;
        }
 
-       cli_close(cli1, fnum1);
+       cli_setatr(cli, fname, 0, 0);
+       cli_posix_unlink(cli, fname);
+       cli_setatr(cli, sname, 0, 0);
+       cli_posix_unlink(cli, sname);
 
-       /* What happens when we try and POSIX open a directory for write ? */
-       status = cli_posix_open(cli1, dname, O_RDWR, 0, &fnum1);
-       if (NT_STATUS_IS_OK(status)) {
-               printf("POSIX open of directory %s succeeded, should have failed.\n", fname);
-               goto out;
-       } else {
-               if (!check_both_error(__LINE__, status, ERRDOS, EISDIR,
-                               NT_STATUS_FILE_IS_A_DIRECTORY)) {
-                       goto out;
-               }
-       }
+       status = cli_ntcreate(cli,
+                       fname,
+                       0,
+                       READ_CONTROL_ACCESS,
+                       0,
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                       FILE_CREATE,
+                       0x0,
+                       0x0,
+                       &fnum,
+                       NULL);
 
-       /* Create the file. */
-       status = cli_posix_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL,
-                               0600, &fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX create of %s failed (%s)\n", fname, nt_errstr(status));
+               printf("cli_ntcreate of %s failed (%s)\n",
+                       fname,
+                       nt_errstr(status));
                goto out;
        }
 
-       /* Write some data into it. */
-       status = cli_writeall(cli1, fnum1, 0, (const uint8_t *)"TEST DATA\n", 0, 10,
-                             NULL);
+       status = cli_close(cli, fnum);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("cli_write failed: %s\n", nt_errstr(status));
+               printf("close failed (%s)\n",
+                       nt_errstr(status));
                goto out;
        }
+       fnum = (uint16_t)-1;
 
-       cli_close(cli1, fnum1);
+       /* Set an EA on the path. */
+       status = cli_set_ea_path(cli,
+                               fname,
+                               ea_name,
+                               ea_value,
+                               strlen(ea_value)+1);
 
-       /* Now create a hardlink. */
-       status = cli_posix_hardlink(cli1, fname, hname);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX hardlink of %s failed (%s)\n", hname, nt_errstr(status));
+               printf("cli_set_ea_path failed (%s)\n",
+                       nt_errstr(status));
                goto out;
        }
 
        /* Now create a symlink. */
-       status = cli_posix_symlink(cli1, fname, sname);
+       status = cli_posix_symlink(cli, fname, sname);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX symlink of %s failed (%s)\n", sname, nt_errstr(status));
+               printf("cli_posix_symlink of %s -> %s failed (%s)\n",
+                       sname,
+                       fname,
+                       nt_errstr(status));
                goto out;
        }
 
-       /* Open the hardlink for read. */
-       status = cli_posix_open(cli1, hname, O_RDONLY, 0, &fnum1);
+       /* Get the EA list on the path. Should return value set. */
+       status = cli_get_ea_list_path(cli,
+                               fname,
+                               frame,
+                               &num_eas,
+                               &eas);
+
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX open of %s failed (%s)\n", hname, nt_errstr(status));
+               printf("cli_get_ea_list_path failed (%s)\n",
+                       nt_errstr(status));
                goto out;
        }
 
-       status = cli_read(cli1, fnum1, buf, 0, 10, &nread);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX read of %s failed (%s)\n", hname,
-                      nt_errstr(status));
-               goto out;
-       } else if (nread != 10) {
-               printf("POSIX read of %s failed. Received %ld, expected %d\n",
-                      hname, (unsigned long)nread, 10);
-               goto out;
+       /* Ensure the EA we set is there. */
+       for (i=0; i<num_eas; i++) {
+               if (strcmp(eas[i].name, ea_name) == 0 &&
+                               eas[i].value.length == strlen(ea_value)+1 &&
+                               memcmp(eas[i].value.data,
+                                       ea_value,
+                                       eas[i].value.length) == 0) {
+                       break;
+               }
        }
 
-       if (memcmp(buf, "TEST DATA\n", 10)) {
-               printf("invalid data read from hardlink\n");
+       if (i == num_eas) {
+               printf("Didn't find EA on pathname %s\n",
+                       fname);
                goto out;
        }
 
-       /* Do a POSIX lock/unlock. */
-       status = cli_posix_lock(cli1, fnum1, 0, 100, true, READ_LOCK);
+       num_eas = 0;
+       TALLOC_FREE(eas);
+
+       /* Get the EA list on the symlink. Should return empty list. */
+       status = cli_get_ea_list_path(cli,
+                               sname,
+                               frame,
+                               &num_eas,
+                               &eas);
+
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX lock failed %s\n", nt_errstr(status));
+               printf("cli_get_ea_list_path failed (%s)\n",
+                       nt_errstr(status));
                goto out;
        }
 
-       /* Punch a hole in the locked area. */
-       status = cli_posix_unlock(cli1, fnum1, 10, 80);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX unlock failed %s\n", nt_errstr(status));
+       if (num_eas != 0) {
+               printf("cli_get_ea_list_path failed (%s)\n",
+                       nt_errstr(status));
                goto out;
        }
 
-       cli_close(cli1, fnum1);
+       /* Set an EA on the symlink. Should fail. */
+       status = cli_set_ea_path(cli,
+                               sname,
+                               ea_name,
+                               ea_value,
+                               strlen(ea_value)+1);
 
-       /* Open the symlink for read - this should fail. A POSIX
-          client should not be doing opens on a symlink. */
-       status = cli_posix_open(cli1, sname, O_RDONLY, 0, &fnum1);
-       if (NT_STATUS_IS_OK(status)) {
-               printf("POSIX open of %s succeeded (should have failed)\n", sname);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+               printf("cli_set_ea_path on a symlink gave %s. "
+                       "Should be NT_STATUS_ACCESS_DENIED.\n",
+                       nt_errstr(status));
                goto out;
-       } else {
-               if (!check_both_error(__LINE__, status, ERRDOS, ERRbadpath,
-                               NT_STATUS_OBJECT_PATH_NOT_FOUND)) {
-                       printf("POSIX open of %s should have failed "
-                               "with NT_STATUS_OBJECT_PATH_NOT_FOUND, "
-                               "failed with %s instead.\n",
-                               sname, nt_errstr(status));
-                       goto out;
-               }
        }
 
-       status = cli_posix_readlink(cli1, sname, namebuf, sizeof(namebuf));
+       printf("EA symlink test passed\n");
+       correct = true;
+
+  out:
+
+       if (fnum != (uint16_t)-1) {
+               cli_close(cli, fnum);
+               fnum = (uint16_t)-1;
+       }
+
+       cli_setatr(cli, sname, 0, 0);
+       cli_posix_unlink(cli, sname);
+       cli_setatr(cli, fname, 0, 0);
+       cli_posix_unlink(cli, fname);
+
+       if (!torture_close_connection(cli)) {
+               correct = false;
+       }
+
+       TALLOC_FREE(frame);
+       return correct;
+}
+
+/*
+  Test POSIX locks are OFD-locks.
+ */
+static bool run_posix_ofd_lock_test(int dummy)
+{
+       static struct cli_state *cli;
+       const char *fname = "posix_file";
+       uint16_t fnum1 = (uint16_t)-1;
+       uint16_t fnum2 = (uint16_t)-1;
+       bool correct = false;
+       NTSTATUS status;
+       TALLOC_CTX *frame = NULL;
+
+       frame = talloc_stackframe();
+
+       printf("Starting POSIX ofd-lock test\n");
+
+       if (!torture_open_connection(&cli, 0)) {
+               TALLOC_FREE(frame);
+               return false;
+       }
+
+       smbXcli_conn_set_sockopt(cli->conn, sockops);
+
+       status = torture_setup_unix_extensions(cli);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX readlink on %s failed (%s)\n", sname, nt_errstr(status));
-               goto out;
+               TALLOC_FREE(frame);
+               return false;
        }
 
-       if (strcmp(namebuf, fname) != 0) {
-               printf("POSIX readlink on %s failed to match name %s (read %s)\n",
-                       sname, fname, namebuf);
+       cli_setatr(cli, fname, 0, 0);
+       cli_posix_unlink(cli, fname);
+
+       /* Open the file twice. */
+       status = cli_posix_open(cli, fname, O_RDWR|O_CREAT|O_EXCL,
+                               0600, &fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("First POSIX open of %s failed\n", fname);
                goto out;
        }
 
-       status = cli_posix_rmdir(cli1, dname);
+       status = cli_posix_open(cli, fname, O_RDWR, 0, &fnum2);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX rmdir failed (%s)\n", nt_errstr(status));
+               printf("First POSIX open of %s failed\n", fname);
                goto out;
        }
 
-       /* Check directory opens with a specific permission. */
-       status = cli_posix_mkdir(cli1, dname, 0700);
+       /* Set a 0-50 lock on fnum1. */
+       status = cli_posix_lock(cli, fnum1, 0, 50, false, WRITE_LOCK);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("POSIX mkdir of %s failed (%s)\n", dname, nt_errstr(status));
+               printf("POSIX lock (1) failed %s\n", nt_errstr(status));
                goto out;
        }
 
-       /* Ensure st_mode == 0700 */
-       status = cli_posix_stat(cli1, dname, &sbuf);
+       /* Set a 60-100 lock on fnum2. */
+       status = cli_posix_lock(cli, fnum2, 60, 100, false, WRITE_LOCK);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("stat failed (%s)\n", nt_errstr(status));
+               printf("POSIX lock (2) failed %s\n", nt_errstr(status));
                goto out;
        }
 
-       if ((sbuf.st_ex_mode & 07777) != 0700) {
-               printf("posix_mkdir - bad permissions 0%o != 0700\n",
-                               (unsigned int)(sbuf.st_ex_mode & 07777));
+       /* close fnum1 - 0-50 lock should go away. */
+       status = cli_close(cli, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close failed (%s)\n",
+                       nt_errstr(status));
                goto out;
        }
+       fnum1 = (uint16_t)-1;
 
-       /*
-        * Now create a Windows file, and attempt a POSIX unlink.
-        * This should fail with a sharing violation but due to:
-        *
-        * [Bug 9571] Unlink after open causes smbd to panic
-        *
-        * ensure we've fixed the lock ordering violation.
-        */
+       /* Change the lock context. */
+       cli_setpid(cli, cli_getpid(cli) + 1);
 
-       status = cli_ntcreate(cli1, fname_windows, 0,
-                       FILE_READ_DATA|FILE_WRITE_DATA, 0,
-                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
-                       FILE_CREATE,
-                       0x0, 0x0, &fnum2, NULL);
+       /* Re-open fnum1. */
+       status = cli_posix_open(cli, fname, O_RDWR, 0, &fnum1);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("Windows create of %s failed (%s)\n", fname_windows,
-                       nt_errstr(status));
+               printf("Third POSIX open of %s failed\n", fname);
                goto out;
        }
-
-       /* Now try posix_unlink. */
-       status = cli_posix_unlink(cli1, fname_windows);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_SHARING_VIOLATION)) {
-               printf("POSIX unlink of %s should fail "
-                       "with NT_STATUS_SHARING_VIOLATION "
-                       "got %s instead !\n",
-                       fname_windows,
-                       nt_errstr(status));
+
+       /* 60-100 lock should still be there. */
+       status = cli_posix_lock(cli, fnum1, 60, 100, false, WRITE_LOCK);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_LOCK_CONFLICT)) {
+               printf("POSIX lock 60-100 not there %s\n", nt_errstr(status));
                goto out;
        }
 
-       cli_close(cli1, fnum2);
+       /* 0-50 lock should be gone. */
+       status = cli_posix_lock(cli, fnum1, 0, 50, false, WRITE_LOCK);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX lock 0-50 failed %s\n", nt_errstr(status));
+               goto out;
+       }
 
-       printf("Simple POSIX open test passed\n");
+       printf("POSIX OFD lock test passed\n");
        correct = true;
 
   out:
 
        if (fnum1 != (uint16_t)-1) {
-               cli_close(cli1, fnum1);
+               cli_close(cli, fnum1);
                fnum1 = (uint16_t)-1;
        }
-
        if (fnum2 != (uint16_t)-1) {
-               cli_close(cli1, fnum2);
+               cli_close(cli, fnum2);
                fnum2 = (uint16_t)-1;
        }
 
-       cli_setatr(cli1, sname, 0, 0);
-       cli_posix_unlink(cli1, sname);
-       cli_setatr(cli1, hname, 0, 0);
-       cli_posix_unlink(cli1, hname);
-       cli_setatr(cli1, fname, 0, 0);
-       cli_posix_unlink(cli1, fname);
-       cli_setatr(cli1, dname, 0, 0);
-       cli_posix_rmdir(cli1, dname);
-       cli_setatr(cli1, fname_windows, 0, 0);
-       cli_posix_unlink(cli1, fname_windows);
+       cli_setatr(cli, fname, 0, 0);
+       cli_posix_unlink(cli, fname);
 
-       if (!torture_close_connection(cli1)) {
+       if (!torture_close_connection(cli)) {
                correct = false;
        }
 
+       TALLOC_FREE(frame);
        return correct;
 }
 
-
 static uint32_t open_attrs_table[] = {
                FILE_ATTRIBUTE_NORMAL,
                FILE_ATTRIBUTE_ARCHIVE,
@@ -6476,7 +7916,7 @@ static bool run_error_map_extract(int dummy) {
                return False;
        }
 
-       status = cli_session_setup(c_nt, "", "", 0, "", 0, workgroup);
+       status = cli_session_setup_anon(c_nt);
        if (!NT_STATUS_IS_OK(status)) {
                printf("%s rejected the NT-error initial session setup (%s)\n",host, nt_errstr(status));
                return False;
@@ -6503,7 +7943,7 @@ static bool run_error_map_extract(int dummy) {
                return False;
        }
 
-       status = cli_session_setup(c_dos, "", "", 0, "", 0, workgroup);
+       status = cli_session_setup_anon(c_dos);
        if (!NT_STATUS_IS_OK(status)) {
                printf("%s rejected the DOS-error initial session setup (%s)\n",
                        host, nt_errstr(status));
@@ -6514,12 +7954,25 @@ static bool run_error_map_extract(int dummy) {
        c_dos->map_dos_errors = false;
 
        for (error=(0xc0000000 | 0x1); error < (0xc0000000| 0xFFF); error++) {
+               struct cli_credentials *user_creds = NULL;
+
                fstr_sprintf(user, "%X", error);
 
-               status = cli_session_setup(c_nt, user,
-                                          password, strlen(password),
-                                          password, strlen(password),
-                                          workgroup);
+               user_creds = cli_session_creds_init(talloc_tos(),
+                                                   user,
+                                                   workgroup,
+                                                   NULL, /* realm */
+                                                   password,
+                                                   false, /* use_kerberos */
+                                                   false, /* fallback_after_kerberos */
+                                                   false, /* use_ccache */
+                                                   false); /* password_is_nt_hash */
+               if (user_creds == NULL) {
+                       printf("cli_session_creds_init(%s) failed\n", user);
+                       return false;
+               }
+
+               status = cli_session_setup_creds(c_nt, user_creds);
                if (NT_STATUS_IS_OK(status)) {
                        printf("/** Session setup succeeded.  This shouldn't happen...*/\n");
                }
@@ -6533,10 +7986,7 @@ static bool run_error_map_extract(int dummy) {
                        nt_status = NT_STATUS(0xc0000000);
                }
 
-               status = cli_session_setup(c_dos, user,
-                                          password, strlen(password),
-                                          password, strlen(password),
-                                          workgroup);
+               status = cli_session_setup_creds(c_dos, user_creds);
                if (NT_STATUS_IS_OK(status)) {
                        printf("/** Session setup succeeded.  This shouldn't happen...*/\n");
                }
@@ -6561,6 +8011,8 @@ static bool run_error_map_extract(int dummy) {
                       smb_dos_err_class(errclass), 
                       smb_dos_err_name(errclass, errnum), 
                       get_nt_error_c_code(talloc_tos(), NT_STATUS(error)));
+
+               TALLOC_FREE(user_creds);
        }
        return True;
 }
@@ -6586,13 +8038,9 @@ static bool run_sesssetup_bench(int dummy)
        }
 
        for (i=0; i<torture_numops; i++) {
-               status = cli_session_setup(
-                       c, username,
-                       password, strlen(password),
-                       password, strlen(password),
-                       workgroup);
+               status = cli_session_setup_creds(c, torture_creds);
                if (!NT_STATUS_IS_OK(status)) {
-                       d_printf("(%s) cli_session_setup failed: %s\n",
+                       d_printf("(%s) cli_session_setup_creds failed: %s\n",
                                 __location__, nt_errstr(status));
                        return false;
                }
@@ -6673,6 +8121,7 @@ static bool run_chain1(int dummy)
        struct tevent_req *reqs[3], *smbreqs[3];
        bool done = false;
        const char *str = "foobar";
+       const char *fname = "\\test_chain";
        NTSTATUS status;
 
        printf("starting chain1 test\n");
@@ -6682,7 +8131,9 @@ static bool run_chain1(int dummy)
 
        smbXcli_conn_set_sockopt(cli1->conn, sockops);
 
-       reqs[0] = cli_openx_create(talloc_tos(), evt, cli1, "\\test",
+       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       reqs[0] = cli_openx_create(talloc_tos(), evt, cli1, fname,
                                  O_CREAT|O_RDWR, 0, &smbreqs[0]);
        if (reqs[0] == NULL) return false;
        tevent_req_set_callback(reqs[0], chain1_open_completion, NULL);
@@ -6694,7 +8145,7 @@ static bool run_chain1(int dummy)
        if (reqs[1] == NULL) return false;
        tevent_req_set_callback(reqs[1], chain1_write_completion, NULL);
 
-       reqs[2] = cli_close_create(talloc_tos(), evt, cli1, 0, &smbreqs[2]);
+       reqs[2] = cli_smb1_close_create(talloc_tos(), evt, cli1, 0, &smbreqs[2]);
        if (reqs[2] == NULL) return false;
        tevent_req_set_callback(reqs[2], chain1_close_completion, &done);
 
@@ -6734,10 +8185,11 @@ static bool run_chain2(int dummy)
        struct tevent_req *reqs[2], *smbreqs[2];
        bool done = false;
        NTSTATUS status;
+       int flags = CLI_FULL_CONNECTION_FORCE_SMB1;
 
        printf("starting chain2 test\n");
        status = cli_start_connection(&cli1, lp_netbios_name(), host, NULL,
-                                     port_to_use, SMB_SIGNING_DEFAULT, 0);
+                                     port_to_use, SMB_SIGNING_DEFAULT, flags);
        if (!NT_STATUS_IS_OK(status)) {
                return False;
        }
@@ -7222,6 +8674,152 @@ static bool run_mangle1(int dummy)
        return true;
 }
 
+static NTSTATUS mangle_illegal_list_shortname_fn(const char *mntpoint,
+                                                struct file_info *f,
+                                                const char *mask,
+                                                void *state)
+{
+       if (f->short_name == NULL) {
+               return NT_STATUS_OK;
+       }
+
+       if (strlen(f->short_name) == 0) {
+               return NT_STATUS_OK;
+       }
+
+       printf("unexpected shortname: %s\n", f->short_name);
+
+       return NT_STATUS_OBJECT_NAME_INVALID;
+}
+
+static NTSTATUS mangle_illegal_list_name_fn(const char *mntpoint,
+                                           struct file_info *f,
+                                           const char *mask,
+                                           void *state)
+{
+       char *name = state;
+
+       printf("name: %s\n", f->name);
+       fstrcpy(name, f->name);
+       return NT_STATUS_OK;
+}
+
+static bool run_mangle_illegal(int dummy)
+{
+       struct cli_state *cli = NULL;
+       struct cli_state *cli_posix = NULL;
+       const char *fname = "\\MANGLE_ILLEGAL\\this_is_a_long_fname_to_be_mangled.txt";
+       const char *illegal_fname = "MANGLE_ILLEGAL/foo:bar";
+       char *mangled_path = NULL;
+       uint16_t fnum;
+       fstring name;
+       fstring alt_name;
+       NTSTATUS status;
+
+       printf("starting mangle-illegal test\n");
+
+       if (!torture_open_connection(&cli, 0)) {
+               return False;
+       }
+
+       smbXcli_conn_set_sockopt(cli->conn, sockops);
+
+       if (!torture_open_connection(&cli_posix, 0)) {
+               return false;
+       }
+
+       smbXcli_conn_set_sockopt(cli_posix->conn, sockops);
+
+       status = torture_setup_unix_extensions(cli_posix);
+       if (!NT_STATUS_IS_OK(status)) {
+               return false;
+       }
+
+       cli_rmdir(cli, "\\MANGLE_ILLEGAL");
+       status = cli_mkdir(cli, "\\MANGLE_ILLEGAL");
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("mkdir1 failed : %s\n", nt_errstr(status));
+               return False;
+       }
+
+       /*
+        * Create a file with illegal NTFS characters and test that we
+        * get a usable mangled name
+        */
+
+       cli_setatr(cli_posix, illegal_fname, 0, 0);
+       cli_posix_unlink(cli_posix, illegal_fname);
+
+       status = cli_posix_open(cli_posix, illegal_fname, O_RDWR|O_CREAT|O_EXCL,
+                               0600, &fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("POSIX create of %s failed (%s)\n",
+                      illegal_fname, nt_errstr(status));
+               return false;
+       }
+
+       status = cli_close(cli_posix, fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close failed (%s)\n", nt_errstr(status));
+               return false;
+       }
+
+       status = cli_list(cli, "\\MANGLE_ILLEGAL\\*", 0, mangle_illegal_list_name_fn, &name);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_printf("cli_list failed: %s\n", nt_errstr(status));
+               return false;
+       }
+
+       mangled_path = talloc_asprintf(talloc_tos(), "\\MANGLE_ILLEGAL\\%s", name);
+       if (mangled_path == NULL) {
+               return false;
+       }
+
+       status = cli_openx(cli, mangled_path, O_RDONLY, DENY_NONE, &fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_printf("cli_openx(%s) failed: %s\n", mangled_path, nt_errstr(status));
+               TALLOC_FREE(mangled_path);
+               return false;
+       }
+       TALLOC_FREE(mangled_path);
+       cli_close(cli, fnum);
+
+       cli_setatr(cli_posix, illegal_fname, 0, 0);
+       cli_posix_unlink(cli_posix, illegal_fname);
+
+       /*
+        * Create a file with a long name and check that we got *no* short name.
+        */
+
+       status = cli_ntcreate(cli, fname, 0, GENERIC_ALL_ACCESS|DELETE_ACCESS,
+                             FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF,
+                             0, 0, &fnum, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_printf("open %s failed: %s\n", fname, nt_errstr(status));
+               return false;
+       }
+       cli_close(cli, fnum);
+
+       status = cli_list(cli, fname, 0, mangle_illegal_list_shortname_fn, &alt_name);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_printf("cli_list failed\n");
+               return false;
+       }
+
+       cli_unlink(cli, fname, 0);
+       cli_rmdir(cli, "\\MANGLE_ILLEGAL");
+
+       if (!torture_close_connection(cli_posix)) {
+               return false;
+       }
+
+       if (!torture_close_connection(cli)) {
+               return false;
+       }
+
+       return true;
+}
+
 static size_t null_source(uint8_t *buf, size_t n, void *priv)
 {
        size_t *to_pull = (size_t *)priv;
@@ -7526,13 +9124,7 @@ static bool run_large_readx(int dummy)
                        goto out;
                }
 
-               status = cli_session_setup(cli2,
-                                       username,
-                                       password,
-                                       strlen(password)+1,
-                                       password,
-                                       strlen(password)+1,
-                                       workgroup);
+               status = cli_session_setup_creds(cli2, torture_creds);
                if (!NT_STATUS_IS_OK(status)) {
                        goto out;
                }
@@ -7540,8 +9132,7 @@ static bool run_large_readx(int dummy)
                status = cli_tree_connect(cli2,
                                        share,
                                        "?????",
-                                       password,
-                                       strlen(password)+1);
+                                       password);
                if (!NT_STATUS_IS_OK(status)) {
                        goto out;
                }
@@ -7572,94 +9163,246 @@ static bool run_large_readx(int dummy)
                        }
                }
 
-               status = cli_ntcreate(cli2, fname, 0, FILE_READ_DATA,
-                               FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN,
-                               0, 0, &fnum2, NULL);
-               if (!NT_STATUS_IS_OK(status)) {
-                       d_printf("Second open %s failed: %s\n", fname, nt_errstr(status));
-                       goto out;
-               }
+               status = cli_ntcreate(cli2, fname, 0, FILE_READ_DATA,
+                               FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN,
+                               0, 0, &fnum2, NULL);
+               if (!NT_STATUS_IS_OK(status)) {
+                       d_printf("Second open %s failed: %s\n", fname, nt_errstr(status));
+                       goto out;
+               }
+
+               /* All reads must return less than file_size bytes. */
+               if (!large_readx_tests(cli2, fnum2, buf)) {
+                       goto out;
+               }
+
+               status = cli_close(cli2, fnum2);
+               if (!NT_STATUS_IS_OK(status)) {
+                       d_printf("cli_close failed: %s\n", nt_errstr(status));
+                       goto out;
+               }
+               fnum2 = -1;
+
+               if (!torture_close_connection(cli2)) {
+                       goto out;
+               }
+               cli2 = NULL;
+       }
+
+       correct = true;
+       printf("Success on large_readx test\n");
+
+  out:
+
+       if (cli2) {
+               if (!torture_close_connection(cli2)) {
+                       correct = false;
+               }
+       }
+
+       if (cli1) {
+               if (fnum1 != UINT16_MAX) {
+                       status = cli_close(cli1, fnum1);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               d_printf("cli_close failed: %s\n", nt_errstr(status));
+                       }
+                       fnum1 = UINT16_MAX;
+               }
+
+               status = cli_unlink(cli1, fname,
+                                   FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+               if (!NT_STATUS_IS_OK(status)) {
+                       printf("unlink failed (%s)\n", nt_errstr(status));
+               }
+
+               if (!torture_close_connection(cli1)) {
+                       correct = false;
+               }
+       }
+
+       TALLOC_FREE(frame);
+
+       printf("finished large_readx test\n");
+       return correct;
+}
+
+static bool run_cli_echo(int dummy)
+{
+       struct cli_state *cli;
+       NTSTATUS status;
+
+       printf("starting cli_echo test\n");
+       if (!torture_open_connection(&cli, 0)) {
+               return false;
+       }
+       smbXcli_conn_set_sockopt(cli->conn, sockops);
+
+       status = cli_echo(cli, 5, data_blob_const("hello", 5));
+
+       d_printf("cli_echo returned %s\n", nt_errstr(status));
+
+       torture_close_connection(cli);
+       return NT_STATUS_IS_OK(status);
+}
+
+static int splice_status(off_t written, void *priv)
+{
+        return true;
+}
+
+static bool run_cli_splice(int dummy)
+{
+       uint8_t *buf = NULL;
+       struct cli_state *cli1 = NULL;
+       bool correct = false;
+       const char *fname_src = "\\splice_src.dat";
+       const char *fname_dst = "\\splice_dst.dat";
+       NTSTATUS status;
+       uint16_t fnum1 = UINT16_MAX;
+       uint16_t fnum2 = UINT16_MAX;
+       size_t file_size = 2*1024*1024;
+       size_t splice_size = 1*1024*1024 + 713;
+       MD5_CTX md5_ctx;
+       uint8_t digest1[16], digest2[16];
+       off_t written = 0;
+       size_t nread = 0;
+       TALLOC_CTX *frame = talloc_stackframe();
+
+       printf("starting cli_splice test\n");
+
+       if (!torture_open_connection(&cli1, 0)) {
+               goto out;
+       }
+
+       cli_unlink(cli1, fname_src,
+               FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       cli_unlink(cli1, fname_dst,
+               FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       /* Create a file */
+       status = cli_ntcreate(cli1, fname_src, 0, GENERIC_ALL_ACCESS,
+                       FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF,
+                       0, 0, &fnum1, NULL);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               d_printf("open %s failed: %s\n", fname_src, nt_errstr(status));
+               goto out;
+       }
+
+       /* Write file_size bytes - must be bigger than splice_size. */
+       buf = talloc_zero_array(frame, uint8_t, file_size);
+       if (buf == NULL) {
+               d_printf("talloc_fail\n");
+               goto out;
+       }
+
+       /* Fill it with random numbers. */
+       generate_random_buffer(buf, file_size);
+
+       /* MD5 the first 1MB + 713 bytes. */
+       MD5Init(&md5_ctx);
+       MD5Update(&md5_ctx, buf, splice_size);
+       MD5Final(digest1, &md5_ctx);
+
+       status = cli_writeall(cli1,
+                             fnum1,
+                             0,
+                             buf,
+                             0,
+                             file_size,
+                             NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_printf("cli_writeall failed: %s\n", nt_errstr(status));
+               goto out;
+       }
+
+       status = cli_ntcreate(cli1, fname_dst, 0, GENERIC_ALL_ACCESS,
+                       FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF,
+                       0, 0, &fnum2, NULL);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               d_printf("open %s failed: %s\n", fname_dst, nt_errstr(status));
+               goto out;
+       }
+
+       /* Now splice 1MB + 713 bytes. */
+       status = cli_splice(cli1,
+                               cli1,
+                               fnum1,
+                               fnum2,
+                               splice_size,
+                               0,
+                               0,
+                               &written,
+                               splice_status,
+                               NULL);
 
-               /* All reads must return less than file_size bytes. */
-               if (!large_readx_tests(cli2, fnum2, buf)) {
-                       goto out;
-               }
+       if (!NT_STATUS_IS_OK(status)) {
+               d_printf("cli_splice failed: %s\n", nt_errstr(status));
+               goto out;
+       }
 
-               status = cli_close(cli2, fnum2);
-               if (!NT_STATUS_IS_OK(status)) {
-                       d_printf("cli_close failed: %s\n", nt_errstr(status));
-                       goto out;
-               }
-               fnum2 = -1;
+       /* Clear the old buffer. */
+       memset(buf, '\0', file_size);
 
-               if (!torture_close_connection(cli2)) {
-                       goto out;
-               }
-               cli2 = NULL;
+       /* Read the new file. */
+       status = cli_read(cli1, fnum2, (char *)buf, 0, splice_size, &nread);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_printf("cli_read failed: %s\n", nt_errstr(status));
+               goto out;
+       }
+       if (nread != splice_size) {
+               d_printf("bad read of 0x%x, should be 0x%x\n",
+                       (unsigned int)nread,
+                       (unsigned int)splice_size);
+               goto out;
+       }
+
+       /* MD5 the first 1MB + 713 bytes. */
+       MD5Init(&md5_ctx);
+       MD5Update(&md5_ctx, buf, splice_size);
+       MD5Final(digest2, &md5_ctx);
+
+       /* Must be the same. */
+       if (memcmp(digest1, digest2, 16) != 0) {
+               d_printf("bad MD5 compare\n");
+               goto out;
        }
 
        correct = true;
-       printf("Success on large_readx test\n");
+       printf("Success on cli_splice test\n");
 
   out:
 
-       if (cli2) {
-               if (!torture_close_connection(cli2)) {
-                       correct = false;
-               }
-       }
-
        if (cli1) {
                if (fnum1 != UINT16_MAX) {
-                       status = cli_close(cli1, fnum1);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               d_printf("cli_close failed: %s\n", nt_errstr(status));
-                       }
-                       fnum1 = UINT16_MAX;
+                       cli_close(cli1, fnum1);
                }
-
-               status = cli_unlink(cli1, fname,
-                                   FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
-               if (!NT_STATUS_IS_OK(status)) {
-                       printf("unlink failed (%s)\n", nt_errstr(status));
+               if (fnum2 != UINT16_MAX) {
+                       cli_close(cli1, fnum2);
                }
 
+               cli_unlink(cli1, fname_src,
+                       FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+               cli_unlink(cli1, fname_dst,
+                       FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
                if (!torture_close_connection(cli1)) {
                        correct = false;
                }
        }
 
        TALLOC_FREE(frame);
-
-       printf("finished large_readx test\n");
        return correct;
 }
 
-static bool run_cli_echo(int dummy)
-{
-       struct cli_state *cli;
-       NTSTATUS status;
-
-       printf("starting cli_echo test\n");
-       if (!torture_open_connection(&cli, 0)) {
-               return false;
-       }
-       smbXcli_conn_set_sockopt(cli->conn, sockops);
-
-       status = cli_echo(cli, 5, data_blob_const("hello", 5));
-
-       d_printf("cli_echo returned %s\n", nt_errstr(status));
-
-       torture_close_connection(cli);
-       return NT_STATUS_IS_OK(status);
-}
-
 static bool run_uid_regression_test(int dummy)
 {
        static struct cli_state *cli;
        int16_t old_vuid;
-       int16_t old_cnum;
+       int32_t old_cnum;
        bool correct = True;
+       struct smbXcli_tcon *orig_tcon = NULL;
        NTSTATUS status;
 
        printf("starting uid regression test\n");
@@ -7700,6 +9443,11 @@ static bool run_uid_regression_test(int dummy)
        }
 
        old_cnum = cli_state_get_tid(cli);
+       orig_tcon = cli_state_save_tcon(cli);
+       if (orig_tcon == NULL) {
+               correct = false;
+               goto out;
+       }
 
        /* Now try a SMBtdis with the invald vuid set to zero. */
        cli_state_set_uid(cli, 0);
@@ -7712,9 +9460,11 @@ static bool run_uid_regression_test(int dummy)
        } else {
                d_printf("First tdis failed (%s)\n", nt_errstr(status));
                correct = false;
+               cli_state_restore_tcon(cli, orig_tcon);
                goto out;
        }
 
+       cli_state_restore_tcon(cli, orig_tcon);
        cli_state_set_uid(cli, old_vuid);
        cli_state_set_tid(cli, old_cnum);
 
@@ -7993,7 +9743,7 @@ static bool run_tldap(int dummy)
 
        rc = tldap_search(ld, "", TLDAP_SCOPE_BASE, filter,
                          NULL, 0, 0, NULL, 0, NULL, 0, 0, 0, 0,
-                         talloc_tos(), NULL, NULL);
+                         talloc_tos(), NULL);
        if (!TLDAP_RC_IS_SUCCESS(rc)) {
                d_printf("tldap_search with complex filter failed: %s\n",
                         tldap_errstr(talloc_tos(), ld, rc));
@@ -8011,8 +9761,8 @@ 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";
+       const char *dname = "\\testdir_createtime";
+       const char *fname = "\\testdir_createtime\\testfile";
        NTSTATUS status;
        struct timespec create_time;
        struct timespec create_time1;
@@ -8050,82 +9800,388 @@ static bool run_dir_createtime(int dummy)
                goto out;
        }
 
-       status = cli_qpathinfo2(cli, dname, &create_time1, NULL, NULL, NULL,
-                               NULL, NULL, NULL);
+       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;
+       const char *dname = "\\testdir_streamerror";
+       const char *streamname =
+               "testdir_streamerror:{4c8cc155-6c1e-11d1-8e41-00c04fb9386d}:$DATA";
+       NTSTATUS status;
+       time_t change_time, access_time, write_time;
+       off_t size;
+       uint16_t mode, fnum;
+       bool ret = true;
+
+       if (!torture_open_connection(&cli, 0)) {
+               return false;
+       }
+
+       cli_unlink(cli, "\\testdir_streamerror\\*", 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));
+               return false;
+       }
+
+       status = cli_qpathinfo1(cli, streamname, &change_time, &access_time,
+                               &write_time, &size, &mode);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+               printf("pathinfo returned %s, expected "
+                      "NT_STATUS_OBJECT_NAME_NOT_FOUND\n",
+                      nt_errstr(status));
+               ret = false;
+       }
+
+       status = cli_ntcreate(cli, streamname, 0x16,
+                             FILE_READ_DATA|FILE_READ_EA|
+                             FILE_READ_ATTRIBUTES|READ_CONTROL_ACCESS,
+                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ,
+                             FILE_OPEN, 0, 0, &fnum, NULL);
+
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+               printf("ntcreate returned %s, expected "
+                      "NT_STATUS_OBJECT_NAME_NOT_FOUND\n",
+                      nt_errstr(status));
+               ret = false;
+       }
+
+
+       cli_rmdir(cli, dname);
+       return ret;
+}
+
+struct pidtest_state {
+       bool success;
+       uint16_t vwv[1];
+       DATA_BLOB data;
+};
+
+static void pid_echo_done(struct tevent_req *subreq);
+
+static struct tevent_req *pid_echo_send(TALLOC_CTX *mem_ctx,
+                       struct tevent_context *ev,
+                       struct cli_state *cli)
+{
+       struct tevent_req *req, *subreq;
+       struct pidtest_state *state;
+
+       req = tevent_req_create(mem_ctx, &state, struct pidtest_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       SSVAL(state->vwv, 0, 1);
+       state->data = data_blob_const("hello", 5);
+
+       subreq = smb1cli_req_send(state,
+                               ev,
+                               cli->conn,
+                               SMBecho,
+                               0, 0, /* *_flags */
+                               0, 0, /* *_flags2 */
+                               cli->timeout,
+                               0xDEADBEEF, /* pid */
+                               NULL, /* tcon */
+                               NULL, /* session */
+                               ARRAY_SIZE(state->vwv), state->vwv,
+                               state->data.length, state->data.data);
+
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, pid_echo_done, req);
+       return req;
+}
+
+static void pid_echo_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct pidtest_state *state = tevent_req_data(
+               req, struct pidtest_state);
+       NTSTATUS status;
+       uint32_t num_bytes;
+       uint8_t *bytes = NULL;
+       struct iovec *recv_iov = NULL;
+       uint8_t *phdr = NULL;
+       uint16_t pidlow = 0;
+       uint16_t pidhigh = 0;
+       struct smb1cli_req_expected_response expected[] = {
+       {
+               .status = NT_STATUS_OK,
+               .wct    = 1,
+       },
+       };
+
+       status = smb1cli_req_recv(subreq, state,
+                               &recv_iov,
+                               &phdr,
+                               NULL, /* pwct */
+                               NULL, /* pvwv */
+                               NULL, /* pvwv_offset */
+                               &num_bytes,
+                               &bytes,
+                               NULL, /* pbytes_offset */
+                               NULL, /* pinbuf */
+                               expected, ARRAY_SIZE(expected));
+
+       TALLOC_FREE(subreq);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return;
+       }
+
+       if (num_bytes != state->data.length) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
+
+       if (memcmp(bytes, state->data.data, num_bytes) != 0) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
+
+       /* Check pid low/high == DEADBEEF */
+       pidlow = SVAL(phdr, HDR_PID);
+       if (pidlow != 0xBEEF){
+               printf("Incorrect pidlow 0x%x, should be 0xBEEF\n",
+                       (unsigned int)pidlow);
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
+       pidhigh = SVAL(phdr, HDR_PIDHIGH);
+       if (pidhigh != 0xDEAD){
+               printf("Incorrect pidhigh 0x%x, should be 0xDEAD\n",
+                       (unsigned int)pidhigh);
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
+
+       tevent_req_done(req);
+}
+
+static NTSTATUS pid_echo_recv(struct tevent_req *req)
+{
+       return tevent_req_simple_recv_ntstatus(req);
+}
+
+static bool run_pidhigh(int dummy)
+{
+       bool success = false;
+       struct cli_state *cli = NULL;
+       NTSTATUS status;
+       struct tevent_context *ev = NULL;
+       struct tevent_req *req = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+
+       printf("starting pid high test\n");
+       if (!torture_open_connection(&cli, 0)) {
+               return false;
+       }
+       smbXcli_conn_set_sockopt(cli->conn, sockops);
+
+       ev = samba_tevent_context_init(frame);
+       if (ev == NULL) {
+                goto fail;
+       }
+
+       req = pid_echo_send(frame, ev, cli);
+       if (req == NULL) {
+               goto fail;
+       }
+
+       if (!tevent_req_poll_ntstatus(req, ev, &status)) {
+               goto fail;
+       }
+
+       status = pid_echo_recv(req);
+       if (NT_STATUS_IS_OK(status)) {
+               printf("pid high test ok\n");
+               success = true;
+       }
+
+ fail:
+
+       TALLOC_FREE(frame);
+       torture_close_connection(cli);
+       return success;
+}
+
+/*
+  Test Windows open on a bad POSIX symlink.
+ */
+static bool run_symlink_open_test(int dummy)
+{
+       static struct cli_state *cli;
+       const char *fname = "non_existant_file";
+       const char *sname = "dangling_symlink";
+       uint16_t fnum = (uint16_t)-1;
+       bool correct = false;
+       NTSTATUS status;
+       TALLOC_CTX *frame = NULL;
+
+       frame = talloc_stackframe();
+
+       printf("Starting Windows bad symlink open test\n");
+
+       if (!torture_open_connection(&cli, 0)) {
+               TALLOC_FREE(frame);
+               return false;
+       }
+
+       smbXcli_conn_set_sockopt(cli->conn, sockops);
+
+       status = torture_setup_unix_extensions(cli);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(frame);
+               return false;
+       }
+
+       /* Ensure nothing exists. */
+       cli_setatr(cli, fname, 0, 0);
+       cli_posix_unlink(cli, fname);
+       cli_setatr(cli, sname, 0, 0);
+       cli_posix_unlink(cli, sname);
+
+       /* Create a symlink pointing nowhere. */
+       status = cli_posix_symlink(cli, fname, sname);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("cli_qpathinfo2 (2) returned %s\n",
-                      nt_errstr(status));
+               printf("cli_posix_symlink of %s -> %s failed (%s)\n",
+                       sname,
+                       fname,
+                       nt_errstr(status));
                goto out;
        }
 
-       if (timespec_compare(&create_time1, &create_time)) {
-               printf("run_dir_createtime: create time was updated (error)\n");
+       /* Now ensure that a Windows open doesn't hang. */
+       status = cli_ntcreate(cli,
+                       sname,
+                       0,
+                       FILE_READ_DATA|FILE_WRITE_DATA,
+                       0,
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                       FILE_OPEN_IF,
+                       0x0,
+                       0x0,
+                       &fnum,
+                       NULL);
+
+       /*
+        * We get either NT_STATUS_OBJECT_NAME_NOT_FOUND or
+        * NT_STATUS_OBJECT_PATH_NOT_FOUND depending on if
+        * we use O_NOFOLLOW on the server or not.
+        */
+       if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND) ||
+           NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_PATH_NOT_FOUND))
+       {
+               correct = true;
        } else {
-               printf("run_dir_createtime: create time was not updated (correct)\n");
-               ret = true;
+               printf("cli_ntcreate of %s returned %s - should return"
+                               " either (%s) or (%s)\n",
+                       sname,
+                       nt_errstr(status),
+                       nt_errstr(NT_STATUS_OBJECT_NAME_NOT_FOUND),
+                       nt_errstr(NT_STATUS_OBJECT_PATH_NOT_FOUND));
+               goto out;
        }
 
+       correct = true;
+
   out:
 
-       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
-       cli_rmdir(cli, dname);
+       if (fnum != (uint16_t)-1) {
+               cli_close(cli, fnum);
+               fnum = (uint16_t)-1;
+       }
+
+       cli_setatr(cli, sname, 0, 0);
+       cli_posix_unlink(cli, sname);
+       cli_setatr(cli, fname, 0, 0);
+       cli_posix_unlink(cli, fname);
+
        if (!torture_close_connection(cli)) {
-               ret = false;
+               correct = false;
        }
-       return ret;
+
+       TALLOC_FREE(frame);
+       return correct;
 }
 
+/*
+ * Only testing minimal time strings, as the others
+ * need (locale-dependent) guessing at what strftime does and
+ * even may differ in builds.
+ */
+static bool timesubst_test(void)
+{
+       TALLOC_CTX *ctx = NULL;
+       /* Sa 23. Dez 04:33:20 CET 2017 */
+       const struct timeval tv = { 1514000000, 123 };
+       const char* expect_minimal = "20171223_033320";
+       const char* expect_minus   = "20171223_033320_000123";
+       char *s;
+       char *env_tz, *orig_tz = NULL;
+       bool result = true;
 
-static bool run_streamerror(int dummy)
-{
-       struct cli_state *cli;
-       const char *dname = "\\testdir";
-       const char *streamname =
-               "testdir:{4c8cc155-6c1e-11d1-8e41-00c04fb9386d}:$DATA";
-       NTSTATUS status;
-       time_t change_time, access_time, write_time;
-       off_t size;
-       uint16_t mode, fnum;
-       bool ret = true;
+       ctx = talloc_new(NULL);
 
-       if (!torture_open_connection(&cli, 0)) {
-               return false;
+       env_tz = getenv("TZ");
+       if(env_tz) {
+               orig_tz = talloc_strdup(ctx, env_tz);
        }
+       setenv("TZ", "UTC", 1);
 
-       cli_unlink(cli, "\\testdir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
-       cli_rmdir(cli, dname);
+       s = minimal_timeval_string(ctx, &tv, false);
 
-       status = cli_mkdir(cli, dname);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("mkdir failed: %s\n", nt_errstr(status));
-               return false;
+       if(!s || strcmp(s, expect_minimal)) {
+               printf("minimal_timeval_string(ctx, tv, false) returned [%s], expected "
+                      "[%s]\n", s ? s : "<nil>", expect_minimal);
+               result = false;
        }
-
-       status = cli_qpathinfo1(cli, streamname, &change_time, &access_time,
-                               &write_time, &size, &mode);
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
-               printf("pathinfo returned %s, expected "
-                      "NT_STATUS_OBJECT_NAME_NOT_FOUND\n",
-                      nt_errstr(status));
-               ret = false;
+       TALLOC_FREE(s);
+       s = minimal_timeval_string(ctx, &tv, true);
+       if(!s || strcmp(s, expect_minus)) {
+               printf("minimal_timeval_string(ctx, tv, true) returned [%s], expected "
+                      "[%s]\n", s ? s : "<nil>", expect_minus);
+               result = false;
        }
+       TALLOC_FREE(s);
 
-       status = cli_ntcreate(cli, streamname, 0x16,
-                             FILE_READ_DATA|FILE_READ_EA|
-                             FILE_READ_ATTRIBUTES|READ_CONTROL_ACCESS,
-                             FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ,
-                             FILE_OPEN, 0, 0, &fnum, NULL);
-
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
-               printf("ntcreate returned %s, expected "
-                      "NT_STATUS_OBJECT_NAME_NOT_FOUND\n",
-                      nt_errstr(status));
-               ret = false;
+       if(orig_tz) {
+               setenv("TZ", orig_tz, 1);
        }
 
-
-       cli_rmdir(cli, dname);
-       return ret;
+       TALLOC_FREE(ctx);
+       return result;
 }
 
 static bool run_local_substitute(int dummy)
@@ -8140,6 +10196,10 @@ static bool run_local_substitute(int dummy)
        ok &= subst_test("%G", "", "", -1, 0, gidtoname(0));
        ok &= subst_test("%D%u", "u", "dom", -1, 0, "domu");
        ok &= subst_test("%i %I", "", "", -1, -1, "0.0.0.0 0.0.0.0");
+       ok &= subst_test("%j %J", "", "", -1, -1, "0_0_0_0 0_0_0_0");
+       /* Substitution depends on current time, so better test the underlying
+          formatting function. At least covers %t. */
+       ok &= timesubst_test();
 
        /* Different captialization rules in sub_basic... */
 
@@ -8182,7 +10242,9 @@ static bool run_local_base64(int dummy)
        return ret;
 }
 
-static void parse_fn(time_t timeout, DATA_BLOB blob, void *private_data)
+static void parse_fn(const struct gencache_timeout *t,
+                    DATA_BLOB blob,
+                    void *private_data)
 {
        return;
 }
@@ -8256,7 +10318,7 @@ static bool run_local_gencache(int dummy)
        blob = data_blob_string_const_null("bar");
        tm = time(NULL) + 60;
 
-       if (!gencache_set_data_blob("foo", &blob, tm)) {
+       if (!gencache_set_data_blob("foo", blob, tm)) {
                d_printf("%s: gencache_set_data_blob() failed\n", __location__);
                return False;
        }
@@ -8295,7 +10357,7 @@ static bool run_local_gencache(int dummy)
        blob.data = (uint8_t *)&v;
        blob.length = sizeof(v);
 
-       if (!gencache_set_data_blob("blob", &blob, tm)) {
+       if (!gencache_set_data_blob("blob", blob, tm)) {
                d_printf("%s: gencache_set_data_blob() failed\n",
                         __location__);
                return false;
@@ -8536,61 +10598,6 @@ failed:
        return false;
 }
 
-
-struct talloc_dict_test {
-       int content;
-};
-
-static int talloc_dict_traverse_fn(DATA_BLOB key, void *data, void *priv)
-{
-       int *count = (int *)priv;
-       *count += 1;
-       return 0;
-}
-
-static bool run_local_talloc_dict(int dummy)
-{
-       struct talloc_dict *dict;
-       struct talloc_dict_test *t;
-       int key, count, res;
-       bool ok;
-
-       dict = talloc_dict_init(talloc_tos());
-       if (dict == NULL) {
-               return false;
-       }
-
-       t = talloc(talloc_tos(), struct talloc_dict_test);
-       if (t == NULL) {
-               return false;
-       }
-
-       key = 1;
-       t->content = 1;
-       ok = talloc_dict_set(dict, data_blob_const(&key, sizeof(key)), &t);
-       if (!ok) {
-               return false;
-       }
-
-       count = 0;
-       res = talloc_dict_traverse(dict, talloc_dict_traverse_fn, &count);
-       if (res == -1) {
-               return false;
-       }
-
-       if (count != 1) {
-               return false;
-       }
-
-       if (count != res) {
-               return false;
-       }
-
-       TALLOC_FREE(dict);
-
-       return true;
-}
-
 static bool run_local_string_to_sid(int dummy) {
        struct dom_sid sid;
 
@@ -8784,7 +10791,7 @@ static NTSTATUS split_ntfs_stream_name(TALLOC_CTX *mem_ctx, const char *fname,
 
        sname = strchr_m(fname, ':');
 
-       if (lp_posix_pathnames() || (sname == NULL)) {
+       if (sname == NULL) {
                if (pbase != NULL) {
                        base = talloc_strdup(mem_ctx, fname);
                        NT_STATUS_HAVE_NO_MEMORY(base);
@@ -8939,15 +10946,25 @@ static bool data_blob_equal(DATA_BLOB a, DATA_BLOB b)
 static bool run_local_memcache(int dummy)
 {
        struct memcache *cache;
-       DATA_BLOB k1, k2;
-       DATA_BLOB d1, d2, d3;
-       DATA_BLOB v1, v2, v3;
+       DATA_BLOB k1, k2, k3;
+       DATA_BLOB d1, d3;
+       DATA_BLOB v1, v3;
 
        TALLOC_CTX *mem_ctx;
+       char *ptr1 = NULL;
+       char *ptr2 = NULL;
+
        char *str1, *str2;
        size_t size1, size2;
        bool ret = false;
 
+       mem_ctx = talloc_init("foo");
+       if (mem_ctx == NULL) {
+               return false;
+       }
+
+       /* STAT_CACHE TESTS */
+
        cache = memcache_init(NULL, sizeof(void *) == 8 ? 200 : 100);
 
        if (cache == NULL) {
@@ -8956,14 +10973,13 @@ static bool run_local_memcache(int dummy)
        }
 
        d1 = data_blob_const("d1", 2);
-       d2 = data_blob_const("d2", 2);
        d3 = data_blob_const("d3", 2);
 
        k1 = data_blob_const("d1", 2);
        k2 = data_blob_const("d2", 2);
+       k3 = data_blob_const("d3", 2);
 
        memcache_add(cache, STAT_CACHE, k1, d1);
-       memcache_add(cache, GETWD_CACHE, k2, d2);
 
        if (!memcache_lookup(cache, STAT_CACHE, k1, &v1)) {
                printf("could not find k1\n");
@@ -8973,40 +10989,79 @@ static bool run_local_memcache(int dummy)
                return false;
        }
 
-       if (!memcache_lookup(cache, GETWD_CACHE, k2, &v2)) {
-               printf("could not find k2\n");
+       memcache_add(cache, STAT_CACHE, k1, d3);
+
+       if (!memcache_lookup(cache, STAT_CACHE, k1, &v3)) {
+               printf("could not find replaced k1\n");
                return false;
        }
-       if (!data_blob_equal(d2, v2)) {
+       if (!data_blob_equal(d3, v3)) {
                return false;
        }
 
-       memcache_add(cache, STAT_CACHE, k1, d3);
+       TALLOC_FREE(cache);
 
-       if (!memcache_lookup(cache, STAT_CACHE, k1, &v3)) {
-               printf("could not find replaced k1\n");
+       /* GETWD_CACHE TESTS */
+       str1 = talloc_strdup(mem_ctx, "string1");
+       if (str1 == NULL) {
                return false;
        }
-       if (!data_blob_equal(d3, v3)) {
+       ptr2 = str1; /* Keep an alias for comparison. */
+
+       str2 = talloc_strdup(mem_ctx, "string2");
+       if (str2 == NULL) {
+               return false;
+       }
+
+       cache = memcache_init(NULL, sizeof(void *) == 8 ? 200 : 100);
+       if (cache == NULL) {
+               printf("memcache_init failed\n");
+               return false;
+       }
+
+       memcache_add_talloc(cache, GETWD_CACHE, k2, &str1);
+       /* str1 == NULL now. */
+       ptr1 = memcache_lookup_talloc(cache, GETWD_CACHE, k2);
+       if (ptr1 == NULL) {
+               printf("could not find k2\n");
+               return false;
+       }
+       if (ptr1 != ptr2) {
+               printf("fetch of k2 got wrong string\n");
                return false;
        }
 
-       memcache_add(cache, GETWD_CACHE, k1, d1);
+       /* Add a blob to ensure k2 gets purged. */
+       d3 = data_blob_talloc_zero(mem_ctx, 180);
+       memcache_add(cache, STAT_CACHE, k3, d3);
 
-       if (memcache_lookup(cache, GETWD_CACHE, k2, &v2)) {
+       ptr2 = memcache_lookup_talloc(cache, GETWD_CACHE, k2);
+       if (ptr2 != NULL) {
                printf("Did find k2, should have been purged\n");
                return false;
        }
 
        TALLOC_FREE(cache);
-
-       cache = memcache_init(NULL, 0);
+       TALLOC_FREE(mem_ctx);
 
        mem_ctx = talloc_init("foo");
+       if (mem_ctx == NULL) {
+               return false;
+       }
+
+       cache = memcache_init(NULL, 0);
+       if (cache == NULL) {
+               return false;
+       }
 
        str1 = talloc_strdup(mem_ctx, "string1");
+       if (str1 == NULL) {
+               return false;
+       }
        str2 = talloc_strdup(mem_ctx, "string2");
-
+       if (str2 == NULL) {
+               return false;
+       }
        memcache_add_talloc(cache, SINGLETON_CACHE_TALLOC,
                            data_blob_string_const("torture"), &str1);
        size1 = talloc_total_size(cache);
@@ -9093,59 +11148,6 @@ static bool run_wbclient_multi_ping(int dummy)
        return result;
 }
 
-static void getaddrinfo_finished(struct tevent_req *req)
-{
-       char *name = (char *)tevent_req_callback_data_void(req);
-       struct addrinfo *ainfo;
-       int res;
-
-       res = getaddrinfo_recv(req, &ainfo);
-       if (res != 0) {
-               d_printf("gai(%s) returned %s\n", name, gai_strerror(res));
-               return;
-       }
-       d_printf("gai(%s) succeeded\n", name);
-       freeaddrinfo(ainfo);
-}
-
-static bool run_getaddrinfo_send(int dummy)
-{
-       TALLOC_CTX *frame = talloc_stackframe();
-       struct fncall_context *ctx;
-       struct tevent_context *ev;
-       bool result = false;
-       const char *names[4] = { "www.samba.org", "notfound.samba.org",
-                                "www.slashdot.org", "heise.de" };
-       struct tevent_req *reqs[4];
-       int i;
-
-       ev = samba_tevent_context_init(frame);
-       if (ev == NULL) {
-               goto fail;
-       }
-
-       ctx = fncall_context_init(frame, 4);
-
-       for (i=0; i<ARRAY_SIZE(names); i++) {
-               reqs[i] = getaddrinfo_send(frame, ev, ctx, names[i], NULL,
-                                          NULL);
-               if (reqs[i] == NULL) {
-                       goto fail;
-               }
-               tevent_req_set_callback(reqs[i], getaddrinfo_finished,
-                                       discard_const_p(void, names[i]));
-       }
-
-       for (i=0; i<ARRAY_SIZE(reqs); i++) {
-               tevent_loop_once(ev);
-       }
-
-       result = true;
-fail:
-       TALLOC_FREE(frame);
-       return result;
-}
-
 static bool dbtrans_inc(struct db_context *db)
 {
        struct db_record *rec;
@@ -9288,17 +11290,17 @@ static bool run_local_dbtrans(int dummy)
 
 /*
  * 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.
+ * to inspect the tevent_poll specific function from outside of
+ * tevent_poll.c.
  */
 
-static bool run_local_tevent_select(int dummy)
+static bool run_local_tevent_poll(int dummy)
 {
        struct tevent_context *ev;
        struct tevent_fd *fd1, *fd2;
        bool result = false;
 
-       ev = tevent_context_init_byname(NULL, "select");
+       ev = tevent_context_init_byname(NULL, "poll");
        if (ev == NULL) {
                d_fprintf(stderr, "tevent_context_init_byname failed\n");
                goto fail;
@@ -9505,6 +11507,124 @@ static bool run_local_tdb_writer(int dummy)
        return true;
 }
 
+static bool run_local_canonicalize_path(int dummy)
+{
+       const char *src[] = {
+                       "/foo/..",
+                       "/..",
+                       "/foo/bar/../baz",
+                       "/foo/././",
+                       "/../foo",
+                       ".././././",
+                       ".././././../../../boo",
+                       "./..",
+                       NULL
+                       };
+       const char *dst[] = {
+                       "/",
+                       "/",
+                       "/foo/baz",
+                       "/foo",
+                       "/foo",
+                       "/",
+                       "/boo",
+                       "/",
+                       NULL
+                       };
+       unsigned int i;
+
+       for (i = 0; src[i] != NULL; i++) {
+               char *d = canonicalize_absolute_path(talloc_tos(), src[i]);
+               if (d == NULL) {
+                       perror("talloc fail\n");
+                       return false;
+               }
+               if (strcmp(d, dst[i]) != 0) {
+                       d_fprintf(stderr,
+                               "canonicalize mismatch %s -> %s != %s",
+                               src[i], d, dst[i]);
+                       return false;
+               }
+               talloc_free(d);
+       }
+       return true;
+}
+
+static bool run_ign_bad_negprot(int dummy)
+{
+       struct tevent_context *ev;
+       struct tevent_req *req;
+       struct smbXcli_conn *conn;
+       struct sockaddr_storage ss;
+       NTSTATUS status;
+       int fd;
+       bool ok;
+
+       printf("starting ignore bad negprot\n");
+
+       ok = resolve_name(host, &ss, 0x20, true);
+       if (!ok) {
+               d_fprintf(stderr, "Could not resolve name %s\n", host);
+               return false;
+       }
+
+       status = open_socket_out(&ss, 445, 10000, &fd);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, "open_socket_out failed: %s\n",
+                         nt_errstr(status));
+               return false;
+       }
+
+       conn = smbXcli_conn_create(talloc_tos(), fd, host, SMB_SIGNING_OFF, 0,
+                                  NULL, 0);
+       if (conn == NULL) {
+               d_fprintf(stderr, "smbXcli_conn_create failed\n");
+               return false;
+       }
+
+       status = smbXcli_negprot(conn, 0, PROTOCOL_CORE, PROTOCOL_CORE);
+       if (NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, "smbXcli_negprot succeeded!\n");
+               return false;
+       }
+
+       ev = samba_tevent_context_init(talloc_tos());
+       if (ev == NULL) {
+               d_fprintf(stderr, "samba_tevent_context_init failed\n");
+               return false;
+       }
+
+       req = smb1cli_session_setup_nt1_send(
+               ev, ev, conn, 0, getpid(), NULL, 65503, 2, 1, 0, "", "",
+               data_blob_null, data_blob_null, 0x40,
+               "Windows 2000 2195", "Windows 2000 5.0");
+       if (req == NULL) {
+               d_fprintf(stderr, "smb1cli_session_setup_nt1_send failed\n");
+               return false;
+       }
+
+       ok = tevent_req_poll_ntstatus(req, ev, &status);
+       if (!ok) {
+               d_fprintf(stderr, "tevent_req_poll failed\n");
+               return false;
+       }
+
+       status = smb1cli_session_setup_nt1_recv(req, NULL, NULL, NULL, NULL,
+                                               NULL, NULL);
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_CONNECTION_RESET)) {
+               d_fprintf(stderr, "smb1cli_session_setup_nt1_recv returned "
+                         "%s, expected NT_STATUS_CONNECTION_RESET\n",
+                         nt_errstr(status));
+               return false;
+       }
+
+       TALLOC_FREE(conn);
+
+       printf("starting ignore bad negprot\n");
+
+       return true;
+}
+
 static double create_procs(bool (*fn)(int), bool *result)
 {
        int i, status;
@@ -9643,6 +11763,11 @@ static struct {
        {"OPEN", run_opentest, 0},
        {"POSIX", run_simple_posix_open_test, 0},
        {"POSIX-APPEND", run_posix_append, 0},
+       {"POSIX-SYMLINK-ACL", run_acl_symlink_test, 0},
+       {"POSIX-SYMLINK-EA", run_ea_symlink_test, 0},
+       {"POSIX-STREAM-DELETE", run_posix_stream_delete, 0},
+       {"POSIX-OFD-LOCK", run_posix_ofd_lock_test, 0},
+       {"WINDOWS-BAD-SYMLINK", run_symlink_open_test, 0},
        {"CASE-INSENSITIVE-CREATE", run_case_insensitive_create, 0},
        {"ASYNC-ECHO", run_async_echo, 0},
        { "UID-REGRESSION-TEST", run_uid_regression_test, 0},
@@ -9653,12 +11778,16 @@ static struct {
 #endif
        {"XCOPY", run_xcopy, 0},
        {"RENAME", run_rename, 0},
+       {"RENAME-ACCESS", run_rename_access, 0},
+       {"OWNER-RIGHTS", run_owner_rights, 0},
        {"DELETE", run_deletetest, 0},
+       {"DELETE-PRINT", run_delete_print_test, 0},
        {"WILDDELETE", run_wild_deletetest, 0},
        {"DELETE-LN", run_deletetest_ln, 0},
        {"PROPERTIES", run_properties, 0},
        {"MANGLE", torture_mangle, 0},
        {"MANGLE1", run_mangle1, 0},
+       {"MANGLE-ILLEGAL", run_mangle_illegal, 0},
        {"W2K", run_w2ktest, 0},
        {"TRANS2SCAN", torture_trans2_scan, 0},
        {"NTTRANSSCAN", torture_nttrans_scan, 0},
@@ -9680,30 +11809,36 @@ static struct {
        { "NTTRANS-CREATE", run_nttrans_create, 0},
        { "NTTRANS-FSCTL", run_nttrans_fsctl, 0},
        { "CLI_ECHO", run_cli_echo, 0},
-       { "GETADDRINFO", run_getaddrinfo_send, 0},
+       { "CLI_SPLICE", run_cli_splice, 0},
        { "TLDAP", run_tldap },
        { "STREAMERROR", run_streamerror },
        { "NOTIFY-BENCH", run_notify_bench },
        { "NOTIFY-BENCH2", run_notify_bench2 },
        { "NOTIFY-BENCH3", run_notify_bench3 },
        { "BAD-NBT-SESSION", run_bad_nbt_session },
+       { "IGN-BAD-NEGPROT", run_ign_bad_negprot },
        { "SMB-ANY-CONNECT", run_smb_any_connect },
        { "NOTIFY-ONLINE", run_notify_online },
        { "SMB2-BASIC", run_smb2_basic },
        { "SMB2-NEGPROT", run_smb2_negprot },
+       { "SMB2-ANONYMOUS", run_smb2_anonymous },
        { "SMB2-SESSION-RECONNECT", run_smb2_session_reconnect },
        { "SMB2-TCON-DEPENDENCE", run_smb2_tcon_dependence },
        { "SMB2-MULTI-CHANNEL", run_smb2_multi_channel },
        { "SMB2-SESSION-REAUTH", run_smb2_session_reauth },
+       { "SMB2-FTRUNCATE", run_smb2_ftruncate },
+       { "SMB2-DIR-FSYNC", run_smb2_dir_fsync },
        { "CLEANUP1", run_cleanup1 },
        { "CLEANUP2", run_cleanup2 },
        { "CLEANUP3", run_cleanup3 },
        { "CLEANUP4", run_cleanup4 },
        { "OPLOCK-CANCEL", run_oplock_cancel },
+       { "PIDHIGH", run_pidhigh },
        { "LOCAL-SUBSTITUTE", run_local_substitute, 0},
        { "LOCAL-GENCACHE", run_local_gencache, 0},
-       { "LOCAL-TALLOC-DICT", run_local_talloc_dict, 0},
        { "LOCAL-DBWRAP-WATCH1", run_dbwrap_watch1, 0 },
+       { "LOCAL-DBWRAP-WATCH2", run_dbwrap_watch2, 0 },
+       { "LOCAL-DBWRAP-DO-LOCKED1", run_dbwrap_do_locked1, 0 },
        { "LOCAL-MESSAGING-READ1", run_messaging_read1, 0 },
        { "LOCAL-MESSAGING-READ2", run_messaging_read2, 0 },
        { "LOCAL-MESSAGING-READ3", run_messaging_read3, 0 },
@@ -9712,6 +11847,7 @@ static struct {
        { "LOCAL-MESSAGING-FDPASS2", run_messaging_fdpass2, 0 },
        { "LOCAL-MESSAGING-FDPASS2a", run_messaging_fdpass2a, 0 },
        { "LOCAL-MESSAGING-FDPASS2b", run_messaging_fdpass2b, 0 },
+       { "LOCAL-MESSAGING-SEND-ALL", run_messaging_send_all, 0 },
        { "LOCAL-BASE64", run_local_base64, 0},
        { "LOCAL-RBTREE", run_local_rbtree, 0},
        { "LOCAL-MEMCACHE", run_local_memcache, 0},
@@ -9721,10 +11857,9 @@ static struct {
        { "LOCAL-sid_to_string", run_local_sid_to_string, 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-TEVENT-POLL", run_local_tevent_poll, 0},
        { "LOCAL-CONVERT-STRING", run_local_convert_string, 0},
        { "LOCAL-CONV-AUTH-INFO", run_local_conv_auth_info, 0},
-       { "LOCAL-sprintf_append", run_local_sprintf_append, 0},
        { "LOCAL-hex_encode_buf", run_local_hex_encode_buf, 0},
        { "LOCAL-IDMAP-TDB-COMMON", run_idmap_tdb_common_test, 0},
        { "LOCAL-remove_duplicate_addrs2", run_local_remove_duplicate_addrs2, 0},
@@ -9732,18 +11867,20 @@ static struct {
        { "local-tdb-writer", run_local_tdb_writer, 0 },
        { "LOCAL-DBWRAP-CTDB", run_local_dbwrap_ctdb, 0 },
        { "LOCAL-BENCH-PTHREADPOOL", run_bench_pthreadpool, 0 },
+       { "LOCAL-PTHREADPOOL-TEVENT", run_pthreadpool_tevent, 0 },
+       { "LOCAL-G-LOCK1", run_g_lock1, 0 },
+       { "LOCAL-G-LOCK2", run_g_lock2, 0 },
+       { "LOCAL-G-LOCK3", run_g_lock3, 0 },
+       { "LOCAL-G-LOCK4", run_g_lock4, 0 },
+       { "LOCAL-G-LOCK5", run_g_lock5, 0 },
+       { "LOCAL-G-LOCK6", run_g_lock6, 0 },
+       { "LOCAL-G-LOCK-PING-PONG", run_g_lock_ping_pong, 0 },
+       { "LOCAL-CANONICALIZE-PATH", run_local_canonicalize_path, 0 },
+       { "LOCAL-NAMEMAP-CACHE1", run_local_namemap_cache1, 0 },
        { "qpathinfo-bufsize", run_qpathinfo_bufsize, 0 },
+       { "hide-new-files-timeout", run_hidenewfiles, 0 },
        {NULL, NULL, 0}};
 
-/*
- * dummy function to satisfy linker dependency
- */
-struct tevent_context *winbind_event_context(void);
-struct tevent_context *winbind_event_context(void)
-{
-       return NULL;
-}
-
 /****************************************************************************
 run a specified test or "ALL"
 ****************************************************************************/
@@ -9999,6 +12136,20 @@ static void usage(void)
        printf("host=%s share=%s user=%s myname=%s\n", 
               host, share, username, myname);
 
+       torture_creds = cli_session_creds_init(frame,
+                                              username,
+                                              workgroup,
+                                              NULL, /* realm */
+                                              password,
+                                              use_kerberos,
+                                              false, /* fallback_after_kerberos */
+                                              false, /* use_ccache */
+                                              false); /* password_is_nt_hash */
+       if (torture_creds == NULL) {
+               d_printf("cli_session_creds_init() failed.\n");
+               exit(1);
+       }
+
        if (argc == optind) {
                correct = run_test("ALL");
        } else {