Changeset 745 for trunk/server/source3/torture/locktest.c

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/locktest.c (modified) (5 diffs)

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++) {