diff options
| author | Gerald Carter <jerry@samba.org> | 2007-05-21 21:17:21 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2007-05-21 21:17:21 +0000 |
| commit | 34059e63c8a644b10cf9a59cca5e67a45053d16e (patch) | |
| tree | b0751d47f93023938656df3c6173618dfef4f1e5 /source/modules/vfs_posixacl.c | |
| parent | c3f0e56c057f6be60bd3721485f013ed63defa6a (diff) | |
| download | samba-34059e63c8a644b10cf9a59cca5e67a45053d16e.tar.gz samba-34059e63c8a644b10cf9a59cca5e67a45053d16e.tar.xz samba-34059e63c8a644b10cf9a59cca5e67a45053d16e.zip | |
r23052: sync with SAMBA_3_0_25 and start updating release notes
Diffstat (limited to 'source/modules/vfs_posixacl.c')
| -rw-r--r-- | source/modules/vfs_posixacl.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/modules/vfs_posixacl.c b/source/modules/vfs_posixacl.c index 191c4a7cb0e..109c1e20b2e 100644 --- a/source/modules/vfs_posixacl.c +++ b/source/modules/vfs_posixacl.c @@ -200,9 +200,15 @@ static BOOL smb_ace_to_internal(acl_entry_t posix_ace, return False; } ace->a_perm = 0; +#ifdef HAVE_ACL_GET_PERM_NP + ace->a_perm |= (acl_get_perm_np(permset, ACL_READ) ? SMB_ACL_READ : 0); + ace->a_perm |= (acl_get_perm_np(permset, ACL_WRITE) ? SMB_ACL_WRITE : 0); + ace->a_perm |= (acl_get_perm_np(permset, ACL_EXECUTE) ? SMB_ACL_EXECUTE : 0); +#else ace->a_perm |= (acl_get_perm(permset, ACL_READ) ? SMB_ACL_READ : 0); ace->a_perm |= (acl_get_perm(permset, ACL_WRITE) ? SMB_ACL_WRITE : 0); ace->a_perm |= (acl_get_perm(permset, ACL_EXECUTE) ? SMB_ACL_EXECUTE : 0); +#endif return True; } |