diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
commit | 6da26870e0ae5acd6ff49a30ec2f6886b44d095e (patch) | |
tree | 850c71039563c16a5d563c47e7ba2ab645baf198 /source3/torture/utable.c | |
parent | 6925a799d04c6fa59dd2ddef1f5510f9bb7d17d1 (diff) | |
parent | 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 (diff) | |
download | samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.gz samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.bz2 samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.zip |
Merge 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 as Samba-4.0alpha16
Diffstat (limited to 'source3/torture/utable.c')
-rw-r--r-- | source3/torture/utable.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/torture/utable.c b/source3/torture/utable.c index e7ee00a8a3..4c6605d921 100644 --- 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; @@ -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"); @@ -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; |