summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2012-02-09 15:14:10 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-02-27 07:36:05 +0100
commitd21f7783f6062118edf2c7b8dab79ebc5459317a (patch)
tree5d639e3220c0def727fd0a7f35ed6604a076b343 /source4
parent3b3066fcaf9efa28aeea7e32a894a4dc3693275c (diff)
downloadsamba-d21f7783f6062118edf2c7b8dab79ebc5459317a.tar.gz
samba-d21f7783f6062118edf2c7b8dab79ebc5459317a.tar.bz2
samba-d21f7783f6062118edf2c7b8dab79ebc5459317a.zip
torture: don't check the NOINDEXED bit in attribute comparison
this bit is dependent on user settings on the filesystem Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/smb2/create.c1
-rw-r--r--source4/torture/smb2/util.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c
index 47d61158c8..4668e125ae 100644
--- a/source4/torture/smb2/create.c
+++ b/source4/torture/smb2/create.c
@@ -275,6 +275,7 @@ static bool test_create_gentest(struct torture_context *tctx, struct smb2_tree *
ok_mask |= 1<<i;
expected = (io.in.file_attributes | FILE_ATTRIBUTE_ARCHIVE) & 0x00005127;
+ io.out.file_attr &= ~FILE_ATTRIBUTE_NONINDEXED;
CHECK_EQUAL(io.out.file_attr, expected);
file_attributes_set |= io.out.file_attr;
diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index 5dca5c3184..5da4c198dc 100644
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -557,7 +557,7 @@ bool smb2_util_verify_attrib(TALLOC_CTX *tctx, struct smb2_tree *tree,
status = smb2_getinfo_file(tree, tctx, &q);
CHECK_STATUS(status, NT_STATUS_OK);
- q.all_info2.out.attrib &= ~FILE_ATTRIBUTE_ARCHIVE;
+ q.all_info2.out.attrib &= ~(FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_NONINDEXED);
if (q.all_info2.out.attrib != attrib) {
torture_warning(tctx, "%s: attributes don't match! "