sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

it turns out that XP agrees with the samba head branch over the right

Browse Source 
error codes for locking, so fix the test rather than fixing samba
This commit is contained in:
Andrew Tridgell -
parent b1b2a5fa5d
commit a583af3c2f
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/torture/torture.c
View File

@ -814,7 +814,7 @@ static BOOL run_locktest1(int dummy)
return False; return False;
} else { } else {
if (!check_error(__LINE__, &cli2, ERRDOS, ERRlock, if (!check_error(__LINE__, &cli2, ERRDOS, ERRlock,
NT_STATUS_FILE_LOCK_CONFLICT)) return False; NT_STATUS_LOCK_NOT_GRANTED)) return False;
} }
t2 = time(NULL); t2 = time(NULL);
@ -832,7 +832,7 @@ static BOOL run_locktest1(int dummy)
return False; return False;
} else { } else {
if (!check_error(__LINE__, &cli2, ERRDOS, ERRlock, if (!check_error(__LINE__, &cli2, ERRDOS, ERRlock,
NT_STATUS_FILE_LOCK_CONFLICT)) return False; NT_STATUS_LOCK_NOT_GRANTED)) return False;
} }
if (!cli_close(&cli1, fnum1)) { if (!cli_close(&cli1, fnum1)) {
@ -1016,7 +1016,7 @@ static BOOL run_locktest2(int dummy)
correct = False; correct = False;
} else { } else {
if (!check_error(__LINE__, &cli, ERRDOS, ERRlock, if (!check_error(__LINE__, &cli, ERRDOS, ERRlock,
NT_STATUS_FILE_LOCK_CONFLICT)) return False; NT_STATUS_LOCK_NOT_GRANTED)) return False;
} }
if (!cli_lock(&cli, fnum1, 100, 4, 0, WRITE_LOCK)) { if (!cli_lock(&cli, fnum1, 100, 4, 0, WRITE_LOCK)) {
@ -1033,8 +1033,8 @@ static BOOL run_locktest2(int dummy)
correct = False; correct = False;
} else { } else {
if (!check_error(__LINE__, &cli, if (!check_error(__LINE__, &cli,
ERRDOS, ERRnotlocked, ERRDOS, ERRlock,
NT_STATUS_RANGE_NOT_LOCKED)) return False; NT_STATUS_LOCK_NOT_GRANTED)) return False;
} }
if (cli_unlock(&cli, fnum1, 0, 8)) { if (cli_unlock(&cli, fnum1, 0, 8)) {
@ -1042,8 +1042,8 @@ static BOOL run_locktest2(int dummy)
correct = False; correct = False;
} else { } else {
if (!check_error(__LINE__, &cli, if (!check_error(__LINE__, &cli,
ERRDOS, ERRnotlocked, ERRDOS, ERRlock,
NT_STATUS_RANGE_NOT_LOCKED)) return False; NT_STATUS_LOCK_NOT_GRANTED)) return False;
} }
if (cli_lock(&cli, fnum3, 0, 4, 0, WRITE_LOCK)) { if (cli_lock(&cli, fnum3, 0, 4, 0, WRITE_LOCK)) {
@ -2482,14 +2482,15 @@ static BOOL run_deletetest(int dummy)
} }
cli_sockopt(&cli1, sockops); cli_sockopt(&cli1, sockops);
/* Test 1 - this should *NOT* delete the file on close. */ /* Test 1 - this should *NOT* delete the file on close. */
cli_setatr(&cli1, fname, 0, 0); cli_setatr(&cli1, fname, 0, 0);
cli_unlink(&cli1, fname); cli_unlink(&cli1, fname);
fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL, fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
FILE_SHARE_DELETE, FILE_OVERWRITE_IF, DELETE_ON_CLOSE_FLAG); FILE_SHARE_DELETE, FILE_OVERWRITE_IF,
DELETE_ON_CLOSE_FLAG);
if (fnum1 == -1) { if (fnum1 == -1) {
printf("[1] open of %s failed (%s)\n", fname, cli_errstr(&cli1)); printf("[1] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
@ -2520,7 +2521,8 @@ static BOOL run_deletetest(int dummy)
cli_unlink(&cli1, fname); cli_unlink(&cli1, fname);
fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_ALL_ACCESS, fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_ALL_ACCESS,
FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_OVERWRITE_IF, 0); FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE,
FILE_OVERWRITE_IF, 0);
if (fnum1 == -1) { if (fnum1 == -1) {
printf("[2] open of %s failed (%s)\n", fname, cli_errstr(&cli1)); printf("[2] open of %s failed (%s)\n", fname, cli_errstr(&cli1));
@ -2548,13 +2550,12 @@ static BOOL run_deletetest(int dummy)
} else } else
printf("second delete on close test succeeded.\n"); printf("second delete on close test succeeded.\n");
/* Test 3 - ... */ /* Test 3 - ... */
cli_setatr(&cli1, fname, 0, 0); cli_setatr(&cli1, fname, 0, 0);
cli_unlink(&cli1, fname); cli_unlink(&cli1, fname);
fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL, fnum1 = cli_nt_create_full(&cli1, fname, GENERIC_ALL_ACCESS, FILE_ATTRIBUTE_NORMAL,
FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0); FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OVERWRITE_IF, 0);
if (fnum1 == -1) { if (fnum1 == -1) {
printf("[3] open - 1 of %s failed (%s)\n", fname, cli_errstr(&cli1)); printf("[3] open - 1 of %s failed (%s)\n", fname, cli_errstr(&cli1));