From 3ad9d108a7404d625454efda0d000e4caa543e7a Mon Sep 17 00:00:00 2001 From: tprouty Date: Wed, 26 Aug 2009 01:38:14 +0000 Subject: s3: Allow full_audit to play nice with smbd if it's using syslog Explictly pass the facility from both smbd and full_audit to syslog. Really the only major change is to not call openlog() in full_audit if WITH_SYSLOG is defined, which implies that smbd is already using syslog. This allows full audit to piggy-back on the same ident as smbd, while still differentiating the logging via the facility. --- source3/lib/debug.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/lib') diff --git a/source3/lib/debug.c b/source3/lib/debug.c index e7dcfb4fdf..2e19f89863 100644 --- a/source3/lib/debug.c +++ b/source3/lib/debug.c @@ -856,6 +856,12 @@ void check_log_size( void ) else priority = priority_map[syslog_level]; + /* + * Specify the facility to interoperate with other syslog + * callers (vfs_full_audit for example). + */ + priority |= SYSLOG_FACILITY; + va_start(ap, format_str); ret = vasprintf(&msgbuf, format_str, ap); va_end(ap); -- cgit