git.samba.org / kamenim / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dda99e4)
Make sure that vfs*audit modules recognize and accept all the syslog facilities.
authorTimur I. Bakeyev <timur@iXsystems.com>
Sun, 1 Jul 2018 23:05:36 +0000 (01:05 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 5 Jul 2018 07:40:59 +0000 (09:40 +0200)
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13436

Signed-off-by: Timur I. Bakeyev <timur@iXsystems.com>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source3/modules/vfs_audit.c patch | blob | history
source3/modules/vfs_extd_audit.c patch | blob | history
source3/modules/vfs_full_audit.c patch | blob | history

diff --git a/source3/modules/vfs_audit.c b/source3/modules/vfs_audit.c
index 24bc1e8db5f8767ebac5ebc5c7ced9e2dcbc0157..95a595bd92c497c0bfe39f4eff363bff8cff254f 100644 (file)
--- a/source3/modules/vfs_audit.c
+++ b/source3/modules/vfs_audit.c
@@ -33,16 +33,32 @@
 static int audit_syslog_facility(vfs_handle_struct *handle)
 {
        static const struct enum_list enum_log_facilities[] = {
-               { LOG_USER, "USER" },
-               { LOG_LOCAL0, "LOCAL0" },
-               { LOG_LOCAL1, "LOCAL1" },
-               { LOG_LOCAL2, "LOCAL2" },
-               { LOG_LOCAL3, "LOCAL3" },
-               { LOG_LOCAL4, "LOCAL4" },
-               { LOG_LOCAL5, "LOCAL5" },
-               { LOG_LOCAL6, "LOCAL6" },
-               { LOG_LOCAL7, "LOCAL7" },
-               { -1, NULL}
+               { LOG_AUTH,     "AUTH" },
+               { LOG_CRON,     "CRON" },
+               { LOG_DAEMON,   "DAEMON" },
+               { LOG_FTP,      "FTP" },
+               { LOG_KERN,     "KERN" },
+               { LOG_LPR,      "LPR" },
+               { LOG_MAIL,     "MAIL" },
+               { LOG_NEWS,     "NEWS" },
+#ifdef LOG_NTP
+               { LOG_NTP,      "NTP" },
+#endif
+#ifdef LOG_SECURITY
+               { LOG_SECURITY, "SECURITY" },
+#endif
+               { LOG_SYSLOG,   "SYSLOG" },
+               { LOG_USER,     "USER" },
+               { LOG_UUCP,     "UUCP" },
+               { LOG_LOCAL0,   "LOCAL0" },
+               { LOG_LOCAL1,   "LOCAL1" },
+               { LOG_LOCAL2,   "LOCAL2" },
+               { LOG_LOCAL3,   "LOCAL3" },
+               { LOG_LOCAL4,   "LOCAL4" },
+               { LOG_LOCAL5,   "LOCAL5" },
+               { LOG_LOCAL6,   "LOCAL6" },
+               { LOG_LOCAL7,   "LOCAL7" },
+               { -1,           NULL }
        };
 
        int facility;
@@ -64,7 +80,7 @@ static int audit_syslog_priority(vfs_handle_struct *handle)
                { LOG_NOTICE, "NOTICE" },
                { LOG_INFO, "INFO" },
                { LOG_DEBUG, "DEBUG" },
-               { -1, NULL}
+               { -1, NULL }
        };
 
        int priority;
diff --git a/source3/modules/vfs_extd_audit.c b/source3/modules/vfs_extd_audit.c
index 50bd6f8f758a05af2e588704b62dae1d470be792..a76bb781c212710ed7408d7325d7cac79b913317 100644 (file)
--- a/source3/modules/vfs_extd_audit.c
+++ b/source3/modules/vfs_extd_audit.c
@@ -36,16 +36,32 @@ static int vfs_extd_audit_debug_level = DBGC_VFS;
 static int audit_syslog_facility(vfs_handle_struct *handle)
 {
        static const struct enum_list enum_log_facilities[] = {
-               { LOG_USER, "USER" },
-               { LOG_LOCAL0, "LOCAL0" },
-               { LOG_LOCAL1, "LOCAL1" },
-               { LOG_LOCAL2, "LOCAL2" },
-               { LOG_LOCAL3, "LOCAL3" },
-               { LOG_LOCAL4, "LOCAL4" },
-               { LOG_LOCAL5, "LOCAL5" },
-               { LOG_LOCAL6, "LOCAL6" },
-               { LOG_LOCAL7, "LOCAL7" },
-               { -1, NULL}
+               { LOG_AUTH,     "AUTH" },
+               { LOG_CRON,     "CRON" },
+               { LOG_DAEMON,   "DAEMON" },
+               { LOG_FTP,      "FTP" },
+               { LOG_KERN,     "KERN" },
+               { LOG_LPR,      "LPR" },
+               { LOG_MAIL,     "MAIL" },
+               { LOG_NEWS,     "NEWS" },
+#ifdef LOG_NTP
+               { LOG_NTP,      "NTP" },
+#endif
+#ifdef LOG_SECURITY
+               { LOG_SECURITY, "SECURITY" },
+#endif
+               { LOG_SYSLOG,   "SYSLOG" },
+               { LOG_USER,     "USER" },
+               { LOG_UUCP,     "UUCP" },
+               { LOG_LOCAL0,   "LOCAL0" },
+               { LOG_LOCAL1,   "LOCAL1" },
+               { LOG_LOCAL2,   "LOCAL2" },
+               { LOG_LOCAL3,   "LOCAL3" },
+               { LOG_LOCAL4,   "LOCAL4" },
+               { LOG_LOCAL5,   "LOCAL5" },
+               { LOG_LOCAL6,   "LOCAL6" },
+               { LOG_LOCAL7,   "LOCAL7" },
+               { -1,           NULL }
        };
 
        int facility;
@@ -67,7 +83,7 @@ static int audit_syslog_priority(vfs_handle_struct *handle)
                { LOG_NOTICE, "NOTICE" },
                { LOG_INFO, "INFO" },
                { LOG_DEBUG, "DEBUG" },
-               { -1, NULL}
+               { -1, NULL }
        };
 
        int priority;
diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index d76ec407759f259a9a98e0eb6464b2310d85f5dd..5a7af1b7d471a6bcc98097deacf672588a2d0cfb 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -350,16 +350,32 @@ static struct {
 static int audit_syslog_facility(vfs_handle_struct *handle)
 {
        static const struct enum_list enum_log_facilities[] = {
-               { LOG_USER, "USER" },
-               { LOG_LOCAL0, "LOCAL0" },
-               { LOG_LOCAL1, "LOCAL1" },
-               { LOG_LOCAL2, "LOCAL2" },
-               { LOG_LOCAL3, "LOCAL3" },
-               { LOG_LOCAL4, "LOCAL4" },
-               { LOG_LOCAL5, "LOCAL5" },
-               { LOG_LOCAL6, "LOCAL6" },
-               { LOG_LOCAL7, "LOCAL7" },
-               { -1, NULL}
+               { LOG_AUTH,     "AUTH" },
+               { LOG_CRON,     "CRON" },
+               { LOG_DAEMON,   "DAEMON" },
+               { LOG_FTP,      "FTP" },
+               { LOG_KERN,     "KERN" },
+               { LOG_LPR,      "LPR" },
+               { LOG_MAIL,     "MAIL" },
+               { LOG_NEWS,     "NEWS" },
+#ifdef LOG_NTP
+               { LOG_NTP,      "NTP" },
+#endif
+#ifdef LOG_SECURITY
+               { LOG_SECURITY, "SECURITY" },
+#endif
+               { LOG_SYSLOG,   "SYSLOG" },
+               { LOG_USER,     "USER" },
+               { LOG_UUCP,     "UUCP" },
+               { LOG_LOCAL0,   "LOCAL0" },
+               { LOG_LOCAL1,   "LOCAL1" },
+               { LOG_LOCAL2,   "LOCAL2" },
+               { LOG_LOCAL3,   "LOCAL3" },
+               { LOG_LOCAL4,   "LOCAL4" },
+               { LOG_LOCAL5,   "LOCAL5" },
+               { LOG_LOCAL6,   "LOCAL6" },
+               { LOG_LOCAL7,   "LOCAL7" },
+               { -1,           NULL }
        };
 
        int facility;
@@ -380,7 +396,7 @@ static int audit_syslog_priority(vfs_handle_struct *handle)
                { LOG_NOTICE, "NOTICE" },
                { LOG_INFO, "INFO" },
                { LOG_DEBUG, "DEBUG" },
-               { -1, NULL}
+               { -1, NULL }
        };
 
        int priority;
Unnamed repository; edit this file 'description' to name the repository.