summaryrefslogtreecommitdiff
path: root/source/modules
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-03-17 22:13:36 +0000
committerGerald Carter <jerry@samba.org>2005-03-17 22:13:36 +0000
commit7b804bdf24e71c91c594a4be47e64d569fddc4eb (patch)
tree012b5ae598cc1a787971d840f550a7ba4df1b049 /source/modules
parentdf807d2059a3712571a19442543a63880d3d6c3f (diff)
downloadsamba-7b804bdf24e71c91c594a4be47e64d569fddc4eb.tar.gz
r5870: syncing up for 3.0.12
svn merge -r5740:5743 $SVNURL/branches/SAMBA_3_0 svn merge -r5743:5746 $SVNURL/branches/SAMBA_3_0 svn merge -r5746:5749 $SVNURL/branches/SAMBA_3_0 svn merge -r5749:5751 $SVNURL/branches/SAMBA_3_0 svn merge -r5751:5752 $SVNURL/branches/SAMBA_3_0 svn merge -r5752:5757 $SVNURL/branches/SAMBA_3_0 svn merge -r5757:5759 $SVNURL/branches/SAMBA_3_0 svn merge -r5759:5760 $SVNURL/branches/SAMBA_3_0 svn merge -r5760:5762 $SVNURL/branches/SAMBA_3_0 svn merge -r5770:5776 $SVNURL/branches/SAMBA_3_0 svn merge -r5776:5786 $SVNURL/branches/SAMBA_3_0 svn merge -r5786:5789 $SVNURL/branches/SAMBA_3_0 svn merge -r5789:5790 $SVNURL/branches/SAMBA_3_0 svn merge -r5792:5804 $SVNURL/branches/SAMBA_3_0 svn merge -r5809:5812 $SVNURL/branches/SAMBA_3_0 svn merge -r5812:5813 $SVNURL/branches/SAMBA_3_0 svn merge -r5813:5816 $SVNURL/branches/SAMBA_3_0 svn merge -r5816:5817 $SVNURL/branches/SAMBA_3_0 svn merge -r5817:5820 $SVNURL/branches/SAMBA_3_0 svn merge -r5820:5825 $SVNURL/branches/SAMBA_3_0 svn merge -r5833:5835 $SVNURL/branches/SAMBA_3_0 svn merge -r5835:5836 $SVNURL/branches/SAMBA_3_0 svn merge -r5836:5840 $SVNURL/branches/SAMBA_3_0 svn merge -r5840:5843 $SVNURL/branches/SAMBA_3_0 svn merge -r5843:5844 $SVNURL/branches/SAMBA_3_0 svn merge -r5844:5847 $SVNURL/branches/SAMBA_3_0 svn merge -r5848:5851 $SVNURL/branches/SAMBA_3_0 svn merge -r5851:5854 $SVNURL/branches/SAMBA_3_0
Diffstat (limited to 'source/modules')
-rw-r--r--source/modules/vfs_full_audit.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/source/modules/vfs_full_audit.c b/source/modules/vfs_full_audit.c
index 09215d1e8d0..430ec8278a0 100644
--- a/source/modules/vfs_full_audit.c
+++ b/source/modules/vfs_full_audit.c
@@ -82,6 +82,10 @@ static int smb_full_audit_set_quota(struct vfs_handle_struct *handle,
struct connection_struct *conn,
enum SMB_QUOTA_TYPE qtype, unid_t id,
SMB_DISK_QUOTA *qt);
+static int smb_full_audit_get_shadow_copy_data(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
+ SHADOW_COPY_DATA *shadow_copy_data, BOOL labels);
+
static DIR *smb_full_audit_opendir(vfs_handle_struct *handle, connection_struct *conn,
const char *fname);
static SMB_STRUCT_DIRENT *smb_full_audit_readdir(vfs_handle_struct *handle,
@@ -303,6 +307,8 @@ static vfs_op_tuple audit_op_tuples[] = {
SMB_VFS_LAYER_LOGGER},
{SMB_VFS_OP(smb_full_audit_set_quota), SMB_VFS_OP_SET_QUOTA,
SMB_VFS_LAYER_LOGGER},
+ {SMB_VFS_OP(smb_full_audit_get_shadow_copy_data), SMB_VFS_OP_GET_SHADOW_COPY_DATA,
+ SMB_VFS_LAYER_LOGGER},
/* Directory operations */
@@ -395,9 +401,9 @@ static vfs_op_tuple audit_op_tuples[] = {
/* POSIX ACL operations. */
- {SMB_VFS_OP(smb_full_audit_chmod_acl), SMB_VFS_OP_CHMOD,
+ {SMB_VFS_OP(smb_full_audit_chmod_acl), SMB_VFS_OP_CHMOD_ACL,
SMB_VFS_LAYER_LOGGER},
- {SMB_VFS_OP(smb_full_audit_fchmod_acl), SMB_VFS_OP_FCHMOD,
+ {SMB_VFS_OP(smb_full_audit_fchmod_acl), SMB_VFS_OP_FCHMOD_ACL,
SMB_VFS_LAYER_LOGGER},
{SMB_VFS_OP(smb_full_audit_sys_acl_get_entry), SMB_VFS_OP_SYS_ACL_GET_ENTRY,
SMB_VFS_LAYER_LOGGER},
@@ -788,6 +794,19 @@ static int smb_full_audit_set_quota(struct vfs_handle_struct *handle,
return result;
}
+static int smb_full_audit_get_shadow_copy_data(struct vfs_handle_struct *handle,
+ struct files_struct *fsp,
+ SHADOW_COPY_DATA *shadow_copy_data, BOOL labels)
+{
+ int result;
+
+ result = SMB_VFS_NEXT_GET_SHADOW_COPY_DATA(handle, fsp, shadow_copy_data, labels);
+
+ do_log(SMB_VFS_OP_GET_SHADOW_COPY_DATA, (result >= 0), handle, "");
+
+ return result;
+}
+
static DIR *smb_full_audit_opendir(vfs_handle_struct *handle, connection_struct *conn,
const char *fname)
{