diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-10-10 10:18:32 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-10-11 12:25:11 +1100 |
| commit | 9158974540d0e311021f04789ed75ebda466c5b3 (patch) | |
| tree | 5cdc75d2c7527e94df2bb9292d276cbf8e36499a /source3/modules/vfs_default.c | |
| parent | a4d1f2223abdb0db2a15742ebd59a611cc157443 (diff) | |
| download | samba-9158974540d0e311021f04789ed75ebda466c5b3.tar.gz samba-9158974540d0e311021f04789ed75ebda466c5b3.tar.bz2 samba-9158974540d0e311021f04789ed75ebda466c5b3.zip | |
smbd: Add mem_ctx to sys_acl_init() and all callers
This changes from allocation on NULL to allocation on the supplied
memory context.
Currently that supplied context is talloc_tos() at the the final consumer of
the ACL.
Andrew Bartlett
Diffstat (limited to 'source3/modules/vfs_default.c')
| -rw-r--r-- | source3/modules/vfs_default.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 8392feb8c4..aa91a48a2e 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -2111,14 +2111,19 @@ static int vfswrap_fchmod_acl(vfs_handle_struct *handle, files_struct *fsp, mode #endif } -static SMB_ACL_T vfswrap_sys_acl_get_file(vfs_handle_struct *handle, const char *path_p, SMB_ACL_TYPE_T type) +static SMB_ACL_T vfswrap_sys_acl_get_file(vfs_handle_struct *handle, + const char *path_p, + SMB_ACL_TYPE_T type, + TALLOC_CTX *mem_ctx) { - return sys_acl_get_file(handle, path_p, type); + return sys_acl_get_file(handle, path_p, type, mem_ctx); } -static SMB_ACL_T vfswrap_sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp) +static SMB_ACL_T vfswrap_sys_acl_get_fd(vfs_handle_struct *handle, + files_struct *fsp, + TALLOC_CTX *mem_ctx) { - return sys_acl_get_fd(handle, fsp); + return sys_acl_get_fd(handle, fsp, mem_ctx); } static int vfswrap_sys_acl_set_file(vfs_handle_struct *handle, const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl) |