The branch, v3-4-ctdb has been updated
via 6c9d35c50e86066a335ab083da420c239d330029 (commit)
from 2a7bcead15cb4f5ad9652c9461a7c40d1258c226 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb
- Log -----------------------------------------------------------------
commit 6c9d35c50e86066a335ab083da420c239d330029
Author: Jeremy Allison <j...@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 f3eb22f..97314bb 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -263,14 +263,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-CTDB repository
