s3: Add a new VFS op called SMB_VFS_TRANSLATE_NAME

[samba.git] / source3 / modules / vfs_full_audit.c

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 667db7a4bde14dd9a2083fdf041074b89301a86b..b5c9e6bd9c85ed4a17ba2cadef77e853f565828d 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -143,6 +143,7 @@ typedef enum _vfs_op_type {
        SMB_VFS_OP_BRL_CANCEL_WINDOWS,
        SMB_VFS_OP_STRICT_LOCK,
        SMB_VFS_OP_STRICT_UNLOCK,
+       SMB_VFS_OP_TRANSLATE_NAME,
 
        /* NT ACL operations. */
 
@@ -280,6 +281,7 @@ static struct {
        { SMB_VFS_OP_BRL_CANCEL_WINDOWS, "brl_cancel_windows" },
        { SMB_VFS_OP_STRICT_LOCK, "strict_lock" },
        { SMB_VFS_OP_STRICT_UNLOCK, "strict_unlock" },
+       { SMB_VFS_OP_TRANSLATE_NAME,    "translate_name" },
        { SMB_VFS_OP_FGET_NT_ACL,       "fget_nt_acl" },
        { SMB_VFS_OP_GET_NT_ACL,        "get_nt_acl" },
        { SMB_VFS_OP_FSET_NT_ACL,       "fset_nt_acl" },
@@ -510,6 +512,7 @@ static void do_log(vfs_op_type op, bool success, vfs_handle_struct *handle,
        char *audit_pre = NULL;
        va_list ap;
        char *op_msg = NULL;
+       int priority;
 
        if (success && (!log_success(handle, op)))
                goto out;
@@ -530,8 +533,15 @@ static void do_log(vfs_op_type op, bool success, vfs_handle_struct *handle,
                goto out;
        }
 
+       /*
+        * Specify the facility to interoperate with other syslog callers
+        * (smbd for example).
+        */
+       priority = audit_syslog_priority(handle) |
+           audit_syslog_facility(handle);
+
        audit_pre = audit_prefix(talloc_tos(), handle->conn);
-       syslog(audit_syslog_priority(handle), "%s|%s|%s|%s\n",
+       syslog(priority, "%s|%s|%s|%s\n",
                audit_pre ? audit_pre : "",
                audit_opname(op), err_msg, op_msg);
 
@@ -606,7 +616,9 @@ static int smb_full_audit_connect(vfs_handle_struct *handle,
        }
        ZERO_STRUCTP(pd);
 
+#ifndef WITH_SYSLOG
        openlog("smbd_audit", 0, audit_syslog_facility(handle));
+#endif
 
        init_bitmap(&pd->success_ops,
                    lp_parm_string_list(SNUM(handle->conn), "full_audit", "success",
@@ -1505,6 +1517,18 @@ static void smb_full_audit_strict_unlock(struct vfs_handle_struct *handle,
        return;
 }
 
+static NTSTATUS smb_full_audit_translate_name(vfs_handle_struct *handle,
+                                             char **mapped_name)
+{
+       NTSTATUS result;
+
+       result = SMB_VFS_NEXT_TRANSLATE_NAME(handle, mapped_name);
+
+       do_log(SMB_VFS_OP_TRANSLATE_NAME, NT_STATUS_IS_OK(result), handle, "");
+
+       return result;
+}
+
 static NTSTATUS smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
                                uint32 security_info,
                                SEC_DESC **ppdesc)
@@ -2219,6 +2243,7 @@ static struct vfs_fn_pointers vfs_full_audit_fns = {
        .brl_cancel_windows = smb_full_audit_brl_cancel_windows,
        .strict_lock = smb_full_audit_strict_lock,
        .strict_unlock = smb_full_audit_strict_unlock,
+       .translate_name = smb_full_audit_translate_name,
        .fget_nt_acl = smb_full_audit_fget_nt_acl,
        .get_nt_acl = smb_full_audit_get_nt_acl,
        .fset_nt_acl = smb_full_audit_fset_nt_acl,