From bce94d35f125eaeaa4db7866503418b8f281edf2 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Tue, 8 Apr 2003 08:05:01 +0000 Subject: Integrate abartlet's t_push_ucs2 test into test framework: - Build t_push_ucs2 as part of check-programs, the prerequisite for "make check". - t_push_ucs2.c: Load configuration from /dev/null so that we get a unix_charset of UTF-8 and can do meaningful UCS2 tests. Better comment. - Add a test to strings.py which tries conversion UTF8->UCS2->UTF8 and checks the results. Do this for English, Latin-1, and Katakana strings. - Add Python module with symbolic names for a handful of UNICODE characters. (This used to be commit 275e095c92ac74815ab9e388a0e83cdb7ddd85f3) --- source3/torture/t_push_ucs2.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source3/torture') diff --git a/source3/torture/t_push_ucs2.c b/source3/torture/t_push_ucs2.c index ca04394acc..86ae1b9b6c 100644 --- a/source3/torture/t_push_ucs2.c +++ b/source3/torture/t_push_ucs2.c @@ -30,10 +30,14 @@ static int check_push_ucs2(const char *orig) int main(int argc, char *argv[]) { int i, ret = 0; - + + /* Needed to initialize character set */ + lp_load("/dev/null", True, False, False); + if (argc != 2) { fprintf(stderr, "usage: %s STRING1\n" - "Converts a string, prints the results of strcmp\n", + "Checks that a string translated UNIX->UCS2->UNIX is unchanged\n" + "Should be always 0\n", argv[0]); return 2; } -- cgit From 80cd7c552ff95b3aa4caf79768af5b1e5c07c506 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Wed, 9 Apr 2003 05:22:17 +0000 Subject: t_push_ucs2, t_strcmp: Run tests only once by default, rather than 10000 times. (In theory they should be pure functions....) You can specify a parameter to repeat them if you want to e.g. measure performance. (This used to be commit 92acecd28c3374abcadbff0ab9cb765411f453f4) --- source3/torture/t_push_ucs2.c | 9 ++++++--- source3/torture/t_strcmp.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'source3/torture') diff --git a/source3/torture/t_push_ucs2.c b/source3/torture/t_push_ucs2.c index 86ae1b9b6c..8bfc6f7ad9 100644 --- a/source3/torture/t_push_ucs2.c +++ b/source3/torture/t_push_ucs2.c @@ -30,19 +30,22 @@ static int check_push_ucs2(const char *orig) int main(int argc, char *argv[]) { int i, ret = 0; + int count = 1; /* Needed to initialize character set */ lp_load("/dev/null", True, False, False); - if (argc != 2) { - fprintf(stderr, "usage: %s STRING1\n" + if (argc < 2) { + fprintf(stderr, "usage: %s STRING1 [COUNT]\n" "Checks that a string translated UNIX->UCS2->UNIX is unchanged\n" "Should be always 0\n", argv[0]); return 2; } + if (argc >= 3) + count = atoi(argv[2]); - for (i = 0; ((i < 10000) && (!ret)); i++) + for (i = 0; ((i < count) && (!ret)); i++) ret = check_push_ucs2(argv[1]); printf("%d\n", ret); diff --git a/source3/torture/t_strcmp.c b/source3/torture/t_strcmp.c index 1d26ad22de..47327a0e06 100644 --- a/source3/torture/t_strcmp.c +++ b/source3/torture/t_strcmp.c @@ -9,15 +9,18 @@ int main(int argc, char *argv[]) { int i, ret; + int iters = 1; - if (argc != 3) { - fprintf(stderr, "usage: %s STRING1 STRING2\n" + if (argc < 3) { + fprintf(stderr, "usage: %s STRING1 STRING2 [ITERS]\n" "Compares two strings, prints the results of StrCaseCmp\n", argv[0]); return 2; } + if (argc >= 4) + iters = atoi(argv[3]); - for (i = 0; i < 10000; i++) + for (i = 0; i < iters; i++) ret = StrCaseCmp(argv[1], argv[2]); printf("%d\n", ret); -- cgit From 5b70d850479f026267d8e7f842d4ad452a04638f Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Wed, 9 Apr 2003 05:31:39 +0000 Subject: Set character set to default (UTF-8) before running tests. (This used to be commit b20d8b49701b532d4770197c5d08fa092234bf8e) --- source3/torture/t_strcmp.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/torture') diff --git a/source3/torture/t_strcmp.c b/source3/torture/t_strcmp.c index 47327a0e06..bc8640ee55 100644 --- a/source3/torture/t_strcmp.c +++ b/source3/torture/t_strcmp.c @@ -11,6 +11,9 @@ int main(int argc, char *argv[]) int i, ret; int iters = 1; + /* Needed to initialize character set */ + lp_load("/dev/null", True, False, False); + if (argc < 3) { fprintf(stderr, "usage: %s STRING1 STRING2 [ITERS]\n" "Compares two strings, prints the results of StrCaseCmp\n", -- cgit From 80b4dc47132ce5c4b0212cab8e719f950c9d29f3 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 9 Apr 2003 22:32:04 +0000 Subject: Ensure we have WinXP-like semantics for checking TIDs and FIDs. Add torture test to ensure this is so. Jeremy. (This used to be commit e07dd4d93d2bf6ed83dd055efd29d11f5cd66a36) --- source3/torture/torture.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to 'source3/torture') diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 5935c8c06e..0db4630845 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -171,6 +171,22 @@ BOOL torture_open_connection(struct cli_state **c) return True; } +BOOL torture_cli_session_setup2(struct cli_state *cli, uint16 *new_vuid) +{ + uint16 old_vuid = cli->vuid; + fstring old_user_name; + size_t passlen = strlen(password); + BOOL ret; + + fstrcpy(old_user_name, cli->user_name); + cli->vuid = 0; + ret = cli_session_setup(cli, username, password, passlen, password, passlen, workgroup); + *new_vuid = cli->vuid; + cli->vuid = old_vuid; + fstrcpy(cli->user_name, old_user_name); + return ret; +} + BOOL torture_close_connection(struct cli_state *c) { @@ -1935,6 +1951,54 @@ static BOOL run_fdpasstest(int dummy) return True; } +static BOOL run_fdsesstest(int dummy) +{ + struct cli_state *cli; + uint16 new_vuid; + uint16 saved_vuid; + const char *fname = "\\fdsess.tst"; + int fnum1; + pstring buf; + + if (!torture_open_connection(&cli)) + return False; + cli_sockopt(cli, sockops); + + if (!torture_cli_session_setup2(cli, &new_vuid)) + return False; + + printf("starting fdsesstest\n"); + + cli_unlink(cli, fname); + + fnum1 = cli_open(cli, fname, O_RDWR|O_CREAT|O_EXCL, DENY_NONE); + if (fnum1 == -1) { + printf("open of %s failed (%s)\n", fname, cli_errstr(cli)); + return False; + } + + if (cli_write(cli, fnum1, 0, "hello world\n", 0, 13) != 13) { + printf("write failed (%s)\n", cli_errstr(cli)); + return False; + } + + saved_vuid = cli->vuid; + cli->vuid = new_vuid; + + if (cli_read(cli, fnum1, buf, 0, 13) == 13) { + printf("read succeeded! nasty security hole [%s]\n", + buf); + return False; + } + + cli_close(cli, fnum1); + cli_unlink(cli, fname); + + torture_close_connection(cli); + + printf("finished fdsesstest\n"); + return True; +} /* This test checks that @@ -4448,6 +4512,7 @@ static struct { {"TCON2", run_tcon2_test, 0}, {"IOCTL", torture_ioctl_test, 0}, {"CHKPATH", torture_chkpath_test, 0}, + {"FDSESS", run_fdsesstest, 0}, {NULL, NULL, 0}}; -- cgit From dfdb51ca4576c5de6b1d09aaa1e2adb18d115849 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 10 Apr 2003 01:11:21 +0000 Subject: Added using different cnum test. WinXP and Samba now pass - Win2k fails. Jeremy. (This used to be commit bc094789b972ac5ccc7ea3944c7ddb98581cf613) --- source3/torture/torture.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'source3/torture') diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 0db4630845..5ff7c3bb2d 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -1956,9 +1956,12 @@ static BOOL run_fdsesstest(int dummy) struct cli_state *cli; uint16 new_vuid; uint16 saved_vuid; + uint16 new_cnum; + uint16 saved_cnum; const char *fname = "\\fdsess.tst"; int fnum1; pstring buf; + BOOL ret = True; if (!torture_open_connection(&cli)) return False; @@ -1967,6 +1970,12 @@ static BOOL run_fdsesstest(int dummy) if (!torture_cli_session_setup2(cli, &new_vuid)) return False; + saved_cnum = cli->cnum; + if (!cli_send_tconX(cli, share, "?????", "", 1)) + return False; + new_cnum = cli->cnum; + cli->cnum = saved_cnum; + printf("starting fdsesstest\n"); cli_unlink(cli, fname); @@ -1986,18 +1995,29 @@ static BOOL run_fdsesstest(int dummy) cli->vuid = new_vuid; if (cli_read(cli, fnum1, buf, 0, 13) == 13) { - printf("read succeeded! nasty security hole [%s]\n", + printf("read succeeded with different vuid! nasty security hole [%s]\n", buf); - return False; + ret = False; + } + cli->vuid = saved_vuid; + + /* Try with same vuid, different cnum. */ + cli->cnum = new_cnum; + + if (cli_read(cli, fnum1, buf, 0, 13) == 13) { + printf("read succeeded with different cnum![%s]\n", + buf); + ret = False; } + cli->cnum = saved_cnum; cli_close(cli, fnum1); cli_unlink(cli, fname); torture_close_connection(cli); printf("finished fdsesstest\n"); - return True; + return ret; } /* -- cgit From 5b51fc4f065e9e68eefb530eb99ad8da9f4e5d28 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 11 Apr 2003 23:32:00 +0000 Subject: smbcquota patch from metze (This used to be commit 74fab8f0d24004b1dfd5ce0fd7402895652f941f) --- source3/torture/nbio.c | 4 +- source3/torture/torture.c | 157 +++++++++++++++++++++++----------------------- source3/torture/utable.c | 4 +- 3 files changed, 84 insertions(+), 81 deletions(-) (limited to 'source3/torture') diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c index 2d519b40ba..d8d3ca0c09 100644 --- a/source3/torture/nbio.c +++ b/source3/torture/nbio.c @@ -148,12 +148,12 @@ void nb_createx(char *fname, desired_access = FILE_READ_DATA | FILE_WRITE_DATA; } - fd = cli_nt_create_full(c, fname, + fd = cli_nt_create_full(c, fname, 0, desired_access, 0x0, FILE_SHARE_READ|FILE_SHARE_WRITE, create_disposition, - create_options); + create_options, 0); if (fd == -1 && handle != -1) { printf("ERROR: cli_nt_create_full failed for %s - %s\n", fname, cli_errstr(c)); diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 5ff7c3bb2d..00d5b86ff8 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -2778,9 +2778,9 @@ static BOOL run_deletetest(int dummy) cli_setatr(cli1, fname, 0, 0); cli_unlink(cli1, fname); - fnum1 = cli_nt_create_full(cli1, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL, + fnum1 = cli_nt_create_full(cli1, fname, 0, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_DELETE, FILE_OVERWRITE_IF, - FILE_DELETE_ON_CLOSE); + FILE_DELETE_ON_CLOSE, 0); if (fnum1 == -1) { printf("[1] open of %s failed (%s)\n", fname, cli_errstr(cli1)); @@ -2808,9 +2808,9 @@ static BOOL run_deletetest(int dummy) cli_setatr(cli1, fname, 0, 0); cli_unlink(cli1, fname); - fnum1 = cli_nt_create_full(cli1, fname, GENERIC_ALL_ACCESS, + fnum1 = cli_nt_create_full(cli1, fname, 0, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, - FILE_OVERWRITE_IF, 0); + FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("[2] open of %s failed (%s)\n", fname, cli_errstr(cli1)); @@ -2846,8 +2846,8 @@ static BOOL run_deletetest(int dummy) cli_setatr(cli1, fname, 0, 0); cli_unlink(cli1, fname); - fnum1 = cli_nt_create_full(cli1, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("[3] open - 1 of %s failed (%s)\n", fname, cli_errstr(cli1)); @@ -2858,8 +2858,8 @@ static BOOL run_deletetest(int dummy) /* This should fail with a sharing violation - open for delete is only compatible with SHARE_DELETE. */ - fnum2 = cli_nt_create_full(cli1, fname, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0); + fnum2 = cli_nt_create_full(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, 0, 0); if (fnum2 != -1) { printf("[3] open - 2 of %s succeeded - should have failed.\n", fname); @@ -2869,8 +2869,8 @@ static BOOL run_deletetest(int dummy) /* This should succeed. */ - fnum2 = cli_nt_create_full(cli1, fname, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0); + fnum2 = cli_nt_create_full(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0, 0); if (fnum2 == -1) { printf("[3] open - 2 of %s failed (%s)\n", fname, cli_errstr(cli1)); @@ -2914,8 +2914,8 @@ static BOOL run_deletetest(int dummy) cli_setatr(cli1, fname, 0, 0); cli_unlink(cli1, fname); - fnum1 = cli_nt_create_full(cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, - FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, + FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("[4] open of %s failed (%s)\n", fname, cli_errstr(cli1)); @@ -2924,8 +2924,8 @@ static BOOL run_deletetest(int dummy) } /* This should succeed. */ - fnum2 = cli_nt_create_full(cli1, fname, GENERIC_READ_ACCESS, - FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0); + fnum2 = cli_nt_create_full(cli1, fname, 0, GENERIC_READ_ACCESS, + FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0, 0); if (fnum2 == -1) { printf("[4] open - 2 of %s failed (%s)\n", fname, cli_errstr(cli1)); correct = False; @@ -2945,8 +2945,9 @@ static BOOL run_deletetest(int dummy) } /* This should fail - no more opens once delete on close set. */ - fnum2 = cli_nt_create_full(cli1, fname, GENERIC_READ_ACCESS, - FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0); + fnum2 = cli_nt_create_full(cli1, fname, 0, GENERIC_READ_ACCESS, + FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, + FILE_OPEN, 0, 0); if (fnum2 != -1) { printf("[4] open - 3 of %s succeeded ! Should have failed.\n", fname ); correct = False; @@ -2991,9 +2992,9 @@ static BOOL run_deletetest(int dummy) cli_setatr(cli1, fname, 0, 0); cli_unlink(cli1, fname); - fnum1 = cli_nt_create_full(cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA, + fnum1 = cli_nt_create_full(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, - FILE_OVERWRITE_IF, 0); + FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("[6] open of %s failed (%s)\n", fname, cli_errstr(cli1)); @@ -3021,8 +3022,8 @@ static BOOL run_deletetest(int dummy) cli_setatr(cli1, fname, 0, 0); cli_unlink(cli1, fname); - fnum1 = cli_nt_create_full(cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, - FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, + FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("[7] open of %s failed (%s)\n", fname, cli_errstr(cli1)); @@ -3077,8 +3078,9 @@ static BOOL run_deletetest(int dummy) cli_sockopt(cli1, sockops); - fnum1 = cli_nt_create_full(cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, - FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, + FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, + FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("[8] open of %s failed (%s)\n", fname, cli_errstr(cli1)); @@ -3086,8 +3088,9 @@ static BOOL run_deletetest(int dummy) goto fail; } - fnum2 = cli_nt_create_full(cli2, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, - FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0); + fnum2 = cli_nt_create_full(cli2, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, + FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, + FILE_OPEN, 0, 0); if (fnum2 == -1) { printf("[8] open of %s failed (%s)\n", fname, cli_errstr(cli1)); @@ -3123,8 +3126,8 @@ static BOOL run_deletetest(int dummy) printf("eighth delete on close test succeeded.\n"); /* This should fail - we need to set DELETE_ACCESS. */ - fnum1 = cli_nt_create_full(cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA, - FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, FILE_DELETE_ON_CLOSE); + fnum1 = cli_nt_create_full(cli1, fname, 0,FILE_READ_DATA|FILE_WRITE_DATA, + FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, FILE_DELETE_ON_CLOSE, 0); if (fnum1 != -1) { printf("[9] open of %s succeeded should have failed!\n", fname); @@ -3134,8 +3137,8 @@ static BOOL run_deletetest(int dummy) printf("ninth delete on close test succeeded.\n"); - fnum1 = cli_nt_create_full(cli1, fname, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, - FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, FILE_DELETE_ON_CLOSE); + fnum1 = cli_nt_create_full(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA|DELETE_ACCESS, + FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, FILE_DELETE_ON_CLOSE, 0); if (fnum1 == -1) { printf("[10] open of %s failed (%s)\n", fname, cli_errstr(cli1)); correct = False; @@ -3243,20 +3246,20 @@ static BOOL run_xcopy(int dummy) return False; } - fnum1 = cli_nt_create_full(cli1, fname, + fnum1 = cli_nt_create_full(cli1, fname, 0, FIRST_DESIRED_ACCESS, FILE_ATTRIBUTE_ARCHIVE, FILE_SHARE_NONE, FILE_OVERWRITE_IF, - 0x4044); + 0x4044, 0); if (fnum1 == -1) { printf("First open failed - %s\n", cli_errstr(cli1)); return False; } - fnum2 = cli_nt_create_full(cli1, fname, + fnum2 = cli_nt_create_full(cli1, fname, 0, SECOND_DESIRED_ACCESS, 0, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, - 0x200000); + 0x200000, 0); if (fnum2 == -1) { printf("second open failed - %s\n", cli_errstr(cli1)); return False; @@ -3288,8 +3291,8 @@ static BOOL run_rename(int dummy) cli_unlink(cli1, fname); cli_unlink(cli1, fname1); - fnum1 = cli_nt_create_full(cli1, fname, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ, FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("First open failed - %s\n", cli_errstr(cli1)); @@ -3310,11 +3313,11 @@ static BOOL run_rename(int dummy) cli_unlink(cli1, fname); cli_unlink(cli1, fname1); - fnum1 = cli_nt_create_full(cli1, fname,GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL, + fnum1 = cli_nt_create_full(cli1, fname, 0, GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL, #if 0 - FILE_SHARE_DELETE|FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0); + FILE_SHARE_DELETE|FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0); #else - FILE_SHARE_DELETE|FILE_SHARE_READ, FILE_OVERWRITE_IF, 0); + FILE_SHARE_DELETE|FILE_SHARE_READ, FILE_OVERWRITE_IF, 0, 0); #endif if (fnum1 == -1) { @@ -3337,8 +3340,8 @@ static BOOL run_rename(int dummy) cli_unlink(cli1, fname); cli_unlink(cli1, fname1); - fnum1 = cli_nt_create_full(cli1, fname,READ_CONTROL_ACCESS, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, READ_CONTROL_ACCESS, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("Third open failed - %s\n", cli_errstr(cli1)); @@ -3350,8 +3353,8 @@ static BOOL run_rename(int dummy) { int fnum2; - fnum2 = cli_nt_create_full(cli1, fname,DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0); + fnum2 = cli_nt_create_full(cli1, fname, 0, DELETE_ACCESS, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0); if (fnum2 == -1) { printf("Fourth open failed - %s\n", cli_errstr(cli1)); @@ -3405,8 +3408,8 @@ static BOOL run_pipe_number(int dummy) cli_sockopt(cli1, sockops); while(1) { - fnum = cli_nt_create_full(cli1, pipe_name,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN_IF, 0); + fnum = cli_nt_create_full(cli1, pipe_name, 0, FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN_IF, 0, 0); if (fnum == -1) { printf("Open of pipe %s failed with error (%s)\n", pipe_name, cli_errstr(cli1)); @@ -3594,16 +3597,16 @@ static BOOL run_opentest(int dummy) printf("TEST #1 testing 2 non-io opens (no delete)\n"); - fnum1 = cli_nt_create_full(cli1, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("test 1 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1)); return False; } - fnum2 = cli_nt_create_full(cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_NONE, FILE_OPEN_IF, 0); + fnum2 = cli_nt_create_full(cli2, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_NONE, FILE_OPEN_IF, 0, 0); if (fnum2 == -1) { printf("test 1 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2)); @@ -3625,16 +3628,16 @@ static BOOL run_opentest(int dummy) printf("TEST #2 testing 2 non-io opens (first with delete)\n"); - fnum1 = cli_nt_create_full(cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("test 2 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1)); return False; } - fnum2 = cli_nt_create_full(cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_NONE, FILE_OPEN_IF, 0); + fnum2 = cli_nt_create_full(cli2, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_NONE, FILE_OPEN_IF, 0, 0); if (fnum2 == -1) { printf("test 2 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2)); @@ -3656,16 +3659,16 @@ static BOOL run_opentest(int dummy) printf("TEST #3 testing 2 non-io opens (second with delete)\n"); - fnum1 = cli_nt_create_full(cli1, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("test 3 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1)); return False; } - fnum2 = cli_nt_create_full(cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_NONE, FILE_OPEN_IF, 0); + fnum2 = cli_nt_create_full(cli2, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_NONE, FILE_OPEN_IF, 0, 0); if (fnum2 == -1) { printf("test 3 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2)); @@ -3687,16 +3690,16 @@ static BOOL run_opentest(int dummy) printf("TEST #4 testing 2 non-io opens (both with delete)\n"); - fnum1 = cli_nt_create_full(cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("test 4 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1)); return False; } - fnum2 = cli_nt_create_full(cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_NONE, FILE_OPEN_IF, 0); + fnum2 = cli_nt_create_full(cli2, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_NONE, FILE_OPEN_IF, 0, 0); if (fnum2 != -1) { printf("test 4 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2)); @@ -3716,16 +3719,16 @@ static BOOL run_opentest(int dummy) printf("TEST #5 testing 2 non-io opens (both with delete - both with file share delete)\n"); - fnum1 = cli_nt_create_full(cli1, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_DELETE, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_DELETE, FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("test 5 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1)); return False; } - fnum2 = cli_nt_create_full(cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_DELETE, FILE_OPEN_IF, 0); + fnum2 = cli_nt_create_full(cli2, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_DELETE, FILE_OPEN_IF, 0, 0); if (fnum2 == -1) { printf("test 5 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2)); @@ -3748,16 +3751,16 @@ static BOOL run_opentest(int dummy) cli_unlink(cli1, fname); - fnum1 = cli_nt_create_full(cli1, fname,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("test 6 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1)); return False; } - fnum2 = cli_nt_create_full(cli2, fname,FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ, FILE_OPEN_IF, 0); + fnum2 = cli_nt_create_full(cli2, fname, 0, FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ, FILE_OPEN_IF, 0, 0); if (fnum2 == -1) { printf("test 6 open 2 of %s failed (%s)\n", fname, cli_errstr(cli2)); @@ -3780,16 +3783,16 @@ static BOOL run_opentest(int dummy) cli_unlink(cli1, fname); - fnum1 = cli_nt_create_full(cli1, fname,FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, FILE_READ_DATA, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("test 7 open 1 of %s failed (%s)\n", fname, cli_errstr(cli1)); return False; } - fnum2 = cli_nt_create_full(cli2, fname,DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, - FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_OPEN_IF, 0); + fnum2 = cli_nt_create_full(cli2, fname, 0, DELETE_ACCESS|FILE_READ_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ|FILE_SHARE_DELETE, FILE_OPEN_IF, 0, 0); if (fnum2 != -1) { printf("test 7 open 2 of %s SUCCEEDED - should have failed (%s)\n", fname, cli_errstr(cli2)); @@ -3893,8 +3896,8 @@ static BOOL run_openattrtest(int dummy) for (k = 0, i = 0; i < sizeof(open_attrs_table)/sizeof(uint32); i++) { cli_setatr(cli1, fname, 0, 0); cli_unlink(cli1, fname); - fnum1 = cli_nt_create_full(cli1, fname,FILE_WRITE_DATA, open_attrs_table[i], - FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, FILE_WRITE_DATA, open_attrs_table[i], + FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0, 0); if (fnum1 == -1) { printf("open %d (1) of %s failed (%s)\n", i, fname, cli_errstr(cli1)); @@ -3907,8 +3910,8 @@ static BOOL run_openattrtest(int dummy) } for (j = 0; j < sizeof(open_attrs_table)/sizeof(uint32); j++) { - fnum1 = cli_nt_create_full(cli1, fname,FILE_READ_DATA|FILE_WRITE_DATA, open_attrs_table[j], - FILE_SHARE_NONE, FILE_OVERWRITE, 0); + fnum1 = cli_nt_create_full(cli1, fname, 0, FILE_READ_DATA|FILE_WRITE_DATA, open_attrs_table[j], + FILE_SHARE_NONE, FILE_OVERWRITE, 0, 0); if (fnum1 == -1) { for (l = 0; l < sizeof(attr_results)/sizeof(struct trunc_open_results); l++) { @@ -4220,8 +4223,8 @@ static BOOL run_dirtest1(int dummy) for (i=0;i<1000;i++) { fstring fname; slprintf(fname, sizeof(fname), "\\LISTDIR\\f%d", i); - fnum = cli_nt_create_full(cli, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_ARCHIVE, - FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0); + fnum = cli_nt_create_full(cli, fname, 0, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_ARCHIVE, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0, 0); if (fnum == -1) { fprintf(stderr,"Failed to open %s\n", fname); return False; diff --git a/source3/torture/utable.c b/source3/torture/utable.c index 74d5f164c0..3ec5932b79 100644 --- a/source3/torture/utable.c +++ b/source3/torture/utable.c @@ -144,11 +144,11 @@ BOOL torture_casetable(int dummy) printf("%04x (%c)\n", c, isprint(c)?c:'.'); fname = form_name(c); - fnum = cli_nt_create_full(cli, fname, + fnum = cli_nt_create_full(cli, fname, 0, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, - FILE_OPEN_IF, 0); + FILE_OPEN_IF, 0, 0); if (fnum == -1) { printf("Failed to create file with char %04x\n", c); -- cgit