diff options
| author | Timur I. Bakeyev <timur@iXsystems.com> | 2018-07-02 01:05:36 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-07-05 09:40:59 +0200 |
| commit | 32e5b18d49332dff67833a9177032f85a4287717 (patch) | |
| tree | f45d5bc0527b8e9502817a1b6d60d965c4a31fcc /source3/modules/vfs_audit.c | |
| parent | dda99e49e3be6295cf91d4dffe010361469f8eb1 (diff) | |
| download | samba-32e5b18d49332dff67833a9177032f85a4287717.tar.gz | |
Make sure that vfs*audit modules recognize and accept all the syslog facilities.
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>
Diffstat (limited to 'source3/modules/vfs_audit.c')
| -rw-r--r-- | source3/modules/vfs_audit.c | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/source3/modules/vfs_audit.c b/source3/modules/vfs_audit.c index 24bc1e8db5f..95a595bd92c 100644 --- 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; |