Changeset 745 for trunk/server/source3/torture/locktest2.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/locktest2.c (modified) (5 diffs)

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;