diff options
| author | Christian Ambach <ambi@samba.org> | 2013-05-06 16:56:09 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2013-05-09 06:18:21 +0200 |
| commit | e0ca7c4cff49f39559531aafb892fdf95ddfc2ce (patch) | |
| tree | 4911255c20b730d3e50b07bc43a17840d2a06724 /source3/modules | |
| parent | c1c9b99054f28f9c10f79a2bbc95be9864270705 (diff) | |
| download | samba-e0ca7c4cff49f39559531aafb892fdf95ddfc2ce.tar.gz samba-e0ca7c4cff49f39559531aafb892fdf95ddfc2ce.tar.bz2 samba-e0ca7c4cff49f39559531aafb892fdf95ddfc2ce.zip | |
s3:modules/vfs_aixacl2 fix compile errors
fix various compile errors that were introduced with latest ACL changes
Signed-off-by: Christian Ambach <ambi@samba.org>
Pair-Programmed-With: Alexander Werth <alexander.werth@de.ibm.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_aixacl2.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c index 4ac6ada942..d7487d8f47 100644 --- a/source3/modules/vfs_aixacl2.c +++ b/source3/modules/vfs_aixacl2.c @@ -93,7 +93,7 @@ static AIXJFS2_ACL_T *aixjfs2_getacl_alloc(const char *fname, acl_type_t *type) return acl; } -static bool aixjfs2_get_nfs4_acl(TALLOC_CTX *mem_ctx, const char *name +static bool aixjfs2_get_nfs4_acl(TALLOC_CTX *mem_ctx, const char *name, SMB4ACL_T **ppacl, bool *pretryPosix) { int32_t i; @@ -196,7 +196,7 @@ static NTSTATUS aixjfs2_get_nt_acl(vfs_handle_struct *handle, bool retryPosix = False; *ppdesc = NULL; - result = aixjfs2_get_nfs4_acl(name, &pacl, &retryPosix); + result = aixjfs2_get_nfs4_acl(mem_ctx, name, &pacl, &retryPosix); if (retryPosix) { DEBUG(10, ("retrying with posix acl...\n")); @@ -217,8 +217,7 @@ static int aixjfs2_sys_acl_blob_get_file(vfs_handle_struct *handle, const char * bool result; bool retryPosix = False; - *ppdesc = NULL; - result = aixjfs2_get_nfs4_acl(path_p, &pacl, &retryPosix); + result = aixjfs2_get_nfs4_acl(mem_ctx, path_p, &pacl, &retryPosix); if (retryPosix) { return posix_sys_acl_blob_get_file(handle, path_p, mem_ctx, @@ -235,7 +234,7 @@ static int aixjfs2_sys_acl_blob_get_fd(vfs_handle_struct *handle, files_struct * bool result; bool retryPosix = False; - result = aixjfs2_get_nfs4_acl(fsp->fsp_name->base_name, &pacl, + result = aixjfs2_get_nfs4_acl(mem_ctx, fsp->fsp_name->base_name, &pacl, &retryPosix); if (retryPosix) { @@ -304,12 +303,13 @@ SMB_ACL_T aixjfs2_sys_acl_get_file(vfs_handle_struct *handle, } SMB_ACL_T aixjfs2_sys_acl_get_fd(vfs_handle_struct *handle, - files_struct *fsp) + files_struct *fsp, TALLOC_CTX *mem_ctx) { acl_type_t aixjfs2_type; aixjfs2_type.u64 = ACL_AIXC; - return aixjfs2_get_posix_acl(fsp->fsp_name->base_name, aixjfs2_type); + return aixjfs2_get_posix_acl(fsp->fsp_name->base_name, + aixjfs2_type, mem_ctx); } /* @@ -427,8 +427,7 @@ static NTSTATUS aixjfs2_set_nt_acl_common(vfs_handle_struct *handle, files_struc int rc; rc = aixjfs2_query_acl_support( - handle, - fsp->fsp_name, + fsp->fsp_name->base_name, ACL_NFS4, &acl_type_info); |