From f45846084249540f3dee24fe92cfaab2974461cc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 6 Nov 2004 12:35:31 +0000 Subject: r3580: - on file overwrite in ntcreatex we need to replace the file permissions. - pvfs now passes BASE-OPENATTR - pvfs also passes the BASE-DEFER_OPEN test, but it is not a well formed test for regular running so I am removing it from the list of tests to run in test_posix.sh (the test is covered better by RAW-MUX anyway) (This used to be commit cb76bd218ed4194ea151264d495aa902ddf03b3c) --- source4/torture/basic/attr.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source4/torture/basic/attr.c') diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c index b70b1c2617..5cd05d9647 100644 --- a/source4/torture/basic/attr.c +++ b/source4/torture/basic/attr.c @@ -104,8 +104,8 @@ BOOL torture_openattrtest(void) smbcli_setatr(cli1->tree, fname, 0, 0); smbcli_unlink(cli1->tree, fname); fnum1 = smbcli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_WRITE_DATA, open_attrs_table[i], - NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); - + NTCREATEX_SHARE_ACCESS_NONE, NTCREATEX_DISP_OVERWRITE_IF, 0, 0); + if (fnum1 == -1) { printf("open %d (1) of %s failed (%s)\n", i, fname, smbcli_errstr(cli1->tree)); return False; @@ -166,13 +166,13 @@ BOOL torture_openattrtest(void) for (l = 0; l < ARRAY_SIZE(attr_results); l++) { if (attr_results[l].num == k) { if (attr != attr_results[l].result_attr || - open_attrs_table[i] != attr_results[l].init_attr || - open_attrs_table[j] != attr_results[l].trunc_attr) { + open_attrs_table[i] != attr_results[l].init_attr || + open_attrs_table[j] != attr_results[l].trunc_attr) { printf("[%d] getatr check failed. [0x%x] trunc [0x%x] got attr 0x%x, should be 0x%x\n", - k, open_attrs_table[i], - open_attrs_table[j], - (uint_t)attr, - attr_results[l].result_attr); + k, open_attrs_table[i], + open_attrs_table[j], + (uint_t)attr, + attr_results[l].result_attr); correct = False; CHECK_MAX_FAILURES(error_exit); } -- cgit