Changeset 745 for trunk/server/source3/torture

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/torture/cmd_vfs.c (modified) (3 diffs)
• source3/torture/denytest.c (modified) (7 diffs)
• source3/torture/locktest.c (modified) (5 diffs)
• source3/torture/locktest2.c (modified) (5 diffs)
• source3/torture/mangle_test.c (modified) (5 diffs)
• source3/torture/masktest.c (modified) (12 diffs)
• source3/torture/msgtest.c (modified) (6 diffs)
• source3/torture/nbench.c (copied) (copied from vendor/current/source3/torture/nbench.c )
• source3/torture/nbio.c (modified) (13 diffs)
• source3/torture/nsstest.c (deleted)
• source3/torture/pdbtest.c (modified) (3 diffs)
• source3/torture/proto.h (copied) (copied from vendor/current/source3/torture/proto.h )
• source3/torture/rpc_open_tcp.c (modified) (1 diff)
• source3/torture/scanner.c (modified) (10 diffs)
• source3/torture/smbiconv.c (modified) (2 diffs)
• source3/torture/t_stringoverflow.c (modified) (2 diffs)
• source3/torture/test_addrchange.c (copied) (copied from vendor/current/source3/torture/test_addrchange.c )
• source3/torture/test_async_echo.c (copied) (copied from vendor/current/source3/torture/test_async_echo.c )
• source3/torture/test_case_insensitive.c (copied) (copied from vendor/current/source3/torture/test_case_insensitive.c )
• source3/torture/test_posix_append.c (copied) (copied from vendor/current/source3/torture/test_posix_append.c )
• source3/torture/test_smbsock_any_connect.c (copied) (copied from vendor/current/source3/torture/test_smbsock_any_connect.c )
• source3/torture/torture.c (modified) (222 diffs)
• source3/torture/utable.c (modified) (6 diffs)
• source3/torture/vfstest.c (modified) (6 diffs)
• source3/torture/wbc_async.c (copied) (copied from vendor/current/source3/torture/wbc_async.c )
• source3/torture/wbc_async.h (copied) (copied from vendor/current/source3/torture/wbc_async.h )

trunk/server/source3/torture/cmd_vfs.c

@@ -21 +21 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
+#include "system/passwd.h"
+#include "system/filesys.h"
 #include "vfstest.h"
+#include "../lib/util/util_pw.h"
 
 static const char *null_string = "";
@@ -1129 +1133 @@
 static NTSTATUS cmd_realpath(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv)
 {
-        char respath[PATH_MAX];
-        
         if (argc != 2) {
                 printf("Usage: realpath <path>\n");
@@ -1136 +1138 @@
         }
 
-        if (SMB_VFS_REALPATH(vfs->conn, argv[1], respath) == NULL) {
+        if (SMB_VFS_REALPATH(vfs->conn, argv[1]) == NULL) {
                 printf("realpath: error=%d (%s)\n", errno, strerror(errno));
                 return NT_STATUS_UNSUCCESSFUL;

trunk/server/source3/torture/denytest.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "torture/proto.h"
+#include "libsmb/libsmb.h"
 
 extern bool torture_showall;
@@ -1420 +1423 @@
 
         for (i=0;i<2;i++) {
-                cli_unlink(cli1, fnames[i], aSYSTEM | aHIDDEN);
+                cli_unlink(cli1, fnames[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
                 cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE, &fnum1);
-                cli_write(cli1, fnum1, 0, fnames[i], 0, strlen(fnames[i]));
+                cli_writeall(cli1, fnum1, 0, (uint8_t *)fnames[i], 0,
+                             strlen(fnames[i]), NULL);
                 cli_close(cli1, fnum1);
         }
@@ -1451 +1455 @@
                                 res += A_R;
                         }
-                        if (cli_write(cli1, fnum2, 0, (char *)&x, 0, 1) == 1) {
+                        if (NT_STATUS_IS_OK(cli_writeall(cli1, fnum2, 0,
+                                                         (uint8_t *)&x, 0, 1,
+                                                         NULL))) {
                                 res += A_W;
                         }
@@ -1480 +1486 @@
 
         for (i=0;i<2;i++) {
-                cli_unlink(cli1, fnames[i], aSYSTEM | aHIDDEN);
+                cli_unlink(cli1, fnames[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         }
                 
@@ -1511 +1517 @@
 
         for (i=0;i<2;i++) {
-                cli_unlink(cli1, fnames[i], aSYSTEM | aHIDDEN);
+                cli_unlink(cli1, fnames[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
                 cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE, &fnum1);
-                cli_write(cli1, fnum1, 0, fnames[i], 0, strlen(fnames[i]));
+                cli_writeall(cli1, fnum1, 0, (uint8_t *)fnames[i], 0,
+                             strlen(fnames[i]), NULL);
                 cli_close(cli1, fnum1);
         }
@@ -1540 +1547 @@
                                 res += A_R;
                         }
-                        if (cli_write(cli2, fnum2, 0, (char *)&x, 0, 1) == 1) {
+                        if (NT_STATUS_IS_OK(cli_writeall(cli2, fnum2, 0,
+                                                         (uint8_t *)&x, 0, 1,
+                                                         NULL))) {
                                 res += A_W;
                         }
@@ -1569 +1578 @@
                 
         for (i=0;i<2;i++) {
-                cli_unlink(cli1, fnames[i], aSYSTEM | aHIDDEN);
+                cli_unlink(cli1, fnames[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         }
 

trunk/server/source3/torture/locktest.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "libsmb/libsmb.h"
+#include "system/filesys.h"
+#include "locking/proto.h"
+#include "libsmb/nmblib.h"
 
 static fstring password[2];
@@ -234 +238 @@
         }
 
-        if (!NT_STATUS_IS_OK(cli_session_setup(c, username[snum], 
-                                               password[snum],
-                                               strlen(password[snum]),
-                                               password[snum],
-                                               strlen(password[snum]),
-                                               lp_workgroup()))) {
-                DEBUG(0,("session setup failed: %s\n", cli_errstr(c)));
+        status = cli_session_setup(c, username[snum],
+                                   password[snum], strlen(password[snum]),
+                                   password[snum], strlen(password[snum]),
+                                   lp_workgroup());
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0,("session setup failed: %s\n", nt_errstr(status)));
                 return NULL;
         }
@@ -399 +402 @@
         }
         for (server=0;server<NSERVERS;server++) {
-                cli_unlink(cli[server][0], FILENAME, aSYSTEM | aHIDDEN);
+                cli_unlink(cli[server][0], FILENAME, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         }
 }
@@ -605 +608 @@
         load_case_tables();
 
-        dbf = x_stderr;
-
         if (argc < 3 || argv[1][0] == '-') {
                 usage();
@@ -612 +613 @@
         }
 
-        setup_logging(argv[0],True);
+        setup_logging(argv[0], DEBUG_STDOUT);
 
         for (server=0;server<NSERVERS;server++) {

trunk/server/source3/torture/locktest2.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "libsmb/libsmb.h"
+#include "system/filesys.h"
+#include "locking/proto.h"
 
 static fstring password;
@@ -191 +194 @@
         nt_status = cli_full_connection(&c, myname, server_n, NULL, 0, share, "?????", 
                                         username, lp_workgroup(), password, 0,
-                                        Undefined, NULL);
+                                        Undefined);
 
         if (!NT_STATUS_IS_OK(nt_status)) {
@@ -324 +327 @@
         }
         for (server=0;server<NSERVERS;server++) {
-                cli_unlink(cli[server][0], FILENAME, aSYSTEM | aHIDDEN);
+                cli_unlink(cli[server][0], FILENAME, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         }
 }
@@ -492 +495 @@
         setlinebuf(stdout);
 
-        dbf = x_stderr;
-
         if (argc < 5 || argv[1][0] == '-') {
                 usage();
                 exit(1);
         }
+
+        setup_logging(argv[0], DEBUG_STDOUT);
 
         share1 = argv[1];
@@ -506 +509 @@
         all_string_sub(share1,"/","\\",0);
         all_string_sub(share2,"/","\\",0);
-
-        setup_logging(argv[0],True);
 
         argc -= 4;

trunk/server/source3/torture/mangle_test.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "torture/proto.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
+#include "util_tdb.h"
 
 extern int torture_numops;
@@ -56 +61 @@
 
         fstr_sprintf(name2, "\\mangle_test\\%s", shortname);
-        if (!NT_STATUS_IS_OK(cli_unlink(cli, name2, aSYSTEM | aHIDDEN))) {
+        if (!NT_STATUS_IS_OK(cli_unlink(cli, name2, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                 printf("unlink of %s  (%s) failed (%s)\n", 
                        name2, name, cli_errstr(cli));
@@ -73 +78 @@
 
         /* and unlink by long name */
-        if (!NT_STATUS_IS_OK(cli_unlink(cli, name, aSYSTEM | aHIDDEN))) {
+        if (!NT_STATUS_IS_OK(cli_unlink(cli, name, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                 printf("unlink2 of %s  (%s) failed (%s)\n", 
                        name, name2, cli_errstr(cli));
                 failures++;
-                cli_unlink(cli, name2, aSYSTEM | aHIDDEN);
+                cli_unlink(cli, name2, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
                 return True;
         }
@@ -176 +181 @@
         }
 
-        cli_unlink(cli, "\\mangle_test\\*", aSYSTEM | aHIDDEN);
+        cli_unlink(cli, "\\mangle_test\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_rmdir(cli, "\\mangle_test");
 
@@ -200 +205 @@
         }
 
-        cli_unlink(cli, "\\mangle_test\\*", aSYSTEM | aHIDDEN);
+        cli_unlink(cli, "\\mangle_test\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         if (!NT_STATUS_IS_OK(cli_rmdir(cli, "\\mangle_test"))) {
                 printf("ERROR: Failed to remove directory\n");

trunk/server/source3/torture/masktest.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "trans2.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/nmblib.h"
 
 static fstring password;
@@ -35 +39 @@
 extern char *optarg;
 extern int optind;
-extern bool AllowDebugChange;
 
 /* a test fn for LANMAN mask support */
@@ -228 +231 @@
         }
 
-        if (!NT_STATUS_IS_OK(cli_session_setup(c, username, 
-                                               password, strlen(password),
-                                               password, strlen(password),
-                                               lp_workgroup()))) {
-                DEBUG(0,("session setup failed: %s\n", cli_errstr(c)));
+        status = cli_session_setup(c, username,
+                                   password, strlen(password),
+                                   password, strlen(password),
+                                   lp_workgroup());
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("session setup failed: %s\n", nt_errstr(status)));
                 return NULL;
         }
@@ -264 +268 @@
 
 static char *resultp;
-static file_info *f_info;
-
-static void listfn(const char *mnt, file_info *f, const char *s, void *state)
-{
+
+struct rn_state {
+        char **pp_long_name;
+        char *short_name;
+};
+
+static NTSTATUS listfn(const char *mnt, struct file_info *f, const char *s,
+                   void *private_data)
+{
+        struct rn_state *state = (struct rn_state *)private_data;
         if (strcmp(f->name,".") == 0) {
                 resultp[0] = '+';
@@ -275 +285 @@
                 resultp[2] = '+';
         }
-        f_info = f;
+
+        if (state == NULL) {
+                return NT_STATUS_INTERNAL_ERROR;
+        }
+
+        if (ISDOT(f->name) || ISDOTDOT(f->name))  {
+                return NT_STATUS_OK;
+        }
+
+        fstrcpy(state->short_name, f->short_name);
+        strlower_m(state->short_name);
+        *state->pp_long_name = SMB_STRDUP(f->name);
+        if (!*state->pp_long_name) {
+                return NT_STATUS_NO_MEMORY;
+        }
+        strlower_m(*state->pp_long_name);
+        return NT_STATUS_OK;
 }
 
@@ -281 +307 @@
                           char **pp_long_name, fstring short_name)
 {
+        struct rn_state state;
+
+        state.pp_long_name = pp_long_name;
+        state.short_name = short_name;
+
         *pp_long_name = NULL;
         /* nasty hack to force level 260 listings - tridge */
-        cli->capabilities |= CAP_NT_SMBS;
         if (max_protocol <= PROTOCOL_LANMAN1) {
-                cli_list_new(cli, "\\masktest\\*.*", aHIDDEN | aDIR, listfn, NULL);
+                cli_list_trans(cli, "\\masktest\\*.*", FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
+                               SMB_FIND_FILE_BOTH_DIRECTORY_INFO, listfn,
+                               &state);
         } else {
-                cli_list_new(cli, "\\masktest\\*", aHIDDEN | aDIR, listfn, NULL);
-        }
-        if (f_info) {
-                fstrcpy(short_name, f_info->short_name);
-                strlower_m(short_name);
-                *pp_long_name = SMB_STRDUP(f_info->name);
-                if (!*pp_long_name) {
-                        return;
-                }
-                strlower_m(*pp_long_name);
+                cli_list_trans(cli, "\\masktest\\*", FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
+                               SMB_FIND_FILE_BOTH_DIRECTORY_INFO,
+                               listfn, &state);
         }
 
@@ -331 +356 @@
         resultp = res1;
         fstrcpy(short_name, "");
-        f_info = NULL;
         get_real_name(cli, &long_name, short_name);
         if (!long_name) {
                 return;
         }
-        f_info = NULL;
         fstrcpy(res1, "---");
-        cli_list(cli, mask, aHIDDEN | aDIR, listfn, NULL);
+        cli_list(cli, mask, FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY, listfn, NULL);
 
         res2 = reg_test(cli, mask, long_name, short_name);
@@ -350 +373 @@
         }
 
-        cli_unlink(cli, file, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, file, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (count % 100 == 0) DEBUG(0,("%d\n", count));
@@ -367 +390 @@
         cli_mkdir(cli, "\\masktest");
 
-        cli_unlink(cli, "\\masktest\\*", aSYSTEM | aHIDDEN);
+        cli_unlink(cli, "\\masktest\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (argc >= 2) {
@@ -466 +489 @@
         setlinebuf(stdout);
 
-        dbf = x_stderr;
-
-        DEBUGLEVEL = 0;
-        AllowDebugChange = False;
+        lp_set_cmdline("log level", "0");
 
         if (argc < 2 || argv[1][0] == '-') {
@@ -480 +500 @@
         all_string_sub(share,"/","\\",0);
 
-        setup_logging(argv[0],True);
+        setup_logging(argv[0], DEBUG_STDERR);
 
         argc -= 1;
         argv += 1;
 
+        load_case_tables();
         lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
         load_interfaces();
@@ -500 +521 @@
                         break;
                 case 'd':
-                        DEBUGLEVEL = atoi(optarg);
+                        lp_set_cmdline("log level", optarg);
                         break;
                 case 'E':

trunk/server/source3/torture/msgtest.c

@@ -2 +2 @@
    Unix SMB/CIFS implementation.
    Copyright (C) Andrew Tridgell 2000
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -22 +22 @@
 
 #include "includes.h"
+#include "messages.h"
 
 static int pong_count;
@@ -49 +50 @@
         load_case_tables();
 
-        setup_logging(argv[0],True);
-        
+        setup_logging(argv[0], DEBUG_STDOUT);
+
         lp_load(get_dyn_CONFIGFILE(),False,False,False,True);
 
         if (!(evt_ctx = tevent_context_init(NULL)) ||
-            !(msg_ctx = messaging_init(NULL, server_id_self(), evt_ctx))) {
+            !(msg_ctx = messaging_init(NULL, procid_self(), evt_ctx))) {
                 fprintf(stderr, "could not init messaging context\n");
                 exit(1);
         }
-        
+
         if (argc != 3) {
                 fprintf(stderr, "%s: Usage - %s pid count\n", argv[0],
@@ -88 +89 @@
 
         for (i=0;i<n;i++) {
-                messaging_send(msg_ctx, pid_to_procid(getpid()), MSG_PING,
+                messaging_send(msg_ctx, messaging_server_id(msg_ctx), MSG_PING,
                                &data_blob_null);
-                messaging_send_buf(msg_ctx, pid_to_procid(getpid()), MSG_PING,
-                                   (uint8 *)buf, 11);
+                messaging_send_buf(msg_ctx, messaging_server_id(msg_ctx),
+                                   MSG_PING,(uint8 *)buf, 11);
         }
 
@@ -133 +134 @@
                         }
                 }
-                
+
                 printf("waiting for %d remaining replies (done %d)\n", 
                        (int)(ping_count - pong_count), pong_count);
@@ -142 +143 @@
                         }
                 }
-                
+
                 if (ping_count != pong_count) {
                         fprintf(stderr, "ping test failed! received %d, sent "
                                 "%d\n", pong_count, (int)ping_count);
                 }
-                
+
                 printf("ping rate of %.0f messages/sec\n", 
                        (ping_count+pong_count)/timeval_elapsed(&tv));

trunk/server/source3/torture/nbio.c

@@ -21 +21 @@
 
 #include "includes.h"
+#include "torture/proto.h"
+#include "../libcli/security/security.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
 
 #define MAX_FILES 1000
@@ -28 +32 @@
 extern int nbio_id;
 static int nprocs;
+static struct timeval nb_start;
 
 static struct {
@@ -61 +66 @@
         }
 
-        printf("%4d  %8d  %.2f MB/sec\r", num_clients, lines/nprocs, 1.0e-6 * nbio_total() / end_timer());
+        printf("%4d  %8d  %.2f MB/sec\r",
+               num_clients, lines/nprocs,
+               1.0e-6 * nbio_total() / timeval_elapsed(&nb_start));
 
         signal(SIGALRM, nb_alarm);
@@ -122 +129 @@
         signal(SIGSEGV, sigsegv);
         c = cli;
-        start_timer();
+        nb_start = timeval_current();
         children[nbio_id].done = 0;
 }
@@ -129 +136 @@
 void nb_unlink(const char *fname)
 {
-        if (!NT_STATUS_IS_OK(cli_unlink(c, fname, aSYSTEM | aHIDDEN))) {
+        if (!NT_STATUS_IS_OK(cli_unlink(c, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
 #if NBDEBUG
                 printf("(%d) unlink %s failed (%s)\n", 
@@ -184 +191 @@
 {
         int i;
+        NTSTATUS status;
 
         if (buf[0] == 0) memset(buf, 1, sizeof(buf));
 
         i = find_handle(handle);
-        if (cli_write(c, ftable[i].fd, 0, buf, offset, size) != ret_size) {
-                printf("(%d) ERROR: write failed on handle %d, fd %d \
-errno %d (%s)\n", line_count, handle, ftable[i].fd, errno, strerror(errno));
+        status = cli_writeall(c, ftable[i].fd, 0, (uint8_t *)buf, offset, size,
+                              NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("(%d) ERROR: write failed on handle %d, fd %d "
+                       "error %s\n", line_count, handle, ftable[i].fd,
+                       nt_errstr(status));
                 exit(1);
         }
@@ -242 +253 @@
 void nb_qpathinfo(const char *fname)
 {
-        cli_qpathinfo(c, fname, NULL, NULL, NULL, NULL, NULL);
+        cli_qpathinfo1(c, fname, NULL, NULL, NULL, NULL, NULL);
 }
 
@@ -249 +260 @@
         int i;
         i = find_handle(fnum);
-        cli_qfileinfo(c, ftable[i].fd, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+        cli_qfileinfo_basic(c, ftable[i].fd, NULL, NULL, NULL, NULL, NULL,
+                            NULL, NULL);
 }
 
@@ -259 +271 @@
 }
 
-static void find_fn(const char *mnt, file_info *finfo, const char *name, void *state)
+static NTSTATUS find_fn(const char *mnt, struct file_info *finfo, const char *name,
+                    void *state)
 {
         /* noop */
+        return NT_STATUS_OK;
 }
 
@@ -278 +292 @@
 static int total_deleted;
 
-static void delete_fn(const char *mnt, file_info *finfo, const char *name, void *state)
-{
+static NTSTATUS delete_fn(const char *mnt, struct file_info *finfo,
+                      const char *name, void *state)
+{
+        NTSTATUS status;
         char *s, *n;
-        if (finfo->name[0] == '.') return;
+        if (finfo->name[0] == '.') {
+                return NT_STATUS_OK;
+        }
 
         n = SMB_STRDUP(name);
@@ -287 +305 @@
         if (asprintf(&s, "%s%s", n, finfo->name) == -1) {
                 printf("asprintf failed\n");
-                return;
-        }
-        if (finfo->mode & aDIR) {
+                return NT_STATUS_NO_MEMORY;
+        }
+        if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) {
                 char *s2;
                 if (asprintf(&s2, "%s\\*", s) == -1) {
                         printf("asprintf failed\n");
-                        return;
+                        return NT_STATUS_NO_MEMORY;
                 }
-                cli_list(c, s2, aDIR, delete_fn, NULL);
+                status = cli_list(c, s2, FILE_ATTRIBUTE_DIRECTORY, delete_fn, NULL);
+                if (!NT_STATUS_IS_OK(status)) {
+                        free(n);
+                        free(s2);
+                        return status;
+                }
                 nb_rmdir(s);
         } else {
@@ -303 +326 @@
         free(s);
         free(n);
+        return NT_STATUS_OK;
 }
 
@@ -314 +338 @@
 
         total_deleted = 0;
-        cli_list(c, mask, aDIR, delete_fn, NULL);
+        cli_list(c, mask, FILE_ATTRIBUTE_DIRECTORY, delete_fn, NULL);
         free(mask);
         cli_rmdir(c, dname);

trunk/server/source3/torture/pdbtest.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "popt_common.h"
+#include "passdb.h"
 
 static bool samu_correct(struct samu *s1, struct samu *s2)
@@ -248 +250 @@
         load_case_tables();
 
-        pc = poptGetContext("vfstest", argc, (const char **) argv,
+        pc = poptGetContext("pdbtest", argc, (const char **) argv,
                             long_options, 0);
 
@@ -259 +261 @@
         /* Load configuration */
         lp_load(get_dyn_CONFIGFILE(), False, False, True, True);
-        setup_logging("pdbtest", True);
+        setup_logging("pdbtest", DEBUG_STDOUT);
 
         if (backend == NULL) {

trunk/server/source3/torture/rpc_open_tcp.c

@@ -20 +20 @@
 
 #include "includes.h"
-
+#include "rpc_client/cli_pipe.h"
 #include "librpc/gen_ndr/ndr_dfs.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"

trunk/server/source3/torture/scanner.c

@@ -3 +3 @@
    SMB torture tester - scanning functions
    Copyright (C) Andrew Tridgell 2001
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -19 +19 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "torture/proto.h"
+#include "libsmb/libsmb.h"
 
 #define VERBOSE 0
@@ -50 +53 @@
 static NTSTATUS try_trans2(struct cli_state *cli, 
                          int op,
-                         char *param, char *data,
-                         int param_len, int data_len,
-                         unsigned int *rparam_len, unsigned int *rdata_len)
-{
-        uint16 setup = op;
-        char *rparam=NULL, *rdata=NULL;
-
-        if (!cli_send_trans(cli, SMBtrans2, 
-                            NULL,                           /* name */
-                            -1, 0,                          /* fid, flags */
-                            &setup, 1, 0,                   /* setup, length, max */
-                            param, param_len, 2,            /* param, length, max */
-                            data, data_len, cli->max_xmit   /* data, length, max */
-                           )) {
-                return cli_nt_error(cli);
-        }
-
-        cli_receive_trans(cli, SMBtrans2,
-                           &rparam, rparam_len,
-                           &rdata, rdata_len);
-
-        SAFE_FREE(rdata);
-        SAFE_FREE(rparam);
-
-        return cli_nt_error(cli);
+                         uint8_t *param, uint8_t *data,
+                         uint32_t param_len, uint32_t data_len,
+                         uint32_t *rparam_len, uint32_t *rdata_len)
+{
+        uint16_t setup[1];
+        uint8_t *rparam=NULL, *rdata=NULL;
+        NTSTATUS status;
+
+        SSVAL(setup+0, 0, op);
+
+        status = cli_trans(talloc_tos(), cli, SMBtrans2,
+                           NULL, -1, /* name, fid */
+                           op, 0,
+                           NULL, 0, 0, /* setup */
+                           param, param_len, 2,
+                           data, data_len, cli->max_xmit,
+                           NULL,                /* recv_flags2 */
+                           NULL, 0, NULL,       /* rsetup */
+                           &rparam, 0, rparam_len,
+                           &rdata, 0, rdata_len);
+
+        TALLOC_FREE(rdata);
+        TALLOC_FREE(rparam);
+
+        return status;
 }
 
@@ -81 +84 @@
                              const char *format,
                              int op, int level,
-                             char *param, char *data,
-                             int param_len, int *data_len,
-                             unsigned int *rparam_len, unsigned int *rdata_len)
+                             uint8_t *param, uint8_t *data,
+                             uint32_t param_len, uint32_t *data_len,
+                             uint32_t *rparam_len, uint32_t *rdata_len)
 {
         NTSTATUS ret=NT_STATUS_OK;
@@ -116 +119 @@
                         int fnum, int dnum, const char *fname)
 {
-        int data_len = 0;
-        int param_len = 0;
-        unsigned int rparam_len, rdata_len;
-        char param[PARAM_SIZE], data[DATA_SIZE];
+        uint32_t data_len = 0;
+        uint32_t param_len = 0;
+        uint32_t rparam_len, rdata_len;
+        uint8_t param[PARAM_SIZE], data[DATA_SIZE];
         NTSTATUS status;
 
@@ -171 +174 @@
         status = try_trans2_len(cli, "newfile", op, level, param, data, param_len, &data_len, 
                                 &rparam_len, &rdata_len);
-        cli_unlink(cli, "\\newfile.dat", aSYSTEM | aHIDDEN);
+        cli_unlink(cli, "\\newfile.dat", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_rmdir(cli, "\\newfile.dat");
         if (NT_STATUS_IS_OK(status)) return True;
@@ -259 +262 @@
 ****************************************************************************/
 static NTSTATUS try_nttrans(struct cli_state *cli, 
-                         int op,
-                         char *param, char *data,
-                         int param_len, int data_len,
-                         unsigned int *rparam_len, unsigned int *rdata_len)
-{
-        char *rparam=NULL, *rdata=NULL;
-
-        if (!cli_send_nt_trans(cli, op, 
-                               0,   
-                               NULL, 0, 0,
-                               param, param_len, 2,            /* param, length, max */
-                               data, data_len, cli->max_xmit   /* data, length, max */
-                           )) {
-                return cli_nt_error(cli);
-        }
-
-        cli_receive_nt_trans(cli,
-                             &rparam, rparam_len,
-                             &rdata, rdata_len);
-
+                            int op,
+                            uint8_t *param, uint8_t *data,
+                            int32_t param_len, uint32_t data_len,
+                            uint32_t *rparam_len,
+                            uint32_t *rdata_len)
+{
+        uint8_t *rparam=NULL, *rdata=NULL;
+        NTSTATUS status;
+
+        status = cli_trans(talloc_tos(), cli, SMBnttrans,
+                           NULL, -1, /* name, fid */
+                           op, 0,
+                           NULL, 0, 0, /* setup */
+                           param, param_len, 2,
+                           data, data_len, cli->max_xmit,
+                           NULL,                /* recv_flags2 */
+                           NULL, 0, NULL,       /* rsetup */
+                           &rparam, 0, rparam_len,
+                           &rdata, 0, rdata_len);
         SAFE_FREE(rdata);
         SAFE_FREE(rparam);
 
-        return cli_nt_error(cli);
+        return status;
 }
 
@@ -289 +291 @@
                              const char *format,
                              int op, int level,
-                             char *param, char *data,
-                             int param_len, int *data_len,
-                             unsigned int *rparam_len, unsigned int *rdata_len)
+                             uint8_t *param, uint8_t *data,
+                             int param_len, uint32_t *data_len,
+                             uint32_t *rparam_len, uint32_t *rdata_len)
 {
         NTSTATUS ret=NT_STATUS_OK;
@@ -324 +326 @@
                         int fnum, int dnum, const char *fname)
 {
-        int data_len = 0;
-        int param_len = 0;
-        unsigned int rparam_len, rdata_len;
-        char param[PARAM_SIZE], data[DATA_SIZE];
+        uint32_t data_len = 0;
+        uint32_t param_len = 0;
+        uint32_t rparam_len, rdata_len;
+        uint8_t param[PARAM_SIZE], data[DATA_SIZE];
         NTSTATUS status;
 
@@ -379 +381 @@
         status = try_nttrans_len(cli, "newfile", op, level, param, data, param_len, &data_len, 
                                 &rparam_len, &rdata_len);
-        cli_unlink(cli, "\\newfile.dat", aSYSTEM | aHIDDEN);
+        cli_unlink(cli, "\\newfile.dat", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_rmdir(cli, "\\newfile.dat");
         if (NT_STATUS_IS_OK(status)) return True;

trunk/server/source3/torture/smbiconv.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "popt_common.h"
 #undef realloc
 
@@ -201 +203 @@
         /* the following functions are part of the Samba debugging
            facilities.  See lib/debug.c */
-        setup_logging("smbiconv", True);
+        setup_logging("smbiconv", DEBUG_STDOUT);
 
         if (preload_modules[0]) smb_load_modules(preload_modules);

trunk/server/source3/torture/t_stringoverflow.c

@@ -3 +3 @@
  int main(void)
 {
-        fstring dest;
+        char dest[100];
         char *ptr = dest;
 
@@ -18 +18 @@
 #endif /* 0 */
 
-        pstrcpy(ptr, "hello!");
+        fstrcpy(ptr, "hello!");
 
         return 0;

trunk/server/source3/torture/torture.c

@@ -20 +20 @@
 
 #include "includes.h"
-#include "nsswitch/libwbclient/wbc_async.h"
+#include "system/shmem.h"
+#include "wbc_async.h"
+#include "torture/proto.h"
+#include "libcli/security/security.h"
+#include "tldap.h"
+#include "tldap_util.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "memcache.h"
+#include "nsswitch/winbind_client.h"
+#include "dbwrap.h"
+#include "talloc_dict.h"
+#include "async_smb.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
+#include "trans2.h"
+#include "libsmb/nmblib.h"
+#include "../lib/util/tevent_ntstatus.h"
+#include "util_tdb.h"
 
 extern char *optarg;
@@ -43 +60 @@
 static bool do_encrypt;
 static const char *local_path = NULL;
+static int signing_state = Undefined;
 
 bool torture_showall = False;
 
 static double create_procs(bool (*fn)(int), bool *result);
-
-
-static struct timeval tp1,tp2;
-
-
-void start_timer(void)
-{
-        GetTimeOfDay(&tp1);
-}
-
-double end_timer(void)
-{
-        GetTimeOfDay(&tp2);
-        return((tp2.tv_sec - tp1.tv_sec) + 
-               (tp2.tv_usec - tp1.tv_usec)*1.0e-6);
-}
 
 
@@ -185 +187 @@
         zero_sockaddr(&ss);
 
-        if (!(c = cli_initialise())) {
+        if (!(c = cli_initialise_ex(signing_state))) {
                 printf("Failed initialize cli_struct to connect with %s\n", host);
                 return NULL;
@@ -228 +230 @@
 }
 
+/****************************************************************************
+ Send a corrupt session request. See rfc1002.txt 4.3 and 4.3.2.
+****************************************************************************/
+
+static bool cli_bad_session_request(struct cli_state *cli,
+                         struct nmb_name *calling, struct nmb_name *called)
+{
+        char *p;
+        int len = 4;
+        int namelen = 0;
+        char *tmp;
+
+        memcpy(&(cli->calling), calling, sizeof(*calling));
+        memcpy(&(cli->called ), called , sizeof(*called ));
+
+        /* put in the destination name */
+
+        tmp = name_mangle(talloc_tos(), cli->called.name,
+                          cli->called.name_type);
+        if (tmp == NULL) {
+                return false;
+        }
+
+        p = cli->outbuf+len;
+        namelen = name_len((unsigned char *)tmp, talloc_get_size(tmp));
+        if (namelen > 0) {
+                memcpy(p, tmp, namelen);
+                len += namelen;
+        }
+        TALLOC_FREE(tmp);
+
+        /* Deliberately corrupt the name len (first byte) */
+        *p = 100;
+
+        /* and my name */
+
+        tmp = name_mangle(talloc_tos(), cli->calling.name,
+                          cli->calling.name_type);
+        if (tmp == NULL) {
+                return false;
+        }
+
+        p = cli->outbuf+len;
+        namelen = name_len((unsigned char *)tmp, talloc_get_size(tmp));
+        if (namelen > 0) {
+                memcpy(p, tmp, namelen);
+                len += namelen;
+        }
+        TALLOC_FREE(tmp);
+        /* Deliberately corrupt the name len (first byte) */
+        *p = 100;
+
+        /* send a session request (RFC 1002) */
+        /* setup the packet length
+         * Remove four bytes from the length count, since the length
+         * field in the NBT Session Service header counts the number
+         * of bytes which follow.  The cli_send_smb() function knows
+         * about this and accounts for those four bytes.
+         * CRH.
+         */
+        len -= 4;
+        _smb_setlen(cli->outbuf,len);
+        SCVAL(cli->outbuf,0,0x81);
+
+        cli_send_smb(cli);
+        DEBUG(5,("Sent session request\n"));
+
+        if (!cli_receive_smb(cli))
+                return False;
+
+        if (CVAL(cli->inbuf,0) != 0x82) {
+                /* This is the wrong place to put the error... JRA. */
+                cli->rap_error = CVAL(cli->inbuf,4);
+                return False;
+        }
+        return(True);
+}
+
+static struct cli_state *open_bad_nbt_connection(void)
+{
+        struct nmb_name called, calling;
+        struct sockaddr_storage ss;
+        struct cli_state *c;
+        NTSTATUS status;
+
+        make_nmb_name(&calling, myname, 0x0);
+        make_nmb_name(&called , host, 0x20);
+
+        zero_sockaddr(&ss);
+
+        if (!(c = cli_initialise_ex(signing_state))) {
+                printf("Failed initialize cli_struct to connect with %s\n", host);
+                return NULL;
+        }
+
+        c->port = 139;
+
+        status = cli_connect(c, host, &ss);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("Failed to connect with %s. Error %s\n", host, nt_errstr(status) );
+                return NULL;
+        }
+
+        c->timeout = 4000; /* set a short timeout (4 seconds) */
+
+        if (!cli_bad_session_request(c, &calling, &called)) {
+                printf("Failed to connect with %s. Error %s\n", host, nt_errstr(status) );
+                return NULL;
+        }
+
+        return c;
+}
+
+
 /* Insert a NULL at the first separator of the given path and return a pointer
  * to the remainder of the string.
@@ -290 +406 @@
                                    const char *sharename)
 {
-        bool retry;
         int flags = 0;
         NTSTATUS status;
@@ -305 +420 @@
                                      sharename, "?????", 
                                      username, workgroup, 
-                                     password, flags, Undefined, &retry);
+                                     password, flags, signing_state);
         if (!NT_STATUS_IS_OK(status)) {
                 printf("failed to open share connection: //%s/%s port:%d - %s\n",
@@ -380 +495 @@
 {
         bool ret = True;
-        if (!cli_tdis(c)) {
-                printf("tdis failed (%s)\n", cli_errstr(c));
+        NTSTATUS status;
+
+        status = cli_tdis(c);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("tdis failed (%s)\n", nt_errstr(status));
                 ret = False;
         }
@@ -464 +582 @@
         for (i=0;i<torture_numops;i++) {
                 unsigned n = (unsigned)sys_random()%10;
+
                 if (i % 10 == 0) {
                         printf("%d\r", i); fflush(stdout);
@@ -479 +598 @@
                 }
 
-                if (cli_write(c, fnum, 0, (char *)&pid, 0, sizeof(pid)) != sizeof(pid)) {
-                        printf("write failed (%s)\n", cli_errstr(c));
+                status = cli_writeall(c, fnum, 0, (uint8_t *)&pid, 0,
+                                      sizeof(pid), NULL);
+                if (!NT_STATUS_IS_OK(status)) {
+                        printf("write failed (%s)\n", nt_errstr(status));
                         correct = False;
                 }
 
                 for (j=0;j<50;j++) {
-                        if (cli_write(c, fnum, 0, (char *)buf, 
-                                      sizeof(pid)+(j*sizeof(buf)), 
-                                      sizeof(buf)) != sizeof(buf)) {
-                                printf("write failed (%s)\n", cli_errstr(c));
+                        status = cli_writeall(c, fnum, 0, (uint8_t *)buf,
+                                              sizeof(pid)+(j*sizeof(buf)),
+                                              sizeof(buf), NULL);
+                        if (!NT_STATUS_IS_OK(status)) {
+                                printf("write failed (%s)\n",
+                                       nt_errstr(status));
                                 correct = False;
                         }
@@ -510 +633 @@
                 }
 
-                if (!NT_STATUS_IS_OK(cli_unlink(c, fname, aSYSTEM | aHIDDEN))) {
+                if (!NT_STATUS_IS_OK(cli_unlink(c, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                         printf("unlink failed (%s)\n", cli_errstr(c));
                         correct = False;
@@ -522 +645 @@
 
         cli_close(c, fnum2);
-        cli_unlink(c, lockfname, aSYSTEM | aHIDDEN);
+        cli_unlink(c, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         printf("%d\n", i);
@@ -557 +680 @@
         ssize_t sent = 0;
         bool correct = True;
-        NTSTATUS status;
+        NTSTATUS status = NT_STATUS_OK;
 
         srandom(1);
@@ -567 +690 @@
         if (procnum == 0)
         {
+                if (!NT_STATUS_IS_OK(cli_unlink(c, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
+                        printf("unlink failed (%s) (normal, this file should not exist)\n", cli_errstr(c));
+                }
+
                 if (!NT_STATUS_IS_OK(cli_open(c, lockfname, O_RDWR | O_CREAT | O_EXCL, 
                                  DENY_NONE, &fnum))) {
@@ -610 +737 @@
                         }
 
-                        if (cli_write(c, fnum, 0, buf+count, count, (size_t)sent) != sent) {
-                                printf("write failed (%s)\n", cli_errstr(c));
+                        status = cli_writeall(c, fnum, 0, (uint8_t *)buf+count,
+                                              count, (size_t)sent, NULL);
+                        if (!NT_STATUS_IS_OK(status)) {
+                                printf("write failed (%s)\n",
+                                       nt_errstr(status));
                                 correct = False;
                         }
@@ -660 +790 @@
         ssize_t bytes_read;
 
-        if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, aSYSTEM | aHIDDEN))) {
+        if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                 printf("unlink failed (%s) (normal, this file should not exist)\n", cli_errstr(c1));
         }
@@ -680 +810 @@
         for (i=0;i<torture_numops;i++)
         {
+                NTSTATUS status;
                 size_t buf_size = ((unsigned)sys_random()%(sizeof(buf)-1))+ 1;
                 if (i % 10 == 0) {
@@ -687 +818 @@
                 generate_random_buffer((unsigned char *)buf, buf_size);
 
-                if (cli_write(c1, fnum1, 0, buf, 0, buf_size) != buf_size) {
-                        printf("write failed (%s)\n", cli_errstr(c1));
+                status = cli_writeall(c1, fnum1, 0, (uint8_t *)buf, 0,
+                                      buf_size, NULL);
+                if (!NT_STATUS_IS_OK(status)) {
+                        printf("write failed (%s)\n", nt_errstr(status));
                         correct = False;
                         break;
@@ -718 +851 @@
         }
 
-        if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, aSYSTEM | aHIDDEN))) {
+        if (!NT_STATUS_IS_OK(cli_unlink(c1, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                 printf("unlink failed (%s)\n", cli_errstr(c1));
                 correct = False;
@@ -777 +910 @@
 }
 
-static bool run_readwritelarge(int dummy)
+static bool run_readwritelarge_internal(int max_xmit_k)
 {
         static struct cli_state *cli1;
@@ -792 +925 @@
         memset(buf,'\0',sizeof(buf));
 
-        cli1->max_xmit = 128*1024;
-
-        printf("starting readwritelarge\n");
-
-        cli_unlink(cli1, lockfname, aSYSTEM | aHIDDEN);
+        cli1->max_xmit = max_xmit_k*1024;
+
+        if (signing_state == Required) {
+                /* Horrible cheat to force
+                   multiple signed outstanding
+                   packets against a Samba server.
+                */
+                cli1->is_samba = false;
+        }
+
+        printf("starting readwritelarge_internal\n");
+
+        cli_unlink(cli1, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_open(cli1, lockfname, O_RDWR | O_CREAT | O_EXCL, DENY_NONE, &fnum1))) {
@@ -803 +944 @@
         }
 
-        cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf));
-
-        if (!cli_qfileinfo(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+        cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 0, sizeof(buf), NULL);
+
+        if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
+                                     cli1, fnum1, NULL, &fsize, NULL, NULL,
+                                     NULL, NULL, NULL))) {
                 printf("qfileinfo failed (%s)\n", cli_errstr(cli1));
                 correct = False;
@@ -811 +954 @@
 
         if (fsize == sizeof(buf))
-                printf("readwritelarge test 1 succeeded (size = %lx)\n", 
+                printf("readwritelarge_internal test 1 succeeded (size = %lx)\n",
                        (unsigned long)fsize);
         else {
-                printf("readwritelarge test 1 failed (size = %lx)\n", 
+                printf("readwritelarge_internal test 1 failed (size = %lx)\n",
                        (unsigned long)fsize);
                 correct = False;
@@ -824 +967 @@
         }
 
-        if (!NT_STATUS_IS_OK(cli_unlink(cli1, lockfname, aSYSTEM | aHIDDEN))) {
+        if (!NT_STATUS_IS_OK(cli_unlink(cli1, lockfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                 printf("unlink failed (%s)\n", cli_errstr(cli1));
                 correct = False;
@@ -836 +979 @@
         cli1->max_xmit = 4*1024;
 
-        cli_smbwrite(cli1, fnum1, buf, 0, sizeof(buf));
-
-        if (!cli_qfileinfo(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+        cli_smbwrite(cli1, fnum1, buf, 0, sizeof(buf), NULL);
+
+        if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
+                                     cli1, fnum1, NULL, &fsize, NULL, NULL,
+                                     NULL, NULL, NULL))) {
                 printf("qfileinfo failed (%s)\n", cli_errstr(cli1));
                 correct = False;
@@ -844 +989 @@
 
         if (fsize == sizeof(buf))
-                printf("readwritelarge test 2 succeeded (size = %lx)\n", 
+                printf("readwritelarge_internal test 2 succeeded (size = %lx)\n",
                        (unsigned long)fsize);
         else {
-                printf("readwritelarge test 2 failed (size = %lx)\n", 
+                printf("readwritelarge_internal test 2 failed (size = %lx)\n",
                        (unsigned long)fsize);
                 correct = False;
@@ -858 +1003 @@
                 return False;
         }
-        if (!cli_qfileinfo(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL, NULL, NULL)) {
+        if (!cli_qfileinfo_basic(cli1, fnum1, NULL, &fsize, NULL, NULL, NULL,
+                                 NULL, NULL)) {
                 printf("qfileinfo failed (%s)\n", cli_errstr(cli1));
                 correct = False;
@@ -875 +1021 @@
         }
         return correct;
+}
+
+static bool run_readwritelarge(int dummy)
+{
+        return run_readwritelarge_internal(128);
+}
+
+static bool run_readwritelarge_signtest(int dummy)
+{
+        bool ret;
+        signing_state = Required;
+        ret = run_readwritelarge_internal(2);
+        signing_state = Undefined;
+        return ret;
 }
 
@@ -1024 +1184 @@
         printf("starting locktest1\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) {
@@ -1096 +1256 @@
         }
 
-        if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | aHIDDEN))) {
+        if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                 printf("unlink failed (%s)\n", cli_errstr(cli1));
                 return False;
@@ -1138 +1298 @@
         printf("starting tcontest\n");
 
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) {
@@ -1148 +1308 @@
         vuid1 = cli->vuid;
 
-        if (cli_write(cli, fnum1, 0, buf, 130, 4) != 4) {
-                printf("initial write failed (%s)", cli_errstr(cli));
+        status = cli_writeall(cli, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("initial write failed (%s)", nt_errstr(status));
                 return False;
         }
@@ -1169 +1330 @@
         cli->cnum = cnum2;
 
-        if (cli_write(cli, fnum1, 0, buf, 130, 4) == 4) {
+        status = cli_writeall(cli, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+        if (NT_STATUS_IS_OK(status)) {
                 printf("* server allows write with wrong TID\n");
                 ret = False;
         } else {
-                printf("server fails write with wrong TID : %s\n", cli_errstr(cli));
+                printf("server fails write with wrong TID : %s\n",
+                       nt_errstr(status));
         }
 
@@ -1180 +1343 @@
         cli->cnum = cnum3;
 
-        if (cli_write(cli, fnum1, 0, buf, 130, 4) == 4) {
+        status = cli_writeall(cli, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+        if (NT_STATUS_IS_OK(status)) {
                 printf("* server allows write with invalid TID\n");
                 ret = False;
         } else {
-                printf("server fails write with invalid TID : %s\n", cli_errstr(cli));
+                printf("server fails write with invalid TID : %s\n",
+                       nt_errstr(status));
         }
 
@@ -1191 +1356 @@
         cli->cnum = cnum1;
 
-        if (cli_write(cli, fnum1, 0, buf, 130, 4) == 4) {
+        status = cli_writeall(cli, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+        if (NT_STATUS_IS_OK(status)) {
                 printf("* server allows write with invalid VUID\n");
                 ret = False;
         } else {
-                printf("server fails write with invalid VUID : %s\n", cli_errstr(cli));
+                printf("server fails write with invalid VUID : %s\n",
+                       nt_errstr(status));
         }
 
@@ -1208 +1375 @@
         cli->cnum = cnum2;
 
-        if (!cli_tdis(cli)) {
-                printf("secondary tdis failed (%s)\n", cli_errstr(cli));
+        status = cli_tdis(cli);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("secondary tdis failed (%s)\n", nt_errstr(status));
                 return False;
         }
@@ -1246 +1414 @@
         status = cli_raw_tcon(cli, service, password, "?????", &max_xmit, &cnum);
 
+        SAFE_FREE(service);
+
         if (!NT_STATUS_IS_OK(status)) {
-                printf("tcon2 failed : %s\n", cli_errstr(cli));
+                printf("tcon2 failed : %s\n", nt_errstr(status));
         } else {
-                printf("tcon OK : max_xmit=%d cnum=%d tid=%d\n", 
-                       (int)max_xmit, (int)cnum, SVAL(cli->inbuf, smb_tid));
+                printf("tcon OK : max_xmit=%d cnum=%d\n",
+                       (int)max_xmit, (int)cnum);
         }
 
@@ -1315 +1485 @@
 {
         static struct cli_state *cli1 = NULL;
-        bool retry;
         int flags = 0;
         NTSTATUS status;
@@ -1324 +1493 @@
                                      NULL, NULL,
                                      username, workgroup,
-                                     password, flags, Undefined, &retry);
+                                     password, flags, signing_state);
 
         if (!NT_STATUS_IS_OK(status)) {
@@ -1396 +1565 @@
         printf("starting locktest2\n");
 
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         cli_setpid(cli, 1);
@@ -1533 +1702 @@
         printf("starting locktest3\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) {
@@ -1613 +1782 @@
         }
 
-        if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | aHIDDEN))) {
+        if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                 printf("unlink failed (%s)\n", cli_errstr(cli1));
                 return False;
@@ -1646 +1815 @@
         char buf[1000];
         bool correct = True;
+        NTSTATUS status;
 
         if (!torture_open_connection(&cli1, 0) || !torture_open_connection(&cli2, 1)) {
@@ -1656 +1826 @@
         printf("starting locktest4\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
@@ -1663 +1833 @@
         memset(buf, 0, sizeof(buf));
 
-        if (cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
-                printf("Failed to create file\n");
+        status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 0, sizeof(buf),
+                              NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("Failed to create file: %s\n", nt_errstr(status));
                 correct = False;
                 goto fail;
@@ -1736 +1908 @@
         printf("this server %s strict write locking\n", ret?"doesn't do":"does");
 
-        ret = cli_lock(cli1, fnum1, 130, 4, 0, READ_LOCK) &&
-              (cli_write(cli2, fnum2, 0, buf, 130, 4) == 4);
+        ret = cli_lock(cli1, fnum1, 130, 4, 0, READ_LOCK);
+        if (ret) {
+                status = cli_writeall(cli2, fnum2, 0, (uint8_t *)buf, 130, 4,
+                                      NULL);
+                ret = NT_STATUS_IS_OK(status);
+        }
         EXPECTED(ret, False);
         printf("this server %s strict read locking\n", ret?"doesn't do":"does");
@@ -1754 +1930 @@
               NT_STATUS_IS_OK(cli_unlock(cli1, fnum1, 150, 4)) &&
               (cli_read(cli2, fnum2, buf, 150, 4) == 4) &&
-              !(cli_write(cli2, fnum2, 0, buf, 150, 4) == 4) &&
+              !(NT_STATUS_IS_OK(cli_writeall(cli2, fnum2, 0, (uint8_t *)buf,
+                                             150, 4, NULL))) &&
               NT_STATUS_IS_OK(cli_unlock(cli1, fnum1, 150, 4));
         EXPECTED(ret, True);
@@ -1761 +1938 @@
         ret = cli_lock(cli1, fnum1, 160, 4, 0, READ_LOCK) &&
               NT_STATUS_IS_OK(cli_unlock(cli1, fnum1, 160, 4)) &&
-              (cli_write(cli2, fnum2, 0, buf, 160, 4) == 4) &&          
+              NT_STATUS_IS_OK(cli_writeall(cli2, fnum2, 0, (uint8_t *)buf,
+                                           160, 4, NULL)) &&
               (cli_read(cli2, fnum2, buf, 160, 4) == 4);                
         EXPECTED(ret, True);
@@ -1768 +1946 @@
         ret = cli_lock(cli1, fnum1, 170, 4, 0, WRITE_LOCK) &&
               NT_STATUS_IS_OK(cli_unlock(cli1, fnum1, 170, 4)) &&
-              (cli_write(cli2, fnum2, 0, buf, 170, 4) == 4) &&          
+              NT_STATUS_IS_OK(cli_writeall(cli2, fnum2, 0, (uint8_t *)buf,
+                                           170, 4, NULL)) &&
               (cli_read(cli2, fnum2, buf, 170, 4) == 4);                
         EXPECTED(ret, True);
@@ -1776 +1955 @@
               cli_lock(cli1, fnum1, 190, 4, 0, READ_LOCK) &&
               NT_STATUS_IS_OK(cli_unlock(cli1, fnum1, 190, 4)) &&
-              !(cli_write(cli2, fnum2, 0, buf, 190, 4) == 4) &&         
+              !NT_STATUS_IS_OK(cli_writeall(cli2, fnum2, 0, (uint8_t *)buf,
+                                            190, 4, NULL)) &&
               (cli_read(cli2, fnum2, buf, 190, 4) == 4);                
         EXPECTED(ret, True);
@@ -1798 +1978 @@
         cli_close(cli1, fnum1);
         cli_close(cli2, fnum2);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         torture_close_connection(cli1);
         torture_close_connection(cli2);
@@ -1817 +1997 @@
         char buf[1000];
         bool correct = True;
+        NTSTATUS status;
 
         if (!torture_open_connection(&cli1, 0) || !torture_open_connection(&cli2, 1)) {
@@ -1827 +2008 @@
         printf("starting locktest5\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
@@ -1835 +2016 @@
         memset(buf, 0, sizeof(buf));
 
-        if (cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
-                printf("Failed to create file\n");
+        status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 0, sizeof(buf),
+                              NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("Failed to create file: %s\n", nt_errstr(status));
                 correct = False;
                 goto fail;
@@ -1917 +2100 @@
         cli_close(cli1, fnum1);
         cli_close(cli2, fnum2);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         if (!torture_close_connection(cli1)) {
                 correct = False;
@@ -1952 +2135 @@
                 printf("Testing %s\n", fname[i]);
 
-                cli_unlink(cli, fname[i], aSYSTEM | aHIDDEN);
+                cli_unlink(cli, fname[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
                 cli_open(cli, fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum);
@@ -1964 +2147 @@
                 printf("CANCEL_LOCK gave %s\n", nt_errstr(status));
 
-                cli_unlink(cli, fname[i], aSYSTEM | aHIDDEN);
+                cli_unlink(cli, fname[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         }
 
@@ -1980 +2163 @@
         char buf[200];
         bool correct = False;
+        NTSTATUS status;
 
         if (!torture_open_connection(&cli1, 0)) {
@@ -1989 +2173 @@
         printf("starting locktest7\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1);
@@ -1995 +2179 @@
         memset(buf, 0, sizeof(buf));
 
-        if (cli_write(cli1, fnum1, 0, buf, 0, sizeof(buf)) != sizeof(buf)) {
-                printf("Failed to create file\n");
+        status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 0, sizeof(buf),
+                              NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("Failed to create file: %s\n", nt_errstr(status));
                 goto fail;
         }
@@ -2016 +2202 @@
         }
 
-        if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
-                printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
-                if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+        status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("pid1 unable to write to the range 130:4, error was "
+                       "%s\n", nt_errstr(status));
+                if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_LOCK_CONFLICT)) {
                         printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
                         goto fail;
@@ -2035 +2223 @@
         }
 
-        if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
-                printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
-                if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+        status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("pid2 unable to write to the range 130:4, error was "
+                       "%s\n", nt_errstr(status));
+                if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_LOCK_CONFLICT)) {
                         printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
                         goto fail;
@@ -2063 +2253 @@
         }
 
-        if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
-                printf("pid1 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
+        status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("pid1 unable to write to the range 130:4, error was "
+                       "%s\n", nt_errstr(status));
                 goto fail;
         } else {
@@ -2083 +2275 @@
         }
 
-        if (cli_write(cli1, fnum1, 0, buf, 130, 4) != 4) {
-                printf("pid2 unable to write to the range 130:4, error was %s\n", cli_errstr(cli1));
-                if (NT_STATUS_V(cli_nt_error(cli1)) != NT_STATUS_V(NT_STATUS_FILE_LOCK_CONFLICT)) {
+        status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 130, 4, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("pid2 unable to write to the range 130:4, error was "
+                       "%s\n", nt_errstr(status));
+                if (!NT_STATUS_EQUAL(status, NT_STATUS_FILE_LOCK_CONFLICT)) {
                         printf("Incorrect error (should be NT_STATUS_FILE_LOCK_CONFLICT)\n");
                         goto fail;
@@ -2099 +2293 @@
 fail:
         cli_close(cli1, fnum1);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         torture_close_connection(cli1);
 
@@ -2131 +2325 @@
         printf("starting locktest8\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         status = cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_WRITE,
@@ -2173 +2367 @@
         cli_close(cli1, fnum1);
         cli_close(cli1, fnum2);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         torture_close_connection(cli1);
 
@@ -2278 +2472 @@
         char c = '\0';
         int ret;
+        struct timeval start;
         double seconds;
         NTSTATUS status;
@@ -2350 +2545 @@
         alarm(20);
 
-        start_timer();
+        start = timeval_current();
 
         if (!cli_lock(cli1, fnum, 0, 4, -1, WRITE_LOCK)) {
@@ -2359 +2554 @@
         alarm(0);
 
-        seconds = end_timer();
+        seconds = timeval_elapsed(&start);
 
         printf("Parent got the lock after %.2f seconds.\n",
@@ -2392 +2587 @@
         uint16_t fnum1;
         char buf[1024];
+        NTSTATUS status;
 
         if (!torture_open_connection(&cli1, 0) || !torture_open_connection(&cli2, 1)) {
@@ -2401 +2597 @@
         printf("starting fdpasstest\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) {
@@ -2408 +2604 @@
         }
 
-        if (cli_write(cli1, fnum1, 0, "hello world\n", 0, 13) != 13) {
-                printf("write failed (%s)\n", cli_errstr(cli1));
+        status = cli_writeall(cli1, fnum1, 0, (uint8_t *)"hello world\n", 0,
+                              13, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("write failed (%s)\n", nt_errstr(status));
                 return False;
         }
@@ -2424 +2622 @@
 
         cli_close(cli1, fnum1);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         torture_close_connection(cli1);
@@ -2446 +2644 @@
         char buf[1024];
         bool ret = True;
+        NTSTATUS status;
 
         if (!torture_open_connection(&cli, 0))
@@ -2462 +2661 @@
         printf("starting fdsesstest\n");
 
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
-        cli_unlink(cli, fname1, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+        cli_unlink(cli, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) {
@@ -2470 +2669 @@
         }
 
-        if (cli_write(cli, fnum1, 0, "hello world\n", 0, 13) != 13) {
-                printf("write failed (%s)\n", cli_errstr(cli));
+        status = cli_writeall(cli, fnum1, 0, (uint8_t *)"hello world\n", 0, 13,
+                              NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("write failed (%s)\n", nt_errstr(status));
                 return False;
         }
@@ -2487 +2688 @@
                 printf("create with different vuid, same cnum succeeded.\n");
                 cli_close(cli, fnum2);
-                cli_unlink(cli, fname1, aSYSTEM | aHIDDEN);
+                cli_unlink(cli, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         } else {
                 printf("create with different vuid, same cnum failed.\n");
@@ -2507 +2708 @@
         cli->cnum = saved_cnum;
         cli_close(cli, fnum1);
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         torture_close_connection(cli);
@@ -2535 +2736 @@
         printf("starting unlink test\n");
 
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         cli_setpid(cli, 1);
@@ -2544 +2745 @@
         }
 
-        if (NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | aHIDDEN))) {
+        if (NT_STATUS_IS_OK(cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                 printf("error: server allowed unlink on an open file\n");
                 correct = False;
@@ -2553 +2754 @@
 
         cli_close(cli, fnum);
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!torture_close_connection(cli)) {
@@ -2605 +2806 @@
                 slprintf(fname,sizeof(fname)-1,ftemplate, i,(int)getpid());
                 cli_close(cli, fnums[i]);
-                if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | aHIDDEN))) {
+                if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                         printf("unlink of %s failed (%s)\n", 
                                fname, cli_errstr(cli));
@@ -2633 +2834 @@
 static bool run_negprot_nowait(int dummy)
 {
+        struct tevent_context *ev;
         int i;
+        struct cli_state *cli;
+        bool correct = True;
+
+        printf("starting negprot nowait test\n");
+
+        ev = tevent_context_init(talloc_tos());
+        if (ev == NULL) {
+                return false;
+        }
+
+        if (!(cli = open_nbt_connection())) {
+                TALLOC_FREE(ev);
+                return False;
+        }
+
+        for (i=0;i<50000;i++) {
+                struct tevent_req *req;
+
+                req = cli_negprot_send(ev, ev, cli);
+                if (req == NULL) {
+                        TALLOC_FREE(ev);
+                        return false;
+                }
+                if (!tevent_req_poll(req, ev)) {
+                        d_fprintf(stderr, "tevent_req_poll failed: %s\n",
+                                  strerror(errno));
+                        TALLOC_FREE(ev);
+                        return false;
+                }
+                TALLOC_FREE(req);
+        }
+
+        if (torture_close_connection(cli)) {
+                correct = False;
+        }
+
+        printf("finished negprot nowait test\n");
+
+        return correct;
+}
+
+/* send smb negprot commands, not reading the response */
+static bool run_bad_nbt_session(int dummy)
+{
         static struct cli_state *cli;
-        bool correct = True;
-
-        printf("starting negprot nowait test\n");
-
-        if (!(cli = open_nbt_connection())) {
-                return False;
-        }
-
-        for (i=0;i<50000;i++) {
-                cli_negprot_sendsync(cli);
-        }
-
-        if (!torture_close_connection(cli)) {
-                correct = False;
-        }
-
-        printf("finished negprot nowait test\n");
-
-        return correct;
-}
-
+
+        printf("starting bad nbt session test\n");
+
+        if (!(cli = open_bad_nbt_connection())) {
+                return False;
+        }
+
+        cli_shutdown(cli);
+        printf("finished bad nbt session test\n");
+        return true;
+}
 
 /* send random IPC commands */
@@ -2766 +3002 @@
         }
 
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_open(cli, fname, 
                         O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum);
@@ -2801 +3037 @@
         }
 
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!torture_close_connection(cli)) {
@@ -2828 +3064 @@
         char pname[1024];
         bool correct = True;
+        NTSTATUS status;
+        uint32_t fs_attr;
 
         printf("starting trans2 test\n");
@@ -2835 +3073 @@
         }
 
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+        status = cli_get_fs_attr_info(cli, &fs_attr);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("ERROR: cli_get_fs_attr_info returned %s\n",
+                       nt_errstr(status));
+                correct = false;
+        }
+
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_open(cli, fname, 
                         O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum);
-        if (!cli_qfileinfo(cli, fnum, NULL, &size, &c_time_ts, &a_time_ts, &w_time_ts,
-                           &m_time_ts, NULL)) {
+        if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
+                                     cli, fnum, NULL, &size, &c_time_ts,
+                                     &a_time_ts, &w_time_ts,
+                                     &m_time_ts, NULL))) {
                 printf("ERROR: qfileinfo failed (%s)\n", cli_errstr(cli));
                 correct = False;
         }
 
-        if (!cli_qfilename(cli, fnum, pname, sizeof(pname))) {
+        if (!NT_STATUS_IS_OK(cli_qfilename(cli, fnum, pname, sizeof(pname)))) {
                 printf("ERROR: qfilename failed (%s)\n", cli_errstr(cli));
                 correct = False;
@@ -2859 +3106 @@
         sleep(2);
 
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         if (!NT_STATUS_IS_OK(cli_open(cli, fname, 
                         O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum))) {
@@ -2867 +3114 @@
         cli_close(cli, fnum);
 
-        if (!cli_qpathinfo(cli, fname, &c_time, &a_time, &m_time, &size, NULL)) {
-                printf("ERROR: qpathinfo failed (%s)\n", cli_errstr(cli));
+        status = cli_qpathinfo1(cli, fname, &c_time, &a_time, &m_time, &size,
+                                NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("ERROR: qpathinfo failed (%s)\n", nt_errstr(status));
                 correct = False;
         } else {
@@ -2889 +3138 @@
 
 
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_open(cli, fname, 
                         O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum);
         cli_close(cli, fnum);
-        if (!cli_qpathinfo2(cli, fname, &c_time_ts, &a_time_ts, &w_time_ts, 
-                            &m_time_ts, &size, NULL, NULL)) {
-                printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli));
+        status = cli_qpathinfo2(cli, fname, &c_time_ts, &a_time_ts, &w_time_ts,
+                                &m_time_ts, &size, NULL, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("ERROR: qpathinfo2 failed (%s)\n", nt_errstr(status));
                 correct = False;
         } else {
@@ -2905 +3155 @@
         }
 
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
 
@@ -2915 +3165 @@
         }
         sleep(3);
-        if (!cli_qpathinfo2(cli, "\\trans2\\", &c_time_ts, &a_time_ts, &w_time_ts, 
-                            &m_time_ts, &size, NULL, NULL)) {
-                printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli));
+        status = cli_qpathinfo2(cli, "\\trans2\\", &c_time_ts, &a_time_ts,
+                                &w_time_ts, &m_time_ts, &size, NULL, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("ERROR: qpathinfo2 failed (%s)\n", nt_errstr(status));
                 correct = False;
         }
@@ -2923 +3174 @@
         cli_open(cli, fname2, 
                         O_RDWR | O_CREAT | O_TRUNC, DENY_NONE, &fnum);
-        cli_write(cli, fnum,  0, (char *)&fnum, 0, sizeof(fnum));
+        cli_writeall(cli, fnum,  0, (uint8_t *)&fnum, 0, sizeof(fnum), NULL);
         cli_close(cli, fnum);
-        if (!cli_qpathinfo2(cli, "\\trans2\\", &c_time_ts, &a_time_ts, &w_time_ts, 
-                            &m_time2_ts, &size, NULL, NULL)) {
-                printf("ERROR: qpathinfo2 failed (%s)\n", cli_errstr(cli));
+        status = cli_qpathinfo2(cli, "\\trans2\\", &c_time_ts, &a_time_ts,
+                                &w_time_ts, &m_time2_ts, &size, NULL, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("ERROR: qpathinfo2 failed (%s)\n", nt_errstr(status));
                 correct = False;
         } else {
@@ -2936 +3188 @@
                 }
         }
-        cli_unlink(cli, fname2, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname2, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_rmdir(cli, dname);
 
@@ -2952 +3204 @@
 */
 
-static bool new_trans(struct cli_state *pcli, int fnum, int level)
-{
-        char *buf = NULL;
+static NTSTATUS new_trans(struct cli_state *pcli, int fnum, int level)
+{
+        uint8_t *buf = NULL;
         uint32 len;
-        bool correct = True;
-
-        if (!cli_qfileinfo_test(pcli, fnum, level, &buf, &len)) {
-                printf("ERROR: qfileinfo (%d) failed (%s)\n", level, cli_errstr(pcli));
-                correct = False;
+        NTSTATUS status;
+
+        status = cli_qfileinfo(talloc_tos(), pcli, fnum, level, 0,
+                               pcli->max_xmit, &buf, &len);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("ERROR: qfileinfo (%d) failed (%s)\n", level,
+                       nt_errstr(status));
         } else {
                 printf("qfileinfo: level %d, len = %u\n", level, len);
@@ -2966 +3220 @@
                 printf("\n");
         }
-        SAFE_FREE(buf);
-        return correct;
+        TALLOC_FREE(buf);
+        return status;
 }
 
@@ -3019 +3273 @@
         }
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         cli_sockopt(cli1, sockops);
@@ -3032 +3286 @@
         cli1->use_oplocks = False;
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
@@ -3040 +3294 @@
         }
 
-        if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | aHIDDEN))) {
+        if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                 printf("unlink failed (%s)\n", cli_errstr(cli1));
                 return False;
@@ -3090 +3344 @@
         cli2->use_level_II_oplocks = True;
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         cli_sockopt(cli1, sockops);
@@ -3155 +3409 @@
         cli_read(cli1, fnum1, buf, 0, 4);
 
-#if 0
-        if (cli_write(cli1, fnum1, 0, buf, 0, 4) != 4) {
-                printf("write on fnum1 failed (%s)\n", cli_errstr(cli1));
-                correct = False;
-        }
-#endif
-
         if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
                 printf("close1 failed (%s)\n", cli_errstr(cli1));
@@ -3169 +3416 @@
         sleep(4);
 
-        if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, aSYSTEM | aHIDDEN))) {
+        if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                 printf("unlink failed (%s)\n", cli_errstr(cli1));
                 correct = False;
@@ -3220 +3467 @@
                 /* try to trigger a oplock break in parent */
                 cli_open(cli, fname, O_RDWR, DENY_NONE, &fnum);
-                cli_write(cli, fnum, 0, buf, 0, 4);
+                cli_writeall(cli, fnum, 0, (uint8_t *)buf, 0, 4, NULL);
                 exit(0);
         }
@@ -3232 +3479 @@
         cli_oplock_handler(cli, oplock3_handler);
         cli_open(cli, fname, O_RDWR|O_CREAT, DENY_NONE, &fnum);
-        cli_write(cli, fnum, 0, buf, 0, 4);
+        cli_writeall(cli, fnum, 0, (uint8_t *)buf, 0, 4, NULL);
         cli_close(cli, fnum);
         cli_open(cli, fname, O_RDWR, DENY_NONE, &fnum);
@@ -3244 +3491 @@
 }
 
+/* handler for oplock 4 tests */
+bool *oplock4_shared_correct;
+
+static NTSTATUS oplock4_handler(struct cli_state *cli, uint16_t fnum, unsigned char level)
+{
+        printf("got oplock break fnum=%d level=%d\n",
+               fnum, level);
+        *oplock4_shared_correct = true;
+        cli_oplock_ack(cli, fnum, level);
+        return NT_STATUS_UNSUCCESSFUL; /* Cause cli_receive_smb to return. */
+}
+
+static bool run_oplock4(int dummy)
+{
+        struct cli_state *cli1, *cli2;
+        const char *fname = "\\lockt4.lck";
+        const char *fname_ln = "\\lockt4_ln.lck";
+        uint16_t fnum1, fnum2;
+        int saved_use_oplocks = use_oplocks;
+        NTSTATUS status;
+        bool correct = true;
+
+        oplock4_shared_correct = (bool *)shm_setup(sizeof(bool));
+        *oplock4_shared_correct = false;
+
+        printf("starting oplock test 4\n");
+
+        if (!torture_open_connection(&cli1, 0)) {
+                use_level_II_oplocks = false;
+                use_oplocks = saved_use_oplocks;
+                return false;
+        }
+
+        if (!torture_open_connection(&cli2, 1)) {
+                use_level_II_oplocks = false;
+                use_oplocks = saved_use_oplocks;
+                return false;
+        }
+
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+        cli_unlink(cli1, fname_ln, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+        cli_sockopt(cli1, sockops);
+        cli_sockopt(cli2, sockops);
+
+        /* Create the file. */
+        if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum1))) {
+                printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
+                return false;
+        }
+
+        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
+                printf("close1 failed (%s)\n", cli_errstr(cli1));
+                return false;
+        }
+
+        /* Now create a hardlink. */
+        if (!NT_STATUS_IS_OK(cli_nt_hardlink(cli1, fname, fname_ln))) {
+                printf("nt hardlink failed (%s)\n", cli_errstr(cli1));
+                return false;
+        }
+
+        /* Prove that opening hardlinks cause deny modes to conflict. */
+        if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR, DENY_ALL, &fnum1))) {
+                printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
+                return false;
+        }
+
+        status = cli_open(cli1, fname_ln, O_RDWR, DENY_NONE, &fnum2);
+        if (NT_STATUS_IS_OK(status)) {
+                printf("open of %s succeeded - should fail with sharing violation.\n",
+                        fname_ln);
+                return false;
+        }
+
+        if (!NT_STATUS_EQUAL(status, NT_STATUS_SHARING_VIOLATION)) {
+                printf("open of %s should fail with sharing violation. Got %s\n",
+                        fname_ln, nt_errstr(status));
+                return false;
+        }
+
+        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
+                printf("close1 failed (%s)\n", cli_errstr(cli1));
+                return false;
+        }
+
+        cli1->use_oplocks = true;
+        cli1->use_level_II_oplocks = true;
+
+        cli2->use_oplocks = true;
+        cli2->use_level_II_oplocks = true;
+
+        cli_oplock_handler(cli1, oplock4_handler);
+        if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR, DENY_NONE, &fnum1))) {
+                printf("open of %s failed (%s)\n", fname, cli_errstr(cli1));
+                return false;
+        }
+
+        if (fork() == 0) {
+                /* Child code */
+                if (!NT_STATUS_IS_OK(cli_open(cli2, fname_ln, O_RDWR, DENY_NONE, &fnum2))) {
+                        printf("open of %s failed (%s)\n", fname_ln, cli_errstr(cli1));
+                        *oplock4_shared_correct = false;
+                        exit(0);
+                }
+
+                if (!NT_STATUS_IS_OK(cli_close(cli2, fnum2))) {
+                        printf("close2 failed (%s)\n", cli_errstr(cli1));
+                        *oplock4_shared_correct = false;
+                }
+
+                exit(0);
+        }
+
+        sleep(2);
+
+        /* Process the oplock break. */
+        cli_receive_smb(cli1);
+
+        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
+                printf("close1 failed (%s)\n", cli_errstr(cli1));
+                correct = false;
+        }
+
+        if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
+                printf("unlink failed (%s)\n", cli_errstr(cli1));
+                correct = false;
+        }
+        if (!NT_STATUS_IS_OK(cli_unlink(cli1, fname_ln, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
+                printf("unlink failed (%s)\n", cli_errstr(cli1));
+                correct = false;
+        }
+
+        if (!torture_close_connection(cli1)) {
+                correct = false;
+        }
+
+        if (!*oplock4_shared_correct) {
+                correct = false;
+        }
+
+        printf("finished oplock test 4\n");
+
+        return correct;
+}
 
 
@@ -3269 +3661 @@
 
         cli_setatr(cli1, fname, 0, 0);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS|DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL,
@@ -3279 +3671 @@
         }
 
-#if 0 /* JRATEST */
-        {
-                uint32 *accinfo = NULL;
-                uint32 len;
-                cli_qfileinfo_test(cli1, fnum1, SMB_FILE_ACCESS_INFORMATION, (char **)&accinfo, &len);
-                if (accinfo)
-                        printf("access mode = 0x%lx\n", *accinfo);
-                SAFE_FREE(accinfo);
-        }
-#endif
-
         if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
                 printf("[1] close failed (%s)\n", cli_errstr(cli1));
@@ -3307 +3688 @@
 
         cli_setatr(cli1, fname, 0, 0);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS,
@@ -3336 +3717 @@
                         goto fail;
                 }
-                cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+                cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         } else
                 printf("second delete on close test succeeded.\n");
@@ -3342 +3723 @@
         /* Test 3 - ... */
         cli_setatr(cli1, fname, 0, 0);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
@@ -3395 +3776 @@
                         printf("[3] close failed (%s)\n", cli_errstr(cli1));
                 }
-                cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+                cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
                 correct = False;
                 goto fail;
@@ -3403 +3784 @@
         /* Test 4 ... */
         cli_setatr(cli1, fname, 0, 0);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
@@ -3450 +3831 @@
         /* Test 5 ... */
         cli_setatr(cli1, fname, 0, 0);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_open(cli1, fname, O_RDWR|O_CREAT, DENY_NONE, &fnum1))) {
@@ -3476 +3857 @@
         /* Test 6 ... */
         cli_setatr(cli1, fname, 0, 0);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA,
@@ -3504 +3885 @@
         /* Test 7 ... */
         cli_setatr(cli1, fname, 0, 0);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS,
@@ -3549 +3930 @@
         /* Test 7 ... */
         cli_setatr(cli1, fname, 0, 0);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!torture_open_connection(&cli2, 1)) {
@@ -3634 +4015 @@
 
         cli_setatr(cli1, fname, 0, 0);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         /* What error do we get when attempting to open a read-only file with
@@ -3682 +4063 @@
         if (fnum2 != (uint16_t)-1) cli_close(cli1, fnum2);
         cli_setatr(cli1, fname, 0, 0);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (cli1 && !torture_close_connection(cli1)) {
@@ -3693 +4074 @@
 }
 
+static bool run_deletetest_ln(int dummy)
+{
+        struct cli_state *cli;
+        const char *fname = "\\delete1";
+        const char *fname_ln = "\\delete1_ln";
+        uint16_t fnum;
+        uint16_t fnum1;
+        NTSTATUS status;
+        bool correct = true;
+        time_t t;
+
+        printf("starting deletetest-ln\n");
+
+        if (!torture_open_connection(&cli, 0)) {
+                return false;
+        }
+
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+        cli_unlink(cli, fname_ln, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+        cli_sockopt(cli, sockops);
+
+        /* Create the file. */
+        if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum))) {
+                printf("open of %s failed (%s)\n", fname, cli_errstr(cli));
+                return false;
+        }
+
+        if (!NT_STATUS_IS_OK(cli_close(cli, fnum))) {
+                printf("close1 failed (%s)\n", cli_errstr(cli));
+                return false;
+        }
+
+        /* Now create a hardlink. */
+        if (!NT_STATUS_IS_OK(cli_nt_hardlink(cli, fname, fname_ln))) {
+                printf("nt hardlink failed (%s)\n", cli_errstr(cli));
+                return false;
+        }
+
+        /* Open the original file. */
+        status = cli_ntcreate(cli, fname, 0, FILE_READ_DATA,
+                        FILE_ATTRIBUTE_NORMAL,
+                        FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                        FILE_OPEN_IF, 0, 0, &fnum);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("ntcreate of %s failed (%s)\n", fname, nt_errstr(status));
+                return false;
+        }
+
+        /* Unlink the hard link path. */
+        status = cli_ntcreate(cli, fname_ln, 0, DELETE_ACCESS,
+                        FILE_ATTRIBUTE_NORMAL,
+                        FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                        FILE_OPEN_IF, 0, 0, &fnum1);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("ntcreate of %s failed (%s)\n", fname_ln, nt_errstr(status));
+                return false;
+        }
+        status = cli_nt_delete_on_close(cli, fnum1, true);
+        if (!NT_STATUS_IS_OK(status)) {
+                d_printf("(%s) failed to set delete_on_close %s: %s\n",
+                        __location__, fname_ln, nt_errstr(status));
+                return false;
+        }
+
+        status = cli_close(cli, fnum1);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("close %s failed (%s)\n",
+                        fname_ln, nt_errstr(status));
+                return false;
+        }
+
+        status = cli_close(cli, fnum);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("close %s failed (%s)\n",
+                        fname, nt_errstr(status));
+                return false;
+        }
+
+        /* Ensure the original file is still there. */
+        status = cli_getatr(cli, fname, NULL, NULL, &t);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("%s getatr on file %s failed (%s)\n",
+                        __location__,
+                        fname,
+                        nt_errstr(status));
+                correct = False;
+        }
+
+        /* Ensure the link path is gone. */
+        status = cli_getatr(cli, fname_ln, NULL, NULL, &t);
+        if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+                printf("%s, getatr for file %s returned wrong error code %s "
+                        "- should have been deleted\n",
+                        __location__,
+                        fname_ln, nt_errstr(status));
+                correct = False;
+        }
+
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+        cli_unlink(cli, fname_ln, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+        if (!torture_close_connection(cli)) {
+                correct = false;
+        }
+
+        printf("finished deletetest-ln\n");
+
+        return correct;
+}
 
 /*
@@ -3791 +4282 @@
         bool correct = True;
         uint16_t fnum1;
+        uint16_t attr;
         NTSTATUS status;
 
@@ -3799 +4291 @@
         }
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-        cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+        cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_READ, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
@@ -3819 +4311 @@
         }
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-        cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+        cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         status = cli_ntcreate(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
 #if 0
@@ -3845 +4337 @@
         }
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-        cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+        cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, READ_CONTROL_ACCESS, FILE_ATTRIBUTE_NORMAL,
@@ -3888 +4380 @@
         }
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-        cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+        cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         /*----*/
@@ -3911 +4403 @@
         }
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-        cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+        cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         /*--*/
@@ -3945 +4437 @@
 
         /*--*/
-
-
         if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
                 printf("close - 5 failed (%s)\n", cli_errstr(cli1));
@@ -3952 +4442 @@
         }
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-        cli_unlink(cli1, fname1, aSYSTEM | aHIDDEN);
+        /* Check that the renamed file has FILE_ATTRIBUTE_ARCHIVE. */
+        if (!NT_STATUS_IS_OK(cli_getatr(cli1, fname1, &attr, NULL, NULL))) {
+                printf("getatr on file %s failed - %s ! \n",
+                        fname1,
+                        cli_errstr(cli1));
+                correct = False;
+        } else {
+                if (attr != FILE_ATTRIBUTE_ARCHIVE) {
+                        printf("Renamed file %s has wrong attr 0x%x "
+                                "(should be 0x%x)\n",
+                                fname1,
+                                attr,
+                                (unsigned int)FILE_ATTRIBUTE_ARCHIVE);
+                        correct = False;
+                } else {
+                        printf("Renamed file %s has archive bit set\n", fname1);
+                }
+        }
+
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+        cli_unlink(cli1, fname1, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!torture_close_connection(cli1)) {
@@ -4003 +4512 @@
         bool correct = True;
         char *tmp_path;
+        NTSTATUS status;
 
         printf("starting open test\n");
@@ -4011 +4521 @@
 
         cli_setatr(cli1, fname, 0, 0);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         cli_sockopt(cli1, sockops);
@@ -4025 +4535 @@
         }
 
-        if (!NT_STATUS_IS_OK(cli_setatr(cli1, fname, aRONLY, 0))) {
+        if (!NT_STATUS_IS_OK(cli_setatr(cli1, fname, FILE_ATTRIBUTE_READONLY, 0))) {
                 printf("cli_setatr failed (%s)\n", cli_errstr(cli1));
                 return False;
@@ -4069 +4579 @@
         }
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         printf("finished open test 2\n");
@@ -4084 +4594 @@
         memset(buf, '\0', 20);
 
-        if (cli_write(cli1, fnum1, 0, buf, 0, 20) != 20) {
-                printf("write failed (%s)\n", cli_errstr(cli1));
+        status = cli_writeall(cli1, fnum1, 0, (uint8_t *)buf, 0, 20, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("write failed (%s)\n", nt_errstr(status));
                 correct = False;
         }
@@ -4129 +4640 @@
         printf("finished open test 3\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
-
-
-        printf("testing ctemp\n");
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+        printf("Do ctemp tests\n");
         if (!NT_STATUS_IS_OK(cli_ctemp(cli1, talloc_tos(), "\\", &fnum1, &tmp_path))) {
                 printf("ctemp failed (%s)\n", cli_errstr(cli1));
@@ -4141 +4651 @@
                 printf("close of temp failed (%s)\n", cli_errstr(cli1));
         }
-        if (!NT_STATUS_IS_OK(cli_unlink(cli1, tmp_path, aSYSTEM | aHIDDEN))) {
+        if (!NT_STATUS_IS_OK(cli_unlink(cli1, tmp_path, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                 printf("unlink of temp failed (%s)\n", cli_errstr(cli1));
         }
@@ -4152 +4662 @@
 
         cli_setatr(cli2, fname, 0, 0);
-        cli_unlink(cli2, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli2, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         cli_sockopt(cli2, sockops);
@@ -4160 +4670 @@
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-                printf("test 1 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #1 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
@@ -4166 +4676 @@
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_NONE, FILE_OPEN_IF, 0, 0, &fnum2))) {
-                printf("test 1 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+                printf("TEST #1 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                 return False;
         }
 
         if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-                printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
         if (!NT_STATUS_IS_OK(cli_close(cli2, fnum2))) {
-                printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+                printf("TEST #1 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                 return False;
         }
@@ -4181 +4691 @@
         printf("non-io open test #1 passed.\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         printf("TEST #2 testing 2 non-io opens (first with delete)\n");
@@ -4187 +4697 @@
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-                printf("test 2 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #2 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
@@ -4193 +4703 @@
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_NONE, FILE_OPEN_IF, 0, 0, &fnum2))) {
-                printf("test 2 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+                printf("TEST #2 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                 return False;
         }
 
         if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-                printf("test 1 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #2 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
         if (!NT_STATUS_IS_OK(cli_close(cli2, fnum2))) {
-                printf("test 1 close 2 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #2 close 2 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
@@ -4208 +4718 @@
         printf("non-io open test #2 passed.\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         printf("TEST #3 testing 2 non-io opens (second with delete)\n");
@@ -4214 +4724 @@
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-                printf("test 3 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #3 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
@@ -4220 +4730 @@
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_NONE, FILE_OPEN_IF, 0, 0, &fnum2))) {
-                printf("test 3 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+                printf("TEST #3 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                 return False;
         }
 
         if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-                printf("test 3 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #3 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
         if (!NT_STATUS_IS_OK(cli_close(cli2, fnum2))) {
-                printf("test 3 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+                printf("TEST #3 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                 return False;
         }
@@ -4235 +4745 @@
         printf("non-io open test #3 passed.\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         printf("TEST #4 testing 2 non-io opens (both with delete)\n");
@@ -4241 +4751 @@
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-                printf("test 4 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #4 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
@@ -4247 +4757 @@
         if (NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_NONE, FILE_OPEN_IF, 0, 0, &fnum2))) {
-                printf("test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2));
-                return False;
-        }
-
-        printf("test 3 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2), "sharing violation");
+                printf("TEST #4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2));
+                return False;
+        }
+
+        printf("TEST #4 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2), "sharing violation");
 
         if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-                printf("test 4 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #4 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
@@ -4260 +4770 @@
         printf("non-io open test #4 passed.\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         printf("TEST #5 testing 2 non-io opens (both with delete - both with file share delete)\n");
@@ -4266 +4776 @@
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_DELETE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-                printf("test 5 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #5 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
@@ -4272 +4782 @@
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_DELETE, FILE_OPEN_IF, 0, 0, &fnum2))) {
-                printf("test 5 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+                printf("TEST #5 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                 return False;
         }
 
         if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-                printf("test 5 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #5 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
 
         if (!NT_STATUS_IS_OK(cli_close(cli2, fnum2))) {
-                printf("test 5 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+                printf("TEST #5 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                 return False;
         }
@@ -4290 +4800 @@
         printf("TEST #6 testing 1 non-io open, one io open\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-                printf("test 6 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #6 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
@@ -4300 +4810 @@
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_READ, FILE_OPEN_IF, 0, 0, &fnum2))) {
-                printf("test 6 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+                printf("TEST #6 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                 return False;
         }
 
         if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-                printf("test 6 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #6 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
 
         if (!NT_STATUS_IS_OK(cli_close(cli2, fnum2))) {
-                printf("test 6 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
+                printf("TEST #6 close 2 of %s failed (%s)\n", fname, cli_errstr(cli2));
                 return False;
         }
@@ -4318 +4828 @@
         printf("TEST #7 testing 1 non-io open, one io open with delete\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
-                printf("test 7 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #7 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
@@ -4328 +4838 @@
         if (NT_STATUS_IS_OK(cli_ntcreate(cli2, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL,
                                    FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_OPEN_IF, 0, 0, &fnum2))) {
-                printf("test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2));
-                return False;
-        }
-
-        printf("test 7 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2), "sharing violation");
+                printf("TEST #7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2));
+                return False;
+        }
+
+        printf("TEST #7 open 2 of %s gave %s (correct error should be %s)\n", fname, cli_errstr(cli2), "sharing violation");
 
         if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
-                printf("test 7 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
+                printf("TEST #7 close 1 of %s failed (%s)\n", fname, cli_errstr(cli1));
                 return False;
         }
@@ -4341 +4851 @@
         printf("non-io open test #7 passed.\n");
 
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+
+        printf("TEST #8 testing open without WRITE_ATTRIBUTES, updating close write time.\n");
+        status = cli_ntcreate(cli1, fname, 0, FILE_WRITE_DATA, FILE_ATTRIBUTE_NORMAL,
+                                FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
+                                FILE_OVERWRITE_IF, 0, 0, &fnum1);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("TEST #8 open of %s failed (%s)\n", fname, nt_errstr(status));
+                correct = false;
+                goto out;
+        }
+
+        /* Write to ensure we have to update the file time. */
+        status = cli_writeall(cli1, fnum1, 0, (uint8_t *)"TEST DATA\n", 0, 10,
+                              NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("TEST #8 cli_write failed: %s\n", nt_errstr(status));
+                correct = false;
+                goto out;
+        }
+
+        status = cli_close(cli1, fnum1);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("TEST #8 close of %s failed (%s)\n", fname, nt_errstr(status));
+                correct = false;
+        }
+
+  out:
 
         if (!torture_close_connection(cli1)) {
@@ -4351 +4888 @@
 
         return correct;
+}
+
+NTSTATUS torture_setup_unix_extensions(struct cli_state *cli)
+{
+        uint16 major, minor;
+        uint32 caplow, caphigh;
+        NTSTATUS status;
+
+        if (!SERVER_HAS_UNIX_CIFS(cli)) {
+                printf("Server doesn't support UNIX CIFS extensions.\n");
+                return NT_STATUS_NOT_SUPPORTED;
+        }
+
+        status = cli_unix_extensions_version(cli, &major, &minor, &caplow,
+                                             &caphigh);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("Server didn't return UNIX CIFS extensions: %s\n",
+                       nt_errstr(status));
+                return status;
+        }
+
+        status = cli_set_unix_extensions_capabilities(cli, major, minor,
+                                                      caplow, caphigh);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("Server doesn't support setting UNIX CIFS extensions: "
+                       "%s.\n", nt_errstr(status));
+                return status;
+        }
+
+        return NT_STATUS_OK;
 }
 
@@ -4365 +4932 @@
         char buf[10];
         char namebuf[11];
-        uint16 major, minor;
-        uint32 caplow, caphigh;
         uint16_t fnum1 = (uint16_t)-1;
         SMB_STRUCT_STAT sbuf;
@@ -4380 +4945 @@
         cli_sockopt(cli1, sockops);
 
-        if (!SERVER_HAS_UNIX_CIFS(cli1)) {
-                printf("Server doesn't support UNIX CIFS extensions.\n");
+        status = torture_setup_unix_extensions(cli1);
+        if (!NT_STATUS_IS_OK(status)) {
                 return false;
         }
-
-        status = cli_unix_extensions_version(cli1, &major, &minor, &caplow,
-                                             &caphigh);
-        if (!NT_STATUS_IS_OK(status)) {
-                printf("Server didn't return UNIX CIFS extensions: %s\n",
-                       nt_errstr(status));
-                return false;
-        }
-
-        if (!cli_set_unix_extensions_capabilities(cli1,
-                        major, minor, caplow, caphigh)) {
-                printf("Server doesn't support setting UNIX CIFS extensions.\n");
-                return false;
-        }
 
         cli_setatr(cli1, fname, 0, 0);
@@ -4470 +5021 @@
         }
 
-        /* What happens when we try and POSIX open a directory ? */
-        if (NT_STATUS_IS_OK(cli_posix_open(cli1, dname, O_RDONLY, 0, &fnum1))) {
+        /* Create again to test open with O_TRUNC. */
+        if (!NT_STATUS_IS_OK(cli_posix_open(cli1, fname, O_RDWR|O_CREAT|O_EXCL, 0600, &fnum1))) {
+                printf("POSIX create of %s failed (%s)\n", fname, cli_errstr(cli1));
+                goto out;
+        }
+
+        /* Test ftruncate - set file size. */
+        if (!NT_STATUS_IS_OK(cli_ftruncate(cli1, fnum1, 1000))) {
+                printf("ftruncate failed (%s)\n", cli_errstr(cli1));
+                goto out;
+        }
+
+        /* Ensure st_size == 1000 */
+        if (!NT_STATUS_IS_OK(cli_posix_stat(cli1, fname, &sbuf))) {
+                printf("stat failed (%s)\n", cli_errstr(cli1));
+                goto out;
+        }
+
+        if (sbuf.st_ex_size != 1000) {
+                printf("ftruncate - stat size (%u) != 1000\n", (unsigned int)sbuf.st_ex_size);
+                goto out;
+        }
+
+        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
+                printf("close(2) failed (%s)\n", cli_errstr(cli1));
+                goto out;
+        }
+
+        /* Re-open with O_TRUNC. */
+        if (!NT_STATUS_IS_OK(cli_posix_open(cli1, fname, O_WRONLY|O_TRUNC, 0600, &fnum1))) {
+                printf("POSIX create of %s failed (%s)\n", fname, cli_errstr(cli1));
+                goto out;
+        }
+
+        /* Ensure st_size == 0 */
+        if (!NT_STATUS_IS_OK(cli_posix_stat(cli1, fname, &sbuf))) {
+                printf("stat failed (%s)\n", cli_errstr(cli1));
+                goto out;
+        }
+
+        if (sbuf.st_ex_size != 0) {
+                printf("O_TRUNC - stat size (%u) != 0\n", (unsigned int)sbuf.st_ex_size);
+                goto out;
+        }
+
+        if (!NT_STATUS_IS_OK(cli_close(cli1, fnum1))) {
+                printf("close failed (%s)\n", cli_errstr(cli1));
+                goto out;
+        }
+
+        if (!NT_STATUS_IS_OK(cli_posix_unlink(cli1, fname))) {
+                printf("POSIX unlink of %s failed (%s)\n", fname, cli_errstr(cli1));
+                goto out;
+        }
+
+        if (!NT_STATUS_IS_OK(cli_posix_open(cli1, dname, O_RDONLY, 0, &fnum1))) {
+                printf("POSIX open directory O_RDONLY of %s failed (%s)\n",
+                        dname, cli_errstr(cli1));
+                goto out;
+        }
+
+        cli_close(cli1, fnum1);
+
+        /* What happens when we try and POSIX open a directory for write ? */
+        if (NT_STATUS_IS_OK(cli_posix_open(cli1, dname, O_RDWR, 0, &fnum1))) {
                 printf("POSIX open of directory %s succeeded, should have failed.\n", fname);
                 goto out;
@@ -4488 +5102 @@
 
         /* Write some data into it. */
-        if (cli_write(cli1, fnum1, 0, "TEST DATA\n", 0, 10) != 10) {
-                printf("cli_write failed: %s\n", cli_errstr(cli1));
+        status = cli_writeall(cli1, fnum1, 0, (uint8_t *)"TEST DATA\n", 0, 10,
+                              NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("cli_write failed: %s\n", nt_errstr(status));
                 goto out;
         }
@@ -4671 +5287 @@
         for (k = 0, i = 0; i < sizeof(open_attrs_table)/sizeof(uint32); i++) {
                 cli_setatr(cli1, fname, 0, 0);
-                cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+                cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
                 if (!NT_STATUS_IS_OK(cli_ntcreate(cli1, fname, 0, FILE_WRITE_DATA, open_attrs_table[i],
                                    FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0, &fnum1))) {
@@ -4743 +5359 @@
 
         cli_setatr(cli1, fname, 0, 0);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         printf("open attr test %s.\n", correct ? "passed" : "failed");
@@ -4753 +5369 @@
 }
 
-static void list_fn(const char *mnt, file_info *finfo, const char *name, void *state)
-{
-
+static NTSTATUS list_fn(const char *mnt, struct file_info *finfo,
+                    const char *name, void *state)
+{
+        int *matched = (int *)state;
+        if (matched != NULL) {
+                *matched += 1;
+        }
+        return NT_STATUS_OK;
 }
 
@@ -4766 +5387 @@
         static struct cli_state *cli;
         uint16_t fnum;
-        double t1;
+        struct timeval core_start;
         bool correct = True;
+        int matched;
 
         printf("starting directory test\n");
@@ -4788 +5410 @@
         }
 
-        t1 = end_timer();
-
-        printf("Matched %d\n", cli_list(cli, "a*.*", 0, list_fn, NULL));
-        printf("Matched %d\n", cli_list(cli, "b*.*", 0, list_fn, NULL));
-        printf("Matched %d\n", cli_list(cli, "xyzabc", 0, list_fn, NULL));
-
-        printf("dirtest core %g seconds\n", end_timer() - t1);
+        core_start = timeval_current();
+
+        matched = 0;
+        cli_list(cli, "a*.*", 0, list_fn, &matched);
+        printf("Matched %d\n", matched);
+
+        matched = 0;
+        cli_list(cli, "b*.*", 0, list_fn, &matched);
+        printf("Matched %d\n", matched);
+
+        matched = 0;
+        cli_list(cli, "xyzabc", 0, list_fn, &matched);
+        printf("Matched %d\n", matched);
+
+        printf("dirtest core %g seconds\n", timeval_elapsed(&core_start));
 
         srandom(0);
@@ -4800 +5430 @@
                 fstring fname;
                 slprintf(fname, sizeof(fname), "\\%x", (int)random());
-                cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+                cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         }
 
@@ -4812 +5442 @@
 }
 
-static void del_fn(const char *mnt, file_info *finfo, const char *mask, void *state)
+static NTSTATUS del_fn(const char *mnt, struct file_info *finfo, const char *mask,
+                   void *state)
 {
         struct cli_state *pcli = (struct cli_state *)state;
@@ -4819 +5450 @@
 
         if (strcmp(finfo->name, ".") == 0 || strcmp(finfo->name, "..") == 0)
-                return;
-
-        if (finfo->mode & aDIR) {
+                return NT_STATUS_OK;
+
+        if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) {
                 if (!NT_STATUS_IS_OK(cli_rmdir(pcli, fname)))
                         printf("del_fn: failed to rmdir %s\n,", fname );
         } else {
-                if (!NT_STATUS_IS_OK(cli_unlink(pcli, fname, aSYSTEM | aHIDDEN)))
+                if (!NT_STATUS_IS_OK(cli_unlink(pcli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN)))
                         printf("del_fn: failed to unlink %s\n,", fname );
         }
+        return NT_STATUS_OK;
 }
 
@@ -4849 +5481 @@
         printf("starting ioctl test\n");
 
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE, &fnum))) {
@@ -4857 +5489 @@
 
         status = cli_raw_ioctl(cli, fnum, 0x2d0000 | (0x0420<<2), &blob);
-        printf("ioctl device info: %s\n", cli_errstr(cli));
+        printf("ioctl device info: %s\n", nt_errstr(status));
 
         status = cli_raw_ioctl(cli, fnum, IOCTL_QUERY_JOB_INFO, &blob);
-        printf("ioctl job info: %s\n", cli_errstr(cli));
+        printf("ioctl job info: %s\n", nt_errstr(status));
 
         for (device=0;device<0x100;device++) {
-                printf("testing device=0x%x\n", device);
+                printf("ioctl test with device = 0x%x\n", device);
                 for (function=0;function<0x100;function++) {
                         uint32 code = (device<<16) | function;
@@ -4902 +5534 @@
         /* cleanup from an old run */
         cli_rmdir(cli, "\\chkpath.dir\\dir2");
-        cli_unlink(cli, "\\chkpath.dir\\*", aSYSTEM | aHIDDEN);
+        cli_unlink(cli, "\\chkpath.dir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_rmdir(cli, "\\chkpath.dir");
 
@@ -4956 +5588 @@
 
         cli_rmdir(cli, "\\chkpath.dir\\dir2");
-        cli_unlink(cli, "\\chkpath.dir\\*", aSYSTEM | aHIDDEN);
+        cli_unlink(cli, "\\chkpath.dir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_rmdir(cli, "\\chkpath.dir");
 
@@ -4976 +5608 @@
         struct ea_struct *ea_list = NULL;
         TALLOC_CTX *mem_ctx = talloc_init("eatest");
+        NTSTATUS status;
 
         printf("starting eatest\n");
@@ -4984 +5617 @@
         }
 
-        cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         if (!NT_STATUS_IS_OK(cli_ntcreate(cli, fname, 0,
                                    FIRST_DESIRED_ACCESS, FILE_ATTRIBUTE_ARCHIVE,
@@ -4999 +5632 @@
                 slprintf(ea_name, sizeof(ea_name), "EA_%d", i);
                 memset(ea_val, (char)i+1, i+1);
-                if (!cli_set_ea_fnum(cli, fnum, ea_name, ea_val, i+1)) {
-                        printf("ea_set of name %s failed - %s\n", ea_name, cli_errstr(cli));
+                status = cli_set_ea_fnum(cli, fnum, ea_name, ea_val, i+1);
+                if (!NT_STATUS_IS_OK(status)) {
+                        printf("ea_set of name %s failed - %s\n", ea_name,
+                               nt_errstr(status));
                         talloc_destroy(mem_ctx);
                         return False;
@@ -5012 +5647 @@
                 slprintf(ea_name, sizeof(ea_name), "EA_%d", i+10);
                 memset(ea_val, (char)i+1, i+1);
-                if (!cli_set_ea_path(cli, fname, ea_name, ea_val, i+1)) {
-                        printf("ea_set of name %s failed - %s\n", ea_name, cli_errstr(cli));
+                status = cli_set_ea_path(cli, fname, ea_name, ea_val, i+1);
+                if (!NT_STATUS_IS_OK(status)) {
+                        printf("ea_set of name %s failed - %s\n", ea_name,
+                               nt_errstr(status));
                         talloc_destroy(mem_ctx);
                         return False;
@@ -5019 +5656 @@
         }
 
-        if (!cli_get_ea_list_path(cli, fname, mem_ctx, &num_eas, &ea_list)) {
-                printf("ea_get list failed - %s\n", cli_errstr(cli));
+        status = cli_get_ea_list_path(cli, fname, mem_ctx, &num_eas, &ea_list);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("ea_get list failed - %s\n", nt_errstr(status));
                 correct = False;
         }
@@ -5050 +5688 @@
                 fstring ea_name;
                 slprintf(ea_name, sizeof(ea_name), "ea_%d", i);
-                if (!cli_set_ea_path(cli, fname, ea_name, "", 0)) {
-                        printf("ea_set of name %s failed - %s\n", ea_name, cli_errstr(cli));
+                status = cli_set_ea_path(cli, fname, ea_name, "", 0);
+                if (!NT_STATUS_IS_OK(status)) {
+                        printf("ea_set of name %s failed - %s\n", ea_name,
+                               nt_errstr(status));
                         talloc_destroy(mem_ctx);
                         return False;
@@ -5058 +5698 @@
 #endif
 
-        if (!cli_get_ea_list_path(cli, fname, mem_ctx, &num_eas, &ea_list)) {
-                printf("ea_get list failed - %s\n", cli_errstr(cli));
+        status = cli_get_ea_list_path(cli, fname, mem_ctx, &num_eas, &ea_list);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("ea_get list failed - %s\n", nt_errstr(status));
                 correct = False;
         }
@@ -5076 +5717 @@
 
         /* Try and delete a non existant EA. */
-        if (!cli_set_ea_path(cli, fname, "foo", "", 0)) {
-                printf("deleting non-existant EA 'foo' should succeed. %s\n", cli_errstr(cli));
+        status = cli_set_ea_path(cli, fname, "foo", "", 0);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("deleting non-existant EA 'foo' should succeed. %s\n",
+                       nt_errstr(status));
                 correct = False;
         }
@@ -5106 +5749 @@
 
         cli_list(cli, "\\LISTDIR\\*", 0, del_fn, cli);
-        cli_list(cli, "\\LISTDIR\\*", aDIR, del_fn, cli);
+        cli_list(cli, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, del_fn, cli);
         cli_rmdir(cli, "\\LISTDIR");
         cli_mkdir(cli, "\\LISTDIR");
@@ -5131 +5774 @@
 
         /* Now ensure that doing an old list sees both files and directories. */
-        num_seen = cli_list_old(cli, "\\LISTDIR\\*", aDIR, list_fn, NULL);
+        num_seen = 0;
+        cli_list_old(cli, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, list_fn, &num_seen);
         printf("num_seen = %d\n", num_seen );
         /* We should see 100 files + 1000 directories + . and .. */
@@ -5140 +5784 @@
          * relevent entries.
          */
-        num_seen = cli_list_old(cli, "\\LISTDIR\\*", (aDIR<<8)|aDIR, list_fn, NULL);
+        num_seen = 0;
+        cli_list_old(cli, "\\LISTDIR\\*", (FILE_ATTRIBUTE_DIRECTORY<<8)|FILE_ATTRIBUTE_DIRECTORY, list_fn, &num_seen);
         printf("num_seen = %d\n", num_seen );
         if (num_seen != 1002)
                 correct = False;
 
-        num_seen = cli_list_old(cli, "\\LISTDIR\\*", (aARCH<<8)|aDIR, list_fn, NULL);
+        num_seen = 0;
+        cli_list_old(cli, "\\LISTDIR\\*", (FILE_ATTRIBUTE_ARCHIVE<<8)|FILE_ATTRIBUTE_DIRECTORY, list_fn, &num_seen);
         printf("num_seen = %d\n", num_seen );
         if (num_seen != 1000)
@@ -5152 +5798 @@
         /* Delete everything. */
         cli_list(cli, "\\LISTDIR\\*", 0, del_fn, cli);
-        cli_list(cli, "\\LISTDIR\\*", aDIR, del_fn, cli);
+        cli_list(cli, "\\LISTDIR\\*", FILE_ATTRIBUTE_DIRECTORY, del_fn, cli);
         cli_rmdir(cli, "\\LISTDIR");
 
@@ -5317 +5963 @@
                 d_printf("\r%d   ", (int)c->vuid);
 
-                if (!cli_ulogoff(c)) {
+                status = cli_ulogoff(c);
+                if (!NT_STATUS_IS_OK(status)) {
                         d_printf("(%s) cli_ulogoff failed: %s\n",
-                                 __location__, cli_errstr(c));
+                                 __location__, nt_errstr(status));
                         return false;
                 }
@@ -5455 +6102 @@
         printf("starting chain2 test\n");
         status = cli_start_connection(&cli1, global_myname(), host, NULL,
-                                      port_to_use, Undefined, 0, NULL);
+                                      port_to_use, Undefined, 0);
         if (!NT_STATUS_IS_OK(status)) {
                 return False;
@@ -5792 +6439 @@
         NTSTATUS status;
         uint16_t dnum;
-        struct tevent_req *req1, *req2;
+        struct tevent_req *req1;
+        struct tevent_req *req2 = NULL;
         int i, num_unc_names;
         int num_finished = 0;
@@ -5928 +6576 @@
         cli_close(cli, fnum);
 
-        if (!cli_qpathinfo(cli, alt_name, &change_time, &access_time,
-                           &write_time, &size, &mode)) {
-                d_printf("cli_qpathinfo(%s) failed: %s\n", alt_name,
-                         cli_errstr(cli));
+        status = cli_qpathinfo1(cli, alt_name, &change_time, &access_time,
+                                &write_time, &size, &mode);
+        if (!NT_STATUS_IS_OK(status)) {
+                d_printf("cli_qpathinfo1(%s) failed: %s\n", alt_name,
+                         nt_errstr(status));
                 return false;
         }
@@ -5960 +6609 @@
         bool ret = false;
         const char *fname = "\\writetest.txt";
+        struct timeval start_time;
         double seconds;
         double kbytes;
@@ -5975 +6625 @@
         cli_sockopt(cli1, sockops);
 
-        start_timer();
+        start_time = timeval_current();
 
         for (i=0; i<torture_numops; i++) {
-                char c = 0;
+                uint8_t c = 0;
                 off_t start = i * torture_blocksize;
                 NTSTATUS status;
                 size_t to_pull = torture_blocksize - 1;
 
-                if (cli_write(cli1, fnum, 0, &c,
-                              start + torture_blocksize - 1, 1) != 1) {
-                        printf("cli_write failed: %s\n", cli_errstr(cli1));
+                status = cli_writeall(cli1, fnum, 0, &c,
+                                      start + torture_blocksize - 1, 1, NULL);
+                if (!NT_STATUS_IS_OK(status)) {
+                        printf("cli_write failed: %s\n", nt_errstr(status));
                         goto fail;
                 }
@@ -5997 +6648 @@
         }
 
-        seconds = end_timer();
+        seconds = timeval_elapsed(&start_time);
         kbytes = (double)torture_blocksize * torture_numops;
         kbytes /= 1024;
@@ -6007 +6658 @@
  fail:
         cli_close(cli1, fnum);
-        cli_unlink(cli1, fname, aSYSTEM | aHIDDEN);
+        cli_unlink(cli1, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         torture_close_connection(cli1);
         return ret;
@@ -6037 +6688 @@
         int16_t old_cnum;
         bool correct = True;
+        NTSTATUS status;
 
         printf("starting uid regression test\n");
@@ -6049 +6701 @@
         old_vuid = cli->vuid;
 
-        if (!cli_ulogoff(cli)) {
+        status = cli_ulogoff(cli);
+        if (!NT_STATUS_IS_OK(status)) {
                 d_printf("(%s) cli_ulogoff failed: %s\n",
-                        __location__, cli_errstr(cli));
+                         __location__, nt_errstr(status));
                 correct = false;
                 goto out;
@@ -6059 +6712 @@
 
         /* Try an operation. */
-        if (!NT_STATUS_IS_OK(cli_mkdir(cli, "\\uid_reg_test"))) {
-                /* We expect bad uid. */
+        status = cli_mkdir(cli, "\\uid_reg_test");
+        if (NT_STATUS_IS_OK(status)) {
+                d_printf("(%s) cli_mkdir succeeded\n",
+                         __location__);
+                correct = false;
+                goto out;
+        } else {
+                /* Should be bad uid. */
                 if (!check_error(__LINE__, cli, ERRSRV, ERRbaduid,
-                                NT_STATUS_NO_SUCH_USER)) {
-                        return False;
+                                NT_STATUS_USER_SESSION_DELETED)) {
+                        correct = false;
+                        goto out;
                 }
         }
@@ -6073 +6733 @@
 
         /* This should succeed. */
-        if (cli_tdis(cli)) {
-                printf("First tdis with invalid vuid should succeed.\n");
+        status = cli_tdis(cli);
+
+        if (NT_STATUS_IS_OK(status)) {
+                d_printf("First tdis with invalid vuid should succeed.\n");
         } else {
-                printf("First tdis failed (%s)\n", cli_errstr(cli));
+                d_printf("First tdis failed (%s)\n", nt_errstr(status));
+                correct = false;
+                goto out;
         }
 
@@ -6083 +6747 @@
 
         /* This should fail. */
-        if (cli_tdis(cli)) {
-                printf("Second tdis with invalid vuid should fail - succeeded instead !.\n");
+        status = cli_tdis(cli);
+        if (NT_STATUS_IS_OK(status)) {
+                d_printf("Second tdis with invalid vuid should fail - succeeded instead !.\n");
+                correct = false;
+                goto out;
         } else {
                 /* Should be bad tid. */
                 if (!check_error(__LINE__, cli, ERRSRV, ERRinvnid,
                                 NT_STATUS_NETWORK_NAME_DELETED)) {
-                        return False;
+                        correct = false;
+                        goto out;
                 }
         }
@@ -6105 +6773 @@
 static char force_shortname_chars[] = " +,.[];=\177";
 
-static void shortname_del_fn(const char *mnt, file_info *finfo, const char *mask, void *state)
+static NTSTATUS shortname_del_fn(const char *mnt, struct file_info *finfo,
+                             const char *mask, void *state)
 {
         struct cli_state *pcli = (struct cli_state *)state;
         fstring fname;
+        NTSTATUS status = NT_STATUS_OK;
+
         slprintf(fname, sizeof(fname), "\\shortname\\%s", finfo->name);
 
         if (strcmp(finfo->name, ".") == 0 || strcmp(finfo->name, "..") == 0)
-                return;
-
-        if (finfo->mode & aDIR) {
-                if (!NT_STATUS_IS_OK(cli_rmdir(pcli, fname)))
+                return NT_STATUS_OK;
+
+        if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) {
+                status = cli_rmdir(pcli, fname);
+                if (!NT_STATUS_IS_OK(status)) {
                         printf("del_fn: failed to rmdir %s\n,", fname );
+                }
         } else {
-                if (!NT_STATUS_IS_OK(cli_unlink(pcli, fname, aSYSTEM | aHIDDEN)))
+                status = cli_unlink(pcli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+                if (!NT_STATUS_IS_OK(status)) {
                         printf("del_fn: failed to unlink %s\n,", fname );
-        }
+                }
+        }
+        return status;
 }
 
 struct sn_state {
+        int matched;
         int i;
         bool val;
 };
 
-static void shortname_list_fn(const char *mnt, file_info *finfo, const char *name, void *state)
+static NTSTATUS shortname_list_fn(const char *mnt, struct file_info *finfo,
+                              const char *name, void *state)
 {
         struct sn_state *s = (struct sn_state  *)state;
@@ -6151 +6829 @@
                 s->val = true;
         }
+        s->matched += 1;
+        return NT_STATUS_OK;
 }
 
@@ -6170 +6850 @@
 
         cli_list(cli, "\\shortname\\*", 0, shortname_del_fn, cli);
-        cli_list(cli, "\\shortname\\*", aDIR, shortname_del_fn, cli);
+        cli_list(cli, "\\shortname\\*", FILE_ATTRIBUTE_DIRECTORY, shortname_del_fn, cli);
         cli_rmdir(cli, "\\shortname");
 
@@ -6205 +6885 @@
                 }
                 cli_close(cli, fnum);
-                if (cli_list(cli, "\\shortname\\test*.*", 0, shortname_list_fn, &s) != 1) {
+
+                s.matched = 0;
+                cli_list(cli, "\\shortname\\test*.*", 0, shortname_list_fn,
+                         &s);
+                if (s.matched != 1) {
                         d_printf("(%s) failed to list %s: %s\n",
                                 __location__, fname, cli_errstr(cli));
@@ -6211 +6895 @@
                         goto out;
                 }
-                if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | aHIDDEN))) {
+                if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
                         d_printf("(%s) failed to delete %s: %s\n",
                                 __location__, fname, cli_errstr(cli));
@@ -6227 +6911 @@
 
         cli_list(cli, "\\shortname\\*", 0, shortname_del_fn, cli);
-        cli_list(cli, "\\shortname\\*", aDIR, shortname_del_fn, cli);
+        cli_list(cli, "\\shortname\\*", FILE_ATTRIBUTE_DIRECTORY, shortname_del_fn, cli);
         cli_rmdir(cli, "\\shortname");
         torture_close_connection(cli);
@@ -6266 +6950 @@
         struct tevent_req *req;
         char *basedn;
+        const char *filter;
 
         if (!resolve_name(host, &addr, 0, false)) {
@@ -6319 +7004 @@
         TALLOC_FREE(req);
 
+        /* test search filters against rootDSE */
+        filter = "(&(|(name=samba)(nextRid<=10000000)(usnChanged>=10)(samba~=ambas)(!(name=s*m*a)))"
+                   "(|(name:=samba)(name:dn:2.5.13.5:=samba)(:dn:2.5.13.5:=samba)(!(name=*samba))))";
+
+        rc = tldap_search(ld, "", TLDAP_SCOPE_BASE, filter,
+                          NULL, 0, 0, NULL, 0, NULL, 0, 0, 0, 0,
+                          talloc_tos(), NULL, NULL);
+        if (rc != TLDAP_SUCCESS) {
+                d_printf("tldap_search with complex filter failed: %s\n",
+                         tldap_errstr(talloc_tos(), ld, rc));
+                return false;
+        }
+
         TALLOC_FREE(ld);
         return true;
 }
+
+/* Torture test to ensure no regression of :
+https://bugzilla.samba.org/show_bug.cgi?id=7084
+*/
+
+static bool run_dir_createtime(int dummy)
+{
+        struct cli_state *cli;
+        const char *dname = "\\testdir";
+        const char *fname = "\\testdir\\testfile";
+        NTSTATUS status;
+        struct timespec create_time;
+        struct timespec create_time1;
+        uint16_t fnum;
+        bool ret = false;
+
+        if (!torture_open_connection(&cli, 0)) {
+                return false;
+        }
+
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+        cli_rmdir(cli, dname);
+
+        status = cli_mkdir(cli, dname);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("mkdir failed: %s\n", nt_errstr(status));
+                goto out;
+        }
+
+        status = cli_qpathinfo2(cli, dname, &create_time, NULL, NULL, NULL,
+                                NULL, NULL, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("cli_qpathinfo2 returned %s\n",
+                       nt_errstr(status));
+                goto out;
+        }
+
+        /* Sleep 3 seconds, then create a file. */
+        sleep(3);
+
+        status = cli_open(cli, fname, O_RDWR | O_CREAT | O_EXCL,
+                         DENY_NONE, &fnum);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("cli_open failed: %s\n", nt_errstr(status));
+                goto out;
+        }
+
+        status = cli_qpathinfo2(cli, dname, &create_time1, NULL, NULL, NULL,
+                                NULL, NULL, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("cli_qpathinfo2 (2) returned %s\n",
+                       nt_errstr(status));
+                goto out;
+        }
+
+        if (timespec_compare(&create_time1, &create_time)) {
+                printf("run_dir_createtime: create time was updated (error)\n");
+        } else {
+                printf("run_dir_createtime: create time was not updated (correct)\n");
+                ret = true;
+        }
+
+  out:
+
+        cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+        cli_rmdir(cli, dname);
+        if (!torture_close_connection(cli)) {
+                ret = false;
+        }
+        return ret;
+}
+
 
 static bool run_streamerror(int dummy)
@@ -6339 +7109 @@
         }
 
+        cli_unlink(cli, "\\testdir\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_rmdir(cli, dname);
 
@@ -6347 +7118 @@
         }
 
-        cli_qpathinfo(cli, streamname, &change_time, &access_time, &write_time,
+        cli_qpathinfo1(cli, streamname, &change_time, &access_time, &write_time,
                       &size, &mode);
         status = cli_nt_error(cli);
@@ -6651 +7422 @@
         TALLOC_FREE(dict);
 
+        return true;
+}
+
+static bool run_local_string_to_sid(int dummy) {
+        struct dom_sid sid;
+
+        if (string_to_sid(&sid, "S--1-5-32-545")) {
+                printf("allowing S--1-5-32-545\n");
+                return false;
+        }
+        if (string_to_sid(&sid, "S-1-5-32-+545")) {
+                printf("allowing S-1-5-32-+545\n");
+                return false;
+        }
+        if (string_to_sid(&sid, "S-1-2-3-4-5-6-7-8-9-0-1-2-3-4-5-6-7-8-9-0")) {
+                printf("allowing S-1-2-3-4-5-6-7-8-9-0-1-2-3-4-5-6-7-8-9-0\n");
+                return false;
+        }
+        if (string_to_sid(&sid, "S-1-5-32-545-abc")) {
+                printf("allowing S-1-5-32-545-abc\n");
+                return false;
+        }
+        if (!string_to_sid(&sid, "S-1-5-32-545")) {
+                printf("could not parse S-1-5-32-545\n");
+                return false;
+        }
+        if (!dom_sid_equal(&sid, &global_sid_Builtin_Users)) {
+                printf("mis-parsed S-1-5-32-545 as %s\n",
+                       sid_string_tos(&sid));
+                return false;
+        }
+        return true;
+}
+
+static bool run_local_binary_to_sid(int dummy) {
+        struct dom_sid *sid = talloc(NULL, struct dom_sid);
+        static const char good_binary_sid[] = {
+                0x1, /* revision number */
+                15, /* num auths */
+                0x1, 0x1, 0x1, 0x1, 0x1, 0x1, /* id_auth */
+                0x1, 0x1, 0x1, 0x1, /* auth[0] */
+                0x1, 0x1, 0x1, 0x1, /* auth[1] */
+                0x1, 0x1, 0x1, 0x1, /* auth[2] */
+                0x1, 0x1, 0x1, 0x1, /* auth[3] */
+                0x1, 0x1, 0x1, 0x1, /* auth[4] */
+                0x1, 0x1, 0x1, 0x1, /* auth[5] */
+                0x1, 0x1, 0x1, 0x1, /* auth[6] */
+                0x1, 0x1, 0x1, 0x1, /* auth[7] */
+                0x1, 0x1, 0x1, 0x1, /* auth[8] */
+                0x1, 0x1, 0x1, 0x1, /* auth[9] */
+                0x1, 0x1, 0x1, 0x1, /* auth[10] */
+                0x1, 0x1, 0x1, 0x1, /* auth[11] */
+                0x1, 0x1, 0x1, 0x1, /* auth[12] */
+                0x1, 0x1, 0x1, 0x1, /* auth[13] */
+                0x1, 0x1, 0x1, 0x1, /* auth[14] */
+        };
+
+        static const char long_binary_sid[] = {
+                0x1, /* revision number */
+                15, /* num auths */
+                0x1, 0x1, 0x1, 0x1, 0x1, 0x1, /* id_auth */
+                0x1, 0x1, 0x1, 0x1, /* auth[0] */
+                0x1, 0x1, 0x1, 0x1, /* auth[1] */
+                0x1, 0x1, 0x1, 0x1, /* auth[2] */
+                0x1, 0x1, 0x1, 0x1, /* auth[3] */
+                0x1, 0x1, 0x1, 0x1, /* auth[4] */
+                0x1, 0x1, 0x1, 0x1, /* auth[5] */
+                0x1, 0x1, 0x1, 0x1, /* auth[6] */
+                0x1, 0x1, 0x1, 0x1, /* auth[7] */
+                0x1, 0x1, 0x1, 0x1, /* auth[8] */
+                0x1, 0x1, 0x1, 0x1, /* auth[9] */
+                0x1, 0x1, 0x1, 0x1, /* auth[10] */
+                0x1, 0x1, 0x1, 0x1, /* auth[11] */
+                0x1, 0x1, 0x1, 0x1, /* auth[12] */
+                0x1, 0x1, 0x1, 0x1, /* auth[13] */
+                0x1, 0x1, 0x1, 0x1, /* auth[14] */
+                0x1, 0x1, 0x1, 0x1, /* auth[15] */
+                0x1, 0x1, 0x1, 0x1, /* auth[16] */
+                0x1, 0x1, 0x1, 0x1, /* auth[17] */
+        };
+
+        static const char long_binary_sid2[] = {
+                0x1, /* revision number */
+                32, /* num auths */
+                0x1, 0x1, 0x1, 0x1, 0x1, 0x1, /* id_auth */
+                0x1, 0x1, 0x1, 0x1, /* auth[0] */
+                0x1, 0x1, 0x1, 0x1, /* auth[1] */
+                0x1, 0x1, 0x1, 0x1, /* auth[2] */
+                0x1, 0x1, 0x1, 0x1, /* auth[3] */
+                0x1, 0x1, 0x1, 0x1, /* auth[4] */
+                0x1, 0x1, 0x1, 0x1, /* auth[5] */
+                0x1, 0x1, 0x1, 0x1, /* auth[6] */
+                0x1, 0x1, 0x1, 0x1, /* auth[7] */
+                0x1, 0x1, 0x1, 0x1, /* auth[8] */
+                0x1, 0x1, 0x1, 0x1, /* auth[9] */
+                0x1, 0x1, 0x1, 0x1, /* auth[10] */
+                0x1, 0x1, 0x1, 0x1, /* auth[11] */
+                0x1, 0x1, 0x1, 0x1, /* auth[12] */
+                0x1, 0x1, 0x1, 0x1, /* auth[13] */
+                0x1, 0x1, 0x1, 0x1, /* auth[14] */
+                0x1, 0x1, 0x1, 0x1, /* auth[15] */
+                0x1, 0x1, 0x1, 0x1, /* auth[16] */
+                0x1, 0x1, 0x1, 0x1, /* auth[17] */
+                0x1, 0x1, 0x1, 0x1, /* auth[18] */
+                0x1, 0x1, 0x1, 0x1, /* auth[19] */
+                0x1, 0x1, 0x1, 0x1, /* auth[20] */
+                0x1, 0x1, 0x1, 0x1, /* auth[21] */
+                0x1, 0x1, 0x1, 0x1, /* auth[22] */
+                0x1, 0x1, 0x1, 0x1, /* auth[23] */
+                0x1, 0x1, 0x1, 0x1, /* auth[24] */
+                0x1, 0x1, 0x1, 0x1, /* auth[25] */
+                0x1, 0x1, 0x1, 0x1, /* auth[26] */
+                0x1, 0x1, 0x1, 0x1, /* auth[27] */
+                0x1, 0x1, 0x1, 0x1, /* auth[28] */
+                0x1, 0x1, 0x1, 0x1, /* auth[29] */
+                0x1, 0x1, 0x1, 0x1, /* auth[30] */
+                0x1, 0x1, 0x1, 0x1, /* auth[31] */
+        };
+
+        if (!sid_parse(good_binary_sid, sizeof(good_binary_sid), sid)) {
+                return false;
+        }
+        if (sid_parse(long_binary_sid2, sizeof(long_binary_sid2), sid)) {
+                return false;
+        }
+        if (sid_parse(long_binary_sid, sizeof(long_binary_sid), sid)) {
+                return false;
+        }
         return true;
 }
@@ -6776 +7675 @@
 
  error:
-        d_fprintf(stderr, "test_stream(%s, %s, %s, %s)\n",
+        d_fprintf(stderr, "Do test_stream(%s, %s, %s, %s)\n",
                   fname, expected_base ? expected_base : "<NULL>",
                   expected_stream ? expected_stream : "<NULL>",
@@ -7166 +8065 @@
 }
 
+/*
+ * Just a dummy test to be run under a debugger. There's no real way
+ * to inspect the tevent_select specific function from outside of
+ * tevent_select.c.
+ */
+
+static bool run_local_tevent_select(int dummy)
+{
+        struct tevent_context *ev;
+        struct tevent_fd *fd1, *fd2;
+        bool result = false;
+
+        ev = tevent_context_init_byname(NULL, "select");
+        if (ev == NULL) {
+                d_fprintf(stderr, "tevent_context_init_byname failed\n");
+                goto fail;
+        }
+
+        fd1 = tevent_add_fd(ev, ev, 2, 0, NULL, NULL);
+        if (fd1 == NULL) {
+                d_fprintf(stderr, "tevent_add_fd failed\n");
+                goto fail;
+        }
+        fd2 = tevent_add_fd(ev, ev, 3, 0, NULL, NULL);
+        if (fd2 == NULL) {
+                d_fprintf(stderr, "tevent_add_fd failed\n");
+                goto fail;
+        }
+        TALLOC_FREE(fd2);
+
+        fd2 = tevent_add_fd(ev, ev, 1, 0, NULL, NULL);
+        if (fd2 == NULL) {
+                d_fprintf(stderr, "tevent_add_fd failed\n");
+                goto fail;
+        }
+
+        result = true;
+fail:
+        TALLOC_FREE(ev);
+        return result;
+}
+
 static double create_procs(bool (*fn)(int), bool *result)
 {
@@ -7173 +8114 @@
         int synccount;
         int tries = 8;
+        struct timeval start;
 
         synccount = 0;
@@ -7193 +8135 @@
         }
 
-        start_timer();
+        start = timeval_current();
 
         for (i=0;i<nprocs;i++) {
@@ -7214 +8156 @@
                         child_status[i] = getpid();
 
-                        while (child_status[i] && end_timer() < 5) smb_msleep(2);
+                        while (child_status[i] && timeval_elapsed(&start) < 5) smb_msleep(2);
 
                         child_status_out[i] = fn(i);
@@ -7228 +8170 @@
                 if (synccount == nprocs) break;
                 smb_msleep(10);
-        } while (end_timer() < 30);
+        } while (timeval_elapsed(&start) < 30);
 
         if (synccount != nprocs) {
                 printf("FAILED TO START %d CLIENTS (started %d)\n", nprocs, synccount);
                 *result = False;
-                return end_timer();
+                return timeval_elapsed(&start);
         }
 
         /* start the client load */
-        start_timer();
+        start = timeval_current();
 
         for (i=0;i<nprocs;i++) {
@@ -7256 +8198 @@
                 }
         }
-        return end_timer();
+        return timeval_elapsed(&start);
 }
 
@@ -7285 +8227 @@
         {"NEGNOWAIT", run_negprot_nowait, 0},
         {"NBENCH",  run_nbench, 0},
+        {"NBENCH2", run_nbench2, 0},
         {"OPLOCK1",  run_oplock1, 0},
         {"OPLOCK2",  run_oplock2, 0},
         {"OPLOCK3",  run_oplock3, 0},
+        {"OPLOCK4",  run_oplock4, 0},
         {"DIR",  run_dirtest, 0},
         {"DIR1",  run_dirtest1, 0},
+        {"DIR-CREATETIME",  run_dir_createtime, 0},
         {"DENY1",  torture_denytest1, 0},
         {"DENY2",  torture_denytest2, 0},
@@ -7297 +8242 @@
         {"RW2",  run_readwritemulti, FLAG_MULTIPROC},
         {"RW3",  run_readwritelarge, 0},
+        {"RW-SIGNING",  run_readwritelarge_signtest, 0},
         {"OPEN", run_opentest, 0},
         {"POSIX", run_simple_posix_open_test, 0},
+        {"POSIX-APPEND", run_posix_append, 0},
+        {"ASYNC-ECHO", run_async_echo, 0},
         { "UID-REGRESSION-TEST", run_uid_regression_test, 0},
         { "SHORTNAME-TEST", run_shortname_test, 0},
+        { "ADDRCHANGE", run_addrchange, 0},
 #if 1
         {"OPENATTR", run_openattrtest, 0},
@@ -7307 +8256 @@
         {"RENAME", run_rename, 0},
         {"DELETE", run_deletetest, 0},
+        {"DELETE-LN", run_deletetest_ln, 0},
         {"PROPERTIES", run_properties, 0},
         {"MANGLE", torture_mangle, 0},
@@ -7331 +8281 @@
         { "STREAMERROR", run_streamerror },
         { "NOTIFY-BENCH", run_notify_bench },
+        { "BAD-NBT-SESSION", run_bad_nbt_session },
+        { "SMB-ANY-CONNECT", run_smb_any_connect },
         { "LOCAL-SUBSTITUTE", run_local_substitute, 0},
         { "LOCAL-GENCACHE", run_local_gencache, 0},
@@ -7339 +8291 @@
         { "LOCAL-STREAM-NAME", run_local_stream_name, 0},
         { "LOCAL-WBCLIENT", run_local_wbclient, 0},
+        { "LOCAL-string_to_sid", run_local_string_to_sid, 0},
+        { "LOCAL-binary_to_sid", run_local_binary_to_sid, 0},
         { "LOCAL-DBTRANS", run_local_dbtrans, 0},
+        { "LOCAL-TEVENT-SELECT", run_local_tevent_select, 0},
         {NULL, NULL, 0}};
 
@@ -7375 +8330 @@
                                 }
                         } else {
-                                start_timer();
+                                struct timeval start;
+                                start = timeval_current();
                                 if (!torture_ops[i].fn(0)) {
                                         ret = False;
                                         printf("TEST %s FAILED!\n", name);
                                 }
-                                t = end_timer();
+                                t = timeval_elapsed(&start);
                         }
                         printf("%s took %g secs\n\n", name, t);
@@ -7445 +8401 @@
         int seed = time(NULL);
 
-        dbf = x_stdout;
-
 #ifdef HAVE_SETBUFFER
         setbuffer(stdout, NULL, 0);
 #endif
 
+        setup_logging("smbtorture", DEBUG_STDOUT);
+
         load_case_tables();
-
-        setup_logging("smbtorture", true);
 
         if (is_default_dyn_CONFIGFILE()) {
@@ -7519 +8473 @@
                         break;
                 case 'd':
-                        DEBUGLEVEL = atoi(optarg);
+                        lp_set_cmdline("log level", optarg);
                         break;
                 case 'O':

trunk/server/source3/torture/utable.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "torture/proto.h"
+#include "../libcli/security/security.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
 
 bool torture_utable(int dummy)
@@ -39 +44 @@
 
         cli_mkdir(cli, "\\utable");
-        cli_unlink(cli, "\\utable\\*", aSYSTEM | aHIDDEN);
+        cli_unlink(cli, "\\utable\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
         for (c=1; c < 0x10000; c++) {
@@ -69 +74 @@
 
                 cli_close(cli, fnum);
-                cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+                cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
                 if (c % 100 == 0) {
@@ -132 +137 @@
         memset(equiv, 0, sizeof(equiv));
 
-        cli_unlink(cli, "\\utable\\*", aSYSTEM | aHIDDEN);
+        cli_unlink(cli, "\\utable\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_rmdir(cli, "\\utable");
         if (!NT_STATUS_IS_OK(cli_mkdir(cli, "\\utable"))) {
@@ -158 +163 @@
                 size = 0;
 
-                if (!cli_qfileinfo(cli, fnum, NULL, &size, 
-                                   NULL, NULL, NULL, NULL, NULL)) continue;
+                if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
+                                             cli, fnum, NULL, &size,
+                                             NULL, NULL, NULL, NULL, NULL))) {
+                        continue;
+                }
 
                 if (size > 0) {
@@ -183 +191 @@
                 }
 
-                cli_write(cli, fnum, 0, (char *)&c, size, sizeof(c));
+                cli_writeall(cli, fnum, 0, (uint8_t *)&c, size, sizeof(c),
+                             NULL);
                 cli_close(cli, fnum);
         }
 
-        cli_unlink(cli, "\\utable\\*", aSYSTEM | aHIDDEN);
+        cli_unlink(cli, "\\utable\\*", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
         cli_rmdir(cli, "\\utable");
 

trunk/server/source3/torture/vfstest.c

@@ -25 +25 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
+#include "popt_common.h"
 #include "vfstest.h"
+#include "../libcli/smbreadline/smbreadline.h"
 
 /* List to hold groups of commands */
@@ -32 +35 @@
         struct cmd_set *cmd_set;
 } *cmd_list;
-
-int get_client_fd(void)
-{
-        return -1;
-}
 
 /****************************************************************************
@@ -192 +190 @@
 
         if (argc == 2) {
-                DEBUGLEVEL = atoi(argv[1]);
+                lp_set_cmdline("log level", argv[1]);
         }
 
@@ -415 +413 @@
 }
 
-static int server_fd = -1;
 int last_message = -1;
-
-int smbd_server_fd(void)
-{
-                return server_fd;
-}
-
-void reload_printers(void)
-{
-        return;
-}
-
-/****************************************************************************
- Reload the services file.
-**************************************************************************/
-
-bool reload_services(bool test)
-{
-        bool ret;
-
-        if (lp_loaded()) {
-                const char *fname = lp_configfile();
-                if (file_exist(fname) &&
-                    !strcsequal(fname, get_dyn_CONFIGFILE())) {
-                        set_dyn_CONFIGFILE(fname);
-                        test = False;
-                }
-        }
-
-        reopen_logs();
-
-        if (test && !lp_file_list_changed())
-                return(True);
-
-        lp_killunused(conn_snum_used);
-
-        ret = lp_load(get_dyn_CONFIGFILE(), False, False, True, True);
-
-        /* perhaps the config filename is now set */
-        if (!test)
-                reload_services(True);
-
-        reopen_logs();
-
-        load_interfaces();
-
-        {
-                if (smbd_server_fd() != -1) {      
-                        set_socket_options(smbd_server_fd(),"SO_KEEPALIVE");
-                        set_socket_options(smbd_server_fd(),
-                                           lp_socket_options());
-                }
-        }
-
-        mangle_reset_cache();
-        reset_stat_cache();
-
-        /* this forces service parameters to be flushed */
-        set_current_service(NULL,0,True);
-
-        return (ret);
-}
 
 struct event_context *smbd_event_context(void)
@@ -487 +423 @@
         }
         return ctx;
-}
-
-struct messaging_context *smbd_messaging_context(void)
-{
-        static struct messaging_context *ctx;
-
-        if (!ctx && !(ctx = messaging_init(NULL, server_id_self(),
-                                           smbd_event_context()))) {
-                smb_panic("Could not init smbd messaging context\n");
-        }
-        return ctx;
-}
-
-struct memcache *smbd_memcache(void)
-{
-        static struct memcache *cache;
-
-        if (!cache
-            && !(cache = memcache_init(NULL,
-                                       lp_max_stat_cache_size()*1024))) {
-
-                smb_panic("Could not init smbd memcache");
-        }
-        return cache;
 }
 
@@ -547 +459 @@
         poptFreeContext(pc);
 
+        lp_load_initial_only(get_dyn_CONFIGFILE());
+
         /* TODO: check output */
-        reload_services(False);
+        reload_services(smbd_messaging_context(), -1, False);
 
         /* the following functions are part of the Samba debugging
            facilities.  See lib/debug.c */
-        setup_logging("vfstest", True);
+        setup_logging("vfstest", DEBUG_STDOUT);
         
         /* Load command lists */