Minor problem with commit 32e5b18d493
Christopher O Cowan
Christopher.O.Cowan at ibm.com
Fri Jul 6 23:33:58 UTC 2018
LOG_FTP is not defined in /usr/include/sys/syslog.h on some platforms like
AIX, so these 3 files need an #ifdef LOG_FTP wrapper, like LOG_NTP.
I quickly compared and noticed there's no LOG_AUTHPRIV on AIX either, even
though I find it on RHEL.
commit 32e5b18d493
Author: Timur I. Bakeyev <timur at iXsystems.com>
Date: Mon Jul 2 01:05:36 2018 +0200
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 at iXsystems.com>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
---
source3/modules/vfs_audit.c | 38 ++++++++++++++++++++++++++
+-----------
source3/modules/vfs_extd_audit.c | 38 ++++++++++++++++++++++++++
+-----------
source3/modules/vfs_full_audit.c | 38 ++++++++++++++++++++++++++
+-----------
3 files changed, 81 insertions(+), 33 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
More information about the samba-technical
mailing list