The branch, master has been updated via a125ea7 vfs: fix acl_blob_get* in vfs_full_audit via 47becf6 vfs: fix lock logging in vfs_full_audit from 48e6da6 Correct command help message
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a125ea7419142dfb86c4f32b1d46896f3bf40704 Author: David Disseldorp <dd...@samba.org> Date: Thu Sep 20 08:35:27 2012 +0200 vfs: fix acl_blob_get* in vfs_full_audit Plumb-in functions and use correct return types. Autobuild-User(master): David Disseldorp <dd...@samba.org> Autobuild-Date(master): Thu Sep 20 20:42:09 CEST 2012 on sn-devel-104 commit 47becf6e20a970d273afab8be176d8cbe5ab2b9c Author: David Disseldorp <dd...@samba.org> Date: Thu Sep 20 08:20:57 2012 +0200 vfs: fix lock logging in vfs_full_audit ----------------------------------------------------------------------- Summary of changes: source3/modules/vfs_full_audit.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c index 392baea..1a481ab 100644 --- a/source3/modules/vfs_full_audit.c +++ b/source3/modules/vfs_full_audit.c @@ -1649,7 +1649,7 @@ static NTSTATUS smb_full_audit_brl_lock_windows(struct vfs_handle_struct *handle do_log(SMB_VFS_OP_BRL_LOCK_WINDOWS, NT_STATUS_IS_OK(result), handle, "%s:%llu-%llu. type=%d. blocking=%d", fsp_str_do_log(br_lck->fsp), - plock->start, plock->size, plock->lock_type, blocking_lock ); + plock->start, plock->size, plock->lock_type, blocking_lock); return result; } @@ -1682,7 +1682,7 @@ static bool smb_full_audit_brl_cancel_windows(struct vfs_handle_struct *handle, do_log(SMB_VFS_OP_BRL_CANCEL_WINDOWS, (result == 0), handle, "%s:%llu-%llu:%d", fsp_str_do_log(br_lck->fsp), plock->start, - plock->size); + plock->size, plock->lock_type); return result; } @@ -1697,7 +1697,7 @@ static bool smb_full_audit_strict_lock(struct vfs_handle_struct *handle, do_log(SMB_VFS_OP_STRICT_LOCK, result, handle, "%s:%llu-%llu:%d", fsp_str_do_log(fsp), plock->start, - plock->size); + plock->size, plock->lock_type); return result; } @@ -1710,7 +1710,7 @@ static void smb_full_audit_strict_unlock(struct vfs_handle_struct *handle, do_log(SMB_VFS_OP_STRICT_UNLOCK, true, handle, "%s:%llu-%llu:%d", fsp_str_do_log(fsp), plock->start, - plock->size); + plock->size, plock->lock_type); } static NTSTATUS smb_full_audit_translate_name(struct vfs_handle_struct *handle, @@ -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, -- Samba Shared Repository