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

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");