summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-08-14 15:06:11 -0700
committerJeremy Allison <jra@samba.org>2009-08-14 15:06:11 -0700
commita023b6c64b4e1516c2506f028b0e653028970de3 (patch)
treeea3423a1e56b06ed34f8ced9dcf854c39c140b1d /source3
parent12864ffd51011e38ad56f129de684dbcdf9271de (diff)
downloadsamba-a023b6c64b4e1516c2506f028b0e653028970de3.tar.gz
samba-a023b6c64b4e1516c2506f028b0e653028970de3.tar.bz2
samba-a023b6c64b4e1516c2506f028b0e653028970de3.zip
Use defined names rather than numeric constants to make code
clearer. Jeremy.
Diffstat (limited to 'source3')
-rw-r--r--source3/modules/nfs4_acls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index e8ba1fa0bf..cf96061ea6 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));