summaryrefslogtreecommitdiffstats
path: root/source3/modules/vfs_aixacl.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-10-11 14:42:39 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-10-11 14:45:03 +1100
commita0588fdea82ab1b5d4dbd8bf75b01b82c0879d21 (patch)
treecdb6aa82beb8c57a4dfe6966ef4ad31e2029f26a /source3/modules/vfs_aixacl.c
parent547a260a2865d547a4ffc756b21fa648349654fd (diff)
downloadsamba-a0588fdea82ab1b5d4dbd8bf75b01b82c0879d21.tar.gz
samba-a0588fdea82ab1b5d4dbd8bf75b01b82c0879d21.tar.xz
samba-a0588fdea82ab1b5d4dbd8bf75b01b82c0879d21.zip
vfs: Fix alternative posix and no-op sys acl implementations to take a mem_ctx
These were missed with the initial conversion to use a talloc context. Andrew Bartlett
Diffstat (limited to 'source3/modules/vfs_aixacl.c')
-rw-r--r--source3/modules/vfs_aixacl.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/modules/vfs_aixacl.c b/source3/modules/vfs_aixacl.c
index 25d9089ba5c..459ea6f2979 100644
--- a/source3/modules/vfs_aixacl.c
+++ b/source3/modules/vfs_aixacl.c
@@ -23,8 +23,9 @@
#include "vfs_aixacl_util.h"
SMB_ACL_T aixacl_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)
{
struct acl *file_acl = (struct acl *)NULL;
struct smb_acl_t *result = (struct smb_acl_t *)NULL;
@@ -71,7 +72,7 @@ SMB_ACL_T aixacl_sys_acl_get_file(vfs_handle_struct *handle,
DEBUG(10,("Got facl and returned it\n"));
- result = aixacl_to_smbacl(file_acl);
+ result = aixacl_to_smbacl(file_acl, mem_ctx);
SAFE_FREE(file_acl);
return result;
@@ -80,7 +81,8 @@ SMB_ACL_T aixacl_sys_acl_get_file(vfs_handle_struct *handle,
}
SMB_ACL_T aixacl_sys_acl_get_fd(vfs_handle_struct *handle,
- files_struct *fsp)
+ files_struct *fsp,
+ TALLOC_CTX *mem_ctx)
{
struct acl *file_acl = (struct acl *)NULL;
@@ -122,7 +124,7 @@ SMB_ACL_T aixacl_sys_acl_get_fd(vfs_handle_struct *handle,
DEBUG(10,("Got facl and returned it\n"));
- result = aixacl_to_smbacl(file_acl);
+ result = aixacl_to_smbacl(file_acl, mem_ctx);
SAFE_FREE(file_acl);
return result;