diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-13 19:52:23 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-15 11:44:46 +1000 |
| commit | e019b93f0e4aed60f23b57b02470f34cff871b41 (patch) | |
| tree | c331d374141d1a0e55b02c877a2bb7357f352d5f /source3/smbd | |
| parent | d8fb9e77ec98b055e1214e4ccf9d3f047354ac97 (diff) | |
| download | samba-e019b93f0e4aed60f23b57b02470f34cff871b41.tar.gz samba-e019b93f0e4aed60f23b57b02470f34cff871b41.tar.bz2 samba-e019b93f0e4aed60f23b57b02470f34cff871b41.zip | |
s3-smbd: Call sys_acl_get_entry() 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/smbd')
| -rw-r--r-- | source3/smbd/posix_acls.c | 12 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index e63f8b7e93..a4ca642ed6 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -2631,7 +2631,7 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn, SMB_ACL_ENTRY_T entry; size_t ace_count; - while ( posix_acl && (SMB_VFS_SYS_ACL_GET_ENTRY(conn, posix_acl, entry_id, &entry) == 1)) { + while ( posix_acl && (sys_acl_get_entry(posix_acl, entry_id, &entry) == 1)) { SMB_ACL_TAG_T tagtype; SMB_ACL_PERMSET_T permset; struct dom_sid sid; @@ -3107,7 +3107,7 @@ SMB_ACL_T free_empty_sys_acl(connection_struct *conn, SMB_ACL_T the_acl) if (!the_acl) return NULL; - if (SMB_VFS_SYS_ACL_GET_ENTRY(conn, the_acl, SMB_ACL_FIRST_ENTRY, &entry) != 1) { + if (sys_acl_get_entry(the_acl, SMB_ACL_FIRST_ENTRY, &entry) != 1) { SMB_VFS_SYS_ACL_FREE_ACL(conn, the_acl); return NULL; } @@ -4276,7 +4276,7 @@ int get_acl_group_bits( connection_struct *conn, const char *fname, mode_t *mode if (posix_acl == (SMB_ACL_T)NULL) return -1; - while (SMB_VFS_SYS_ACL_GET_ENTRY(conn, posix_acl, entry_id, &entry) == 1) { + while (sys_acl_get_entry(posix_acl, entry_id, &entry) == 1) { SMB_ACL_TAG_T tagtype; SMB_ACL_PERMSET_T permset; @@ -4313,7 +4313,7 @@ static int chmod_acl_internals( connection_struct *conn, SMB_ACL_T posix_acl, mo SMB_ACL_ENTRY_T entry; int num_entries = 0; - while ( SMB_VFS_SYS_ACL_GET_ENTRY(conn, posix_acl, entry_id, &entry) == 1) { + while ( sys_acl_get_entry(posix_acl, entry_id, &entry) == 1) { SMB_ACL_TAG_T tagtype; SMB_ACL_PERMSET_T permset; mode_t perms; @@ -4415,7 +4415,7 @@ static bool directory_has_default_posix_acl(connection_struct *conn, const char bool has_acl = False; SMB_ACL_ENTRY_T entry; - if (def_acl != NULL && (SMB_VFS_SYS_ACL_GET_ENTRY(conn, def_acl, SMB_ACL_FIRST_ENTRY, &entry) == 1)) { + if (def_acl != NULL && (sys_acl_get_entry(def_acl, SMB_ACL_FIRST_ENTRY, &entry) == 1)) { has_acl = True; } @@ -4738,7 +4738,7 @@ static bool remove_posix_acl(connection_struct *conn, files_struct *fsp, const c goto done; } - while ( SMB_VFS_SYS_ACL_GET_ENTRY(conn, file_acl, entry_id, &entry) == 1) { + while ( sys_acl_get_entry(file_acl, entry_id, &entry) == 1) { SMB_ACL_TAG_T tagtype; SMB_ACL_PERMSET_T permset; diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index c114c42f32..a25f1e16d8 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -3838,7 +3838,7 @@ static unsigned int count_acl_entries(connection_struct *conn, SMB_ACL_T posix_a int entry_id = SMB_ACL_FIRST_ENTRY; SMB_ACL_ENTRY_T entry; - while ( posix_acl && (SMB_VFS_SYS_ACL_GET_ENTRY(conn, posix_acl, entry_id, &entry) == 1)) { + while ( posix_acl && (sys_acl_get_entry(posix_acl, entry_id, &entry) == 1)) { /* get_next... */ if (entry_id == SMB_ACL_FIRST_ENTRY) { entry_id = SMB_ACL_NEXT_ENTRY; @@ -3857,7 +3857,7 @@ static bool marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_ int entry_id = SMB_ACL_FIRST_ENTRY; SMB_ACL_ENTRY_T entry; - while ( posix_acl && (SMB_VFS_SYS_ACL_GET_ENTRY(conn, posix_acl, entry_id, &entry) == 1)) { + while ( posix_acl && (sys_acl_get_entry(posix_acl, entry_id, &entry) == 1)) { SMB_ACL_TAG_T tagtype; SMB_ACL_PERMSET_T permset; unsigned char perms = 0; |