[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-996-ga023b6c
Jeremy Allison
jra at samba.org
Fri Aug 14 16:05:20 MDT 2009
The branch, master has been updated
via a023b6c64b4e1516c2506f028b0e653028970de3 (commit)
from 12864ffd51011e38ad56f129de684dbcdf9271de (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a023b6c64b4e1516c2506f028b0e653028970de3
Author: Jeremy Allison <jra at samba.org>
Date: Fri Aug 14 15:06:11 2009 -0700
Use defined names rather than numeric constants to make code
clearer.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source3/modules/nfs4_acls.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index e8ba1fa..cf96061 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));
--
Samba Shared Repository
More information about the samba-cvs
mailing list