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/lib/sysacls.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/lib/sysacls.c')
| -rw-r--r-- | source3/lib/sysacls.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c index a5430d6a0d..2245491030 100644 --- a/source3/lib/sysacls.c +++ b/source3/lib/sysacls.c @@ -249,11 +249,11 @@ char *sys_acl_to_text(const struct smb_acl_t *acl_d, ssize_t *len_p) return text; } -SMB_ACL_T sys_acl_init(void) +SMB_ACL_T sys_acl_init(TALLOC_CTX *mem_ctx) { SMB_ACL_T a; - if ((a = talloc(NULL, struct smb_acl_t)) == NULL) { + if ((a = talloc(mem_ctx, struct smb_acl_t)) == NULL) { errno = ENOMEM; return NULL; } @@ -364,14 +364,14 @@ int sys_acl_valid(SMB_ACL_T acl_d) #if defined(HAVE_POSIX_ACLS) SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle, - const char *path_p, SMB_ACL_TYPE_T type) + const char *path_p, SMB_ACL_TYPE_T type, TALLOC_CTX *mem_ctx) { - return posixacl_sys_acl_get_file(handle, path_p, type); + return posixacl_sys_acl_get_file(handle, path_p, type, mem_ctx); } -SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp) +SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp, TALLOC_CTX *mem_ctx) { - return posixacl_sys_acl_get_fd(handle, fsp); + return posixacl_sys_acl_get_fd(handle, fsp, mem_ctx); } int sys_acl_set_file(vfs_handle_struct *handle, |