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/include/vfs_macros.h | |
parent | a4d1f2223abdb0db2a15742ebd59a611cc157443 (diff) | |
download | samba-9158974540d0e311021f04789ed75ebda466c5b3.tar.gz |
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/include/vfs_macros.h')
-rw-r--r-- | source3/include/vfs_macros.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h index 4eca1b0748..f1bc8ffa4c 100644 --- a/source3/include/vfs_macros.h +++ b/source3/include/vfs_macros.h @@ -429,15 +429,15 @@ #define SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, mode) \ smb_vfs_call_fchmod_acl((handle)->next, (fsp), (mode)) -#define SMB_VFS_SYS_ACL_GET_FILE(conn, path_p, type) \ - smb_vfs_call_sys_acl_get_file((conn)->vfs_handles, (path_p), (type)) -#define SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, path_p, type) \ - smb_vfs_call_sys_acl_get_file((handle)->next, (path_p), (type)) - -#define SMB_VFS_SYS_ACL_GET_FD(fsp) \ - smb_vfs_call_sys_acl_get_fd((fsp)->conn->vfs_handles, (fsp)) -#define SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp) \ - smb_vfs_call_sys_acl_get_fd((handle)->next, (fsp)) +#define SMB_VFS_SYS_ACL_GET_FILE(conn, path_p, type, mem_ctx) \ + smb_vfs_call_sys_acl_get_file((conn)->vfs_handles, (path_p), (type), (mem_ctx)) +#define SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, path_p, type, mem_ctx) \ + smb_vfs_call_sys_acl_get_file((handle)->next, (path_p), (type), (mem_ctx)) + +#define SMB_VFS_SYS_ACL_GET_FD(fsp, mem_ctx) \ + smb_vfs_call_sys_acl_get_fd((fsp)->conn->vfs_handles, (fsp), (mem_ctx)) +#define SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, mem_ctx) \ + smb_vfs_call_sys_acl_get_fd((handle)->next, (fsp), (mem_ctx)) #define SMB_VFS_SYS_ACL_BLOB_GET_FILE(conn, path_p, type, mem_ctx, blob_description, blob) \ smb_vfs_call_sys_acl_blob_get_file((conn)->vfs_handles, (path_p), (type), (mem_ctx), (blob_description), (blob)) |