summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Disseldorp <ddiss@samba.org>2012-09-20 08:35:27 +0200
committerDavid Disseldorp <ddiss@samba.org>2012-09-20 20:42:09 +0200
commita125ea7419142dfb86c4f32b1d46896f3bf40704 (patch)
tree46e72426d748dfd7d02c51dfa07dfd67f51d9349
parent47becf6e20a970d273afab8be176d8cbe5ab2b9c (diff)
downloadsamba-a125ea7419142dfb86c4f32b1d46896f3bf40704.tar.gz
samba-a125ea7419142dfb86c4f32b1d46896f3bf40704.tar.bz2
samba-a125ea7419142dfb86c4f32b1d46896f3bf40704.zip
vfs: fix acl_blob_get* in vfs_full_audit
Plumb-in functions and use correct return types. Autobuild-User(master): David Disseldorp <ddiss@samba.org> Autobuild-Date(master): Thu Sep 20 20:42:09 CEST 2012 on sn-devel-104
-rw-r--r--source3/modules/vfs_full_audit.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 7f8159f452..1a481abfd5 100644
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -1827,32 +1827,32 @@ static SMB_ACL_T smb_full_audit_sys_acl_get_fd(vfs_handle_struct *handle,
static int smb_full_audit_sys_acl_blob_get_file(vfs_handle_struct *handle,
const char *path_p,
- SMB_ACL_TYPE_T type,
- TALLOC_CTX *mem_ctx,
+ SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx,
char **blob_description,
DATA_BLOB *blob)
{
- SMB_ACL_T result;
+ int result;
result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FILE(handle, path_p, type, mem_ctx, blob_description, blob);
- do_log(SMB_VFS_OP_SYS_ACL_BLOB_GET_FILE, (result >= 0), handle,
+ do_log(SMB_VFS_OP_SYS_ACL_BLOB_GET_FILE, (result >= 0), handle,
"%s", path_p);
return result;
}
static int smb_full_audit_sys_acl_blob_get_fd(vfs_handle_struct *handle,
- files_struct *fsp,
- TALLOC_CTX *mem_ctx,
+ files_struct *fsp,
+ TALLOC_CTX *mem_ctx,
char **blob_description,
DATA_BLOB *blob)
{
- SMB_ACL_T result;
+ int result;
- result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FD(handle, fsp, mem_ctx, blob_description,blob);
+ result = SMB_VFS_NEXT_SYS_ACL_BLOB_GET_FD(handle, fsp, mem_ctx, blob_description, blob);
- do_log(SMB_VFS_OP_SYS_ACL_BLOB_GET_FD, (result >= 0), handle,
+ do_log(SMB_VFS_OP_SYS_ACL_BLOB_GET_FD, (result >= 0), handle,
"%s", fsp_str_do_log(fsp));
return result;
@@ -2131,6 +2131,8 @@ static struct vfs_fn_pointers vfs_full_audit_fns = {
.fchmod_acl_fn = smb_full_audit_fchmod_acl,
.sys_acl_get_file_fn = smb_full_audit_sys_acl_get_file,
.sys_acl_get_fd_fn = smb_full_audit_sys_acl_get_fd,
+ .sys_acl_blob_get_file_fn = smb_full_audit_sys_acl_blob_get_file,
+ .sys_acl_blob_get_fd_fn = smb_full_audit_sys_acl_blob_get_fd,
.sys_acl_set_file_fn = smb_full_audit_sys_acl_set_file,
.sys_acl_set_fd_fn = smb_full_audit_sys_acl_set_fd,
.sys_acl_delete_def_file_fn = smb_full_audit_sys_acl_delete_def_file,