From: Jeremy Allison <jra@samba.org>
Date: Fri, 14 Aug 2009 22:06:11 +0000 (-0700)
Subject: Use defined names rather than numeric constants to make code
X-Git-Tag: talloc-2.0.0~373
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a023b6c64b4e1516c2506f028b0e653028970de3;p=thirdparty%2Fsamba.git

Use defined names rather than numeric constants to make code
clearer.
Jeremy.
---

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index e8ba1fa0bf1..cf96061ea63 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -264,14 +264,14 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */
 		}
 
 		mapped_ace_flags = ace->aceFlags & 0xf;
-		if (!is_directory && (mapped_ace_flags & 0x3)) {
+		if (!is_directory && (mapped_ace_flags & (SMB_ACE4_FILE_INHERIT_ACE|SMB_ACE4_DIRECTORY_INHERIT_ACE))) {
 			/*
 			 * GPFS sets inherits dir_inhert and file_inherit flags
 			 * to files, too, which confuses windows, and seems to
 			 * be wrong anyways. ==> Map these bits away for files.
 			 */
 			DEBUG(10, ("removing inherit flags from nfs4 ace\n"));
-			mapped_ace_flags &= ~0x3;
+			mapped_ace_flags &= ~(SMB_ACE4_FILE_INHERIT_ACE|SMB_ACE4_DIRECTORY_INHERIT_ACE);
 		}
 		DEBUG(10, ("mapped ace flags: 0x%x => 0x%x\n",
 		      ace->aceFlags, mapped_ace_flags));