diff options
| author | Jeremy Allison <jra@samba.org> | 2016-03-10 15:34:58 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2016-03-14 23:02:09 +0100 |
| commit | 6d9e7ad3de6541b1434b0798a1162816f4967134 (patch) | |
| tree | c4e5fe8d47750dea0c605060b7a348d7f98ef6c5 /source3/modules/vfs_aixacl2.c | |
| parent | fca72bf4f6dc6a3d82d10e4b865472d9819de136 (diff) | |
| download | samba-6d9e7ad3de6541b1434b0798a1162816f4967134.tar.gz | |
s3:smbd: Fix build for vfs_aixacl2.c.
Missed conversion of get_nt_acl_fn from const char *
to const struct smb_filename *.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <rb@sernet.de>
Diffstat (limited to 'source3/modules/vfs_aixacl2.c')
| -rw-r--r-- | source3/modules/vfs_aixacl2.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/source3/modules/vfs_aixacl2.c b/source3/modules/vfs_aixacl2.c index a70013db2eb..b956d4dca64 100644 --- a/source3/modules/vfs_aixacl2.c +++ b/source3/modules/vfs_aixacl2.c @@ -186,7 +186,7 @@ static NTSTATUS aixjfs2_fget_nt_acl(vfs_handle_struct *handle, } static NTSTATUS aixjfs2_get_nt_acl(vfs_handle_struct *handle, - const char *name, + const struct smb_filename *smb_fname, uint32_t security_info, TALLOC_CTX *mem_ctx, struct security_descriptor **ppdesc) @@ -196,19 +196,28 @@ static NTSTATUS aixjfs2_get_nt_acl(vfs_handle_struct *handle, bool retryPosix = False; *ppdesc = NULL; - result = aixjfs2_get_nfs4_acl(mem_ctx, name, &pacl, &retryPosix); + result = aixjfs2_get_nfs4_acl(mem_ctx, + smb_fname->base_name, + &pacl, + &retryPosix); if (retryPosix) { DEBUG(10, ("retrying with posix acl...\n")); - return posix_get_nt_acl(handle->conn, name, security_info, - mem_ctx, ppdesc); + return posix_get_nt_acl(handle->conn, + smb_fname->base_name, + security_info, + mem_ctx, + ppdesc); } if (result==False) return NT_STATUS_ACCESS_DENIED; - return smb_get_nt_acl_nfs4(handle->conn, name, security_info, - mem_ctx, ppdesc, - pacl); + return smb_get_nt_acl_nfs4(handle->conn, + smb_fname->base_name, + security_info, + mem_ctx, + ppdesc, + pacl); } static int aixjfs2_sys_acl_blob_get_file(vfs_handle_struct *handle, const char *path_p, TALLOC_CTX *mem_ctx, char **blob_description, DATA_BLOB *blob) |