s3: libsmb: Rename cli_close_create() -> cli_smb1_close_create().
[samba.git] / source3 / torture / torture.c
index 349527fd43b826d21b52d44978c14882e2039014..87276c09cb348db512eb313f33786b65d24296d3 100644 (file)
@@ -31,7 +31,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"
 
 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 +107,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 +325,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 +355,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 +377,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 +417,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 +1309,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 +1342,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 +1414,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 +1474,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 +1519,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");
@@ -2768,8 +2781,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 +2799,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 +3007,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 +3162,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 +3215,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 +3245,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 +3446,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;
                }
@@ -4707,7 +4857,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 +4885,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 +4932,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 +4960,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 +4988,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,133 +5047,709 @@ 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. */
+       if (posix_cli) {
+               torture_close_connection(posix_cli);
+       }
 
-       cli_setatr(cli1, fname, 0, 0);
+       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);
 
-       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;
+               torture_close_connection(cli);
        }
 
-       /* This will fail - but the error should be ERRshare. */
-       status = cli_openx(cli1, fname, O_RDWR, DENY_ALL, &fnum2);
+       TALLOC_FREE(frame);
+       return false;
+}
 
-       if (check_error(__LINE__, status, ERRDOS, ERRbadshare,
-                       NT_STATUS_SHARING_VIOLATION)) {
-               printf("correct error code ERRDOS/ERRbadshare returned\n");
-       }
+/*
+  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;
 
-       status = cli_close(cli1, fnum1);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("close2 failed (%s)\n", nt_errstr(status));
-               return False;
+       frame = talloc_stackframe();
+       printf("starting owner rights test\n");
+
+       /* Windows connection. */
+       if (!torture_open_connection(&cli, 0)) {
+               goto fail;
        }
 
-       cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+       smbXcli_conn_set_sockopt(cli->conn, sockops);
 
-       printf("finished open test 2\n");
+       /* Start with a clean slate. */
+       cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
-       /* Test truncate open disposition on file opened for read. */
-       status = cli_openx(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
+       /* 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("(3) 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;
+       }
+
+       /* 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;
+       }
+
+       /*
+        * Add an "owner-rights" ACE denying WRITE_DATA,
+        * and an "owner-rights" ACE allowing READ_DATA.
+        */
+
+       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;
+       }
+       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("cli_set_secdesc failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
+       }
+       status = cli_close(cli, fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               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;
+       }
+
+       /* 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("Open of %s - %s\n", fname, nt_errstr(status));
+               goto fail;
+       }
+
+       status = cli_close(cli, fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
+       }
+
+       /* 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("Create of %s - %s\n", fname, nt_errstr(status));
+               goto fail;
+       }
+
+       /* 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;
+       }
+
+       /*
+        * Add an "owner-rights ACE denying WRITE_DATA,
+        * and an "owner-rights ACE allowing READ_DATA|WRITE_DATA.
+        */
+
+       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("cli_set_secdesc failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
+       }
+       status = cli_close(cli, fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               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;
+       }
+
+       /* 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("Open of %s - %s\n", fname, nt_errstr(status));
+               goto fail;
+       }
+
+       status = cli_close(cli, fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
+       }
+
+       /* 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("Create of %s - %s\n", fname, nt_errstr(status));
+               goto fail;
+       }
+
+       /* 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;
+       }
+
+       /*
+        * Add an "authenticated users" ACE allowing READ_DATA,
+        * add an "owner-rights" denying READ_DATA,
+        * and an "authenticated users" ACE allowing WRITE_DATA.
+        */
+
+       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;
+       }
+       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("cli_set_secdesc failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
+       }
+       status = cli_close(cli, fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
+       }
+       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("Open of %s - %s\n", fname, nt_errstr(status));
+               goto fail;
+       }
+
+       status = cli_close(cli, fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close failed for %s (%s)\n",
+                       fname, nt_errstr(status));
+               goto fail;
+       }
+
+       cli_unlink(cli, fname,
+               FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+       TALLOC_FREE(frame);
+       return true;
+
+  fail:
+
+       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);
+       }
+
+       TALLOC_FREE(frame);
+       return false;
+}
+
+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;
+
+       printf("starting pipenumber test\n");
+       if (!torture_open_connection(&cli1, 0)) {
+               return False;
+       }
+
+       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);
+
+       smbXcli_conn_set_sockopt(cli1->conn, sockops);
+
+       status = cli_openx(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("open of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
+       }
+
+       status = cli_close(cli1, fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("close2 failed (%s)\n", nt_errstr(status));
+               return False;
+       }
+
+       status = cli_setatr(cli1, fname, FILE_ATTRIBUTE_READONLY, 0);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_setatr failed (%s)\n", nt_errstr(status));
+               return False;
+       }
+
+       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;
+       }
+
+       /* This will fail - but the error should be ERRnoaccess, not ERRbadshare. */
+       status = cli_openx(cli1, fname, O_RDWR, DENY_ALL, &fnum2);
+
+        if (check_error(__LINE__, status, ERRDOS, ERRnoaccess,
+                       NT_STATUS_ACCESS_DENIED)) {
+               printf("correct error code ERRDOS/ERRnoaccess returned\n");
+       }
+
+       printf("finished open test 1\n");
+
+       cli_close(cli1, fnum1);
+
+       /* Now try not readonly and ensure ERRbadshare is returned. */
+
+       cli_setatr(cli1, fname, 0, 0);
+
+       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;
+       }
+
+       /* 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("close2 failed (%s)\n", nt_errstr(status));
+               return False;
+       }
+
+       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("(3) open (1) of %s failed (%s)\n", fname, nt_errstr(status));
+               return False;
        }
 
        /* write 20 bytes. */
@@ -6012,6 +6738,151 @@ static bool run_acl_symlink_test(int dummy)
        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)) {
+               goto out;
+       }
+
+       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("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("cli_close of %s failed (%s)\n",
+                       fname,
+                       nt_errstr(status));
+               goto out;
+       }
+       fnum1 = (uint16_t)-1;
+
+       /* 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);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_ntcreate of %s failed (%s)\n",
+                       stream_fname,
+                       nt_errstr(status));
+               goto out;
+       }
+
+       /* Leave the stream handle open... */
+
+       /* 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 (!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("cli_close of %s failed (%s)\n",
+                       stream_fname,
+                       nt_errstr(status));
+               goto out;
+       }
+       fnum1 = (uint16_t)-1;
+
+       /* POSIX unlink after stream handle closed should succeed. */
+       status = cli_posix_unlink(cli2, fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("cli_posix_unlink of %s failed (%s)\n",
+                       fname,
+                       nt_errstr(status));
+               goto out;
+       }
+
+       printf("POSIX stream delete test passed\n");
+       correct = true;
+
+  out:
+
+       if (fnum1 != (uint16_t)-1) {
+               cli_close(cli1, fnum1);
+               fnum1 = (uint16_t)-1;
+       }
+
+       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;
+       }
+
+       TALLOC_FREE(frame);
+       return correct;
+}
+
 /*
   Test setting EA's are rejected on symlinks.
  */
@@ -6160,25 +7031,144 @@ static bool run_ea_symlink_test(int dummy)
                                ea_value,
                                strlen(ea_value)+1);
 
-       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));
+       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;
+       }
+
+       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)) {
+               TALLOC_FREE(frame);
+               return false;
+       }
+
+       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_open(cli, fname, O_RDWR, 0, &fnum2);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("First POSIX open of %s failed\n", fname);
+               goto out;
+       }
+
+       /* 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 lock (1) failed %s\n", nt_errstr(status));
+               goto out;
+       }
+
+       /* 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("POSIX lock (2) failed %s\n", nt_errstr(status));
+               goto out;
+       }
+
+       /* 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;
+
+       /* Change the lock context. */
+       cli_setpid(cli, cli_getpid(cli) + 1);
+
+       /* Re-open fnum1. */
+       status = cli_posix_open(cli, fname, O_RDWR, 0, &fnum1);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Third POSIX open of %s failed\n", fname);
+               goto out;
+       }
+
+       /* 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;
        }
 
-       printf("EA symlink test passed\n");
+       /* 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("POSIX OFD lock test passed\n");
        correct = true;
 
   out:
 
-       if (fnum != (uint16_t)-1) {
-               cli_close(cli, fnum);
-               fnum = (uint16_t)-1;
+       if (fnum1 != (uint16_t)-1) {
+               cli_close(cli, fnum1);
+               fnum1 = (uint16_t)-1;
+       }
+       if (fnum2 != (uint16_t)-1) {
+               cli_close(cli, fnum2);
+               fnum2 = (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);
 
@@ -6850,7 +7840,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;
@@ -6877,7 +7867,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));
@@ -6888,12 +7878,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");
                }
@@ -6907,10 +7910,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");
                }
@@ -6935,6 +7935,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;
 }
@@ -6960,13 +7962,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;
                }
@@ -7068,7 +8066,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);
 
@@ -7108,10 +8106,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;
        }
@@ -7596,6 +8595,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;
@@ -7900,13 +9045,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;
                }
@@ -7914,8 +9053,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;
                }
@@ -8032,8 +9170,9 @@ 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");
@@ -8074,6 +9213,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);
@@ -8086,9 +9230,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);
 
@@ -8466,40 +9612,298 @@ static bool run_streamerror(int dummy)
                return false;
        }
 
-       cli_unlink(cli, "\\testdir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
-       cli_rmdir(cli, dname);
+       cli_unlink(cli, "\\testdir\\*", 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 = cli_mkdir(cli, dname);
+       status = torture_setup_unix_extensions(cli);
        if (!NT_STATUS_IS_OK(status)) {
-               printf("mkdir failed: %s\n", nt_errstr(status));
+               TALLOC_FREE(frame);
                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;
+       /* 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_posix_symlink of %s -> %s failed (%s)\n",
+                       sname,
+                       fname,
+                       nt_errstr(status));
+               goto out;
        }
 
-       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);
+       /* 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);
 
-       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;
+       /*
+        * 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("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;
 
-       cli_rmdir(cli, dname);
-       return ret;
+  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;
 }
 
 static bool run_local_substitute(int dummy)
@@ -8630,7 +10034,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;
        }
@@ -8669,7 +10073,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;
@@ -8910,61 +10314,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;
 
@@ -9158,7 +10507,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);
@@ -9313,15 +10662,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) {
@@ -9330,14 +10689,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");
@@ -9347,40 +10705,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);
@@ -9467,59 +10864,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;
@@ -9662,17 +11006,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;
@@ -9879,6 +11223,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 missmatch %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;
@@ -10019,6 +11481,9 @@ static struct {
        {"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},
@@ -10029,12 +11494,15 @@ 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},
        {"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},
@@ -10056,13 +11524,13 @@ 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},
        { "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 },
@@ -10071,15 +11539,18 @@ static struct {
        { "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 },
        { "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 },
@@ -10097,10 +11568,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},
@@ -10108,18 +11578,18 @@ 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-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 },
        {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"
 ****************************************************************************/
@@ -10375,6 +11845,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 {