libcli/smb: pass smbXcli_tcon to smb2cli_flush*()

[kai/samba.git] / source3 / torture / utable.c

diff --git a/source3/torture/utable.c b/source3/torture/utable.c
index e7ee00a8a36e9bda4d605512f91aad31a4800e40..a2db3ba0fea934a26a708d785554df2a3fdeed79 100644 (file)
--- a/source3/torture/utable.c
+++ b/source3/torture/utable.c
@@ -21,6 +21,7 @@
 #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)
@@ -42,7 +43,7 @@ bool torture_utable(int dummy)
        memset(valid, 0, sizeof(valid));
 
        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++) {
                size_t size = 0;
@@ -61,7 +62,7 @@ bool torture_utable(int dummy)
                p[len] = 0;
                fstrcat(fname,"_a_long_extension");
 
-               if (!NT_STATUS_IS_OK(cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
+               if (!NT_STATUS_IS_OK(cli_openx(cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
                                DENY_NONE, &fnum))) {
                        continue;
                }
@@ -77,7 +78,7 @@ bool torture_utable(int dummy)
                }
 
                cli_close(cli, fnum);
-               cli_unlink(cli, fname, aSYSTEM | aHIDDEN);
+               cli_unlink(cli, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
 
                if (c % 100 == 0) {
                        printf("%d (%d/%d)\r", c, chars_allowed, alt_allowed);
@@ -144,7 +145,7 @@ bool torture_casetable(int dummy)
 
        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"))) {
                printf("Failed to create utable directory!\n");
@@ -152,7 +153,7 @@ bool torture_casetable(int dummy)
        }
 
        for (c=1; c < 0x10000; c++) {
-               SMB_OFF_T size;
+               off_t size;
 
                if (c == '.' || c == '\\') continue;
 
@@ -187,7 +188,7 @@ bool torture_casetable(int dummy)
                                return False;
                        }
 
-                       cli_read(cli, fnum, (char *)c2, 0, size);
+                       cli_read(cli, fnum, (char *)c2, 0, size, NULL);
                        printf("%04x: ", c);
                        equiv[c][0] = c;
                        for (i=0; i<size/sizeof(int); i++) {
@@ -198,11 +199,12 @@ bool torture_casetable(int dummy)
                        fflush(stdout);
                }
 
-               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");
 
        return True;