s4-dns: dlz_bind9: Fix ipv6 updates

[samba.git] / source3 / torture / denytest.c

diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index 63448d44f312a14b6b4f2ab0404ef27b9b167530..5b0eeec2fa75d8f1acbab1783d32866f7f2a1eed 100644 (file)
--- a/source3/torture/denytest.c
+++ b/source3/torture/denytest.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "torture/proto.h"
+#include "libsmb/libsmb.h"
 
 extern bool torture_showall;
 
@@ -1411,8 +1412,9 @@ bool torture_denytest1(int dummy)
        uint16_t fnum1, fnum2;
        int i;
        bool correct = True;
-       NTSTATUS ret1, ret2;
+       NTSTATUS ret1, ret2, status;
        const char *fnames[2] = {"\\denytest1.dat", "\\denytest1.exe"};
+       size_t nread;
 
        if (!torture_open_connection(&cli1, 0)) {
                return False;
@@ -1421,9 +1423,9 @@ bool torture_denytest1(int dummy)
        printf("starting denytest1\n");
 
        for (i=0;i<2;i++) {
-               cli_unlink(cli1, fnames[i], aSYSTEM | aHIDDEN);
-               cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE, &fnum1);
-               cli_writeall(cli1, fnum1, 0, (uint8_t *)fnames[i], 0,
+               cli_unlink(cli1, fnames[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+               cli_openx(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE, &fnum1);
+               cli_writeall(cli1, fnum1, 0, (const uint8_t *)fnames[i], 0,
                             strlen(fnames[i]), NULL);
                cli_close(cli1, fnum1);
        }
@@ -1436,10 +1438,10 @@ bool torture_denytest1(int dummy)
 
                progress_bar(i, ARRAY_SIZE(denytable1));
 
-               ret1 = cli_open(cli1, fname, 
+               ret1 = cli_openx(cli1, fname, 
                                 denytable1[i].mode1,
                                 denytable1[i].deny1, &fnum1);
-               ret2 = cli_open(cli1, fname, 
+               ret2 = cli_openx(cli1, fname, 
                                 denytable1[i].mode2,
                                 denytable1[i].deny2, &fnum2);
 
@@ -1450,7 +1452,10 @@ bool torture_denytest1(int dummy)
                } else {
                        char x = 1;
                        res = A_0;
-                       if (cli_read(cli1, fnum2, (char *)&x, 0, 1) == 1) {
+
+                       status = cli_read(cli1, fnum2, (char *)&x, 0, 1,
+                                         &nread);
+                       if (NT_STATUS_IS_OK(status) && nread == 1) {
                                res += A_R;
                        }
                        if (NT_STATUS_IS_OK(cli_writeall(cli1, fnum2, 0,
@@ -1484,7 +1489,7 @@ bool torture_denytest1(int dummy)
        }
 
        for (i=0;i<2;i++) {
-               cli_unlink(cli1, fnames[i], aSYSTEM | aHIDDEN);
+               cli_unlink(cli1, fnames[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        }
                
        if (!torture_close_connection(cli1)) {
@@ -1505,8 +1510,9 @@ bool torture_denytest2(int dummy)
        uint16_t fnum1, fnum2;
        int i;
        bool correct = True;
-       NTSTATUS ret1, ret2;
+       NTSTATUS ret1, ret2, status;
        const char *fnames[2] = {"\\denytest2.dat", "\\denytest2.exe"};
+       size_t nread;
 
        if (!torture_open_connection(&cli1, 0) || !torture_open_connection(&cli2, 1)) {
                return False;
@@ -1515,9 +1521,9 @@ bool torture_denytest2(int dummy)
        printf("starting denytest2\n");
 
        for (i=0;i<2;i++) {
-               cli_unlink(cli1, fnames[i], aSYSTEM | aHIDDEN);
-               cli_open(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE, &fnum1);
-               cli_writeall(cli1, fnum1, 0, (uint8_t *)fnames[i], 0,
+               cli_unlink(cli1, fnames[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+               cli_openx(cli1, fnames[i], O_RDWR|O_CREAT, DENY_NONE, &fnum1);
+               cli_writeall(cli1, fnum1, 0, (const uint8_t *)fnames[i], 0,
                             strlen(fnames[i]), NULL);
                cli_close(cli1, fnum1);
        }
@@ -1528,10 +1534,10 @@ bool torture_denytest2(int dummy)
 
                progress_bar(i, ARRAY_SIZE(denytable2));
 
-               ret1 = cli_open(cli1, fname, 
+               ret1 = cli_openx(cli1, fname, 
                                 denytable2[i].mode1,
                                 denytable2[i].deny1, &fnum1);
-               ret2 = cli_open(cli2, fname, 
+               ret2 = cli_openx(cli2, fname, 
                                 denytable2[i].mode2,
                                 denytable2[i].deny2, &fnum2);
 
@@ -1542,9 +1548,12 @@ bool torture_denytest2(int dummy)
                } else {
                        char x = 1;
                        res = A_0;
-                       if (cli_read(cli2, fnum2, (char *)&x, 0, 1) == 1) {
-                               res += A_R;
-                       }
+
+                        status = cli_read(cli2, fnum2, (char *)&x, 0, 1,
+                                          &nread);
+                        if (NT_STATUS_IS_OK(status) && nread == 1) {
+                                res += A_R;
+                        }
                        if (NT_STATUS_IS_OK(cli_writeall(cli2, fnum2, 0,
                                                         (uint8_t *)&x, 0, 1,
                                                         NULL))) {
@@ -1576,7 +1585,7 @@ bool torture_denytest2(int dummy)
        }
                
        for (i=0;i<2;i++) {
-               cli_unlink(cli1, fnames[i], aSYSTEM | aHIDDEN);
+               cli_unlink(cli1, fnames[i], FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
        }
 
        if (!torture_close_connection(cli1)) {