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

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