diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-13 19:58:17 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-15 11:44:48 +1000 |
| commit | db544790f108000b4cad51fd143946765774753c (patch) | |
| tree | 15655bcd58cc8956114700845d028cde8103dba5 /source3 | |
| parent | 631a356ea227eb48a9472b31ae3034fcbb1d3c5c (diff) | |
| download | samba-db544790f108000b4cad51fd143946765774753c.tar.gz samba-db544790f108000b4cad51fd143946765774753c.tar.bz2 samba-db544790f108000b4cad51fd143946765774753c.zip | |
s3-smbd: Call sys_acl_add_perm() directly rather than via the VFS
This will allow us to remove the struct smb_acl_t manipuations from the VFS layer,
which will be reduced to handling the get/set functions.
Andrew Bartlett
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/posix_acls.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index de27a1ea93..900d504ff8 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -894,15 +894,15 @@ static int map_acl_perms_to_permset(connection_struct *conn, mode_t mode, SMB_AC if (sys_acl_clear_perms(*p_permset) == -1) return -1; if (mode & S_IRUSR) { - if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_READ) == -1) + if (sys_acl_add_perm(*p_permset, SMB_ACL_READ) == -1) return -1; } if (mode & S_IWUSR) { - if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_WRITE) == -1) + if (sys_acl_add_perm(*p_permset, SMB_ACL_WRITE) == -1) return -1; } if (mode & S_IXUSR) { - if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_EXECUTE) == -1) + if (sys_acl_add_perm(*p_permset, SMB_ACL_EXECUTE) == -1) return -1; } return 0; @@ -4479,17 +4479,17 @@ static bool unix_ex_wire_to_permset(connection_struct *conn, unsigned char wire_ } if (wire_perm & SMB_POSIX_ACL_READ) { - if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_READ) == -1) { + if (sys_acl_add_perm(*p_permset, SMB_ACL_READ) == -1) { return False; } } if (wire_perm & SMB_POSIX_ACL_WRITE) { - if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_WRITE) == -1) { + if (sys_acl_add_perm(*p_permset, SMB_ACL_WRITE) == -1) { return False; } } if (wire_perm & SMB_POSIX_ACL_EXECUTE) { - if (SMB_VFS_SYS_ACL_ADD_PERM(conn, *p_permset, SMB_ACL_EXECUTE) == -1) { + if (sys_acl_add_perm(*p_permset, SMB_ACL_EXECUTE) == -1) { return False; } } |