From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 9 Feb 2012 04:14:10 +0000 (+1100)
Subject: torture: don't check the NOINDEXED bit in attribute comparison
X-Git-Tag: samba-4.0.0alpha19~725
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=d21f7783f6062118edf2c7b8dab79ebc5459317a;p=samba.git

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>
---

diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c
index 47d61158c8b..4668e125ae5 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 5dca5c31846..5da4c198dc2 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! "