Attachment 44508 Details for Bug 35358 – process_config_first_time_only: initialize syslog as intended.

[patch] process_config_first_time_only: initialize syslog as intended.

0005-process_config_first_time_only-initialize-syslog-as-.patch (text/plain), 2.11 KB, created by Simon McVittie on 2011-03-16 08:22:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-03-16 08:22:02 UTC

Size: 2.11 KB

patch

obsolete

>From 84c7a6bf3a712eb6f065bd642ad59bbbcea6ca24 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 15 Mar 2011 15:42:56 +0000
>Subject: [PATCH 5/6] process_config_first_time_only: initialize syslog as intended.
>
>On Linux, we previously called openlog() (with different options!) while
>initializing SELinux; leave SELinux messages as LOG_USER|LOG_INFO in case
>anyone was relying on that, but let the rest of our log messages come
>out as LOG_DAEMON.
>
>Also enable LOG_PERROR (copy syslog messages to stderr) unconditionally;
>we can make this an autoconf check if anyone's pet Unix doesn't have
>LOG_PERROR.
>---
> bus/bus.c                     |    2 ++
> bus/selinux.c                 |    3 +--
> dbus/dbus-sysdeps-util-unix.c |    2 +-
> 3 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/bus/bus.c b/bus/bus.c
>index 1167596..19aefcc 100644
>--- a/bus/bus.c
>+++ b/bus/bus.c
>@@ -297,6 +297,8 @@ process_config_first_time_only (BusContext       *context,
>   retval = FALSE;
>   auth_mechanisms = NULL;
> 
>+  _dbus_init_system_log ();
>+
>   context->systemd_activation = systemd_activation;
> 
>   /* Check for an existing pid file. Of course this is a race;
>diff --git a/bus/selinux.c b/bus/selinux.c
>index fe04063..e94d8a8 100644
>--- a/bus/selinux.c
>+++ b/bus/selinux.c
>@@ -164,7 +164,7 @@ log_callback (const char *fmt, ...)
>   }
> #endif /* HAVE_LIBAUDIT */
>   
>-  vsyslog (LOG_INFO, fmt, ap);
>+  vsyslog (LOG_USER | LOG_INFO, fmt, ap);
>   va_end(ap);
> }
> 
>@@ -342,7 +342,6 @@ bus_selinux_full_init (void)
>     }
>   else
>     {
>-      openlog ("dbus", LOG_PERROR, LOG_USER);
>       _dbus_verbose ("Access Vector Cache (AVC) started.\n");
>     }
> 
>diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
>index ba8ca7f..a80f643 100644
>--- a/dbus/dbus-sysdeps-util-unix.c
>+++ b/dbus/dbus-sysdeps-util-unix.c
>@@ -425,7 +425,7 @@ _dbus_request_file_descriptor_limit (unsigned int limit)
> void 
> _dbus_init_system_log (void)
> {
>-  openlog ("dbus", LOG_PID, LOG_DAEMON);
>+  openlog ("dbus", LOG_PID | LOG_PERROR, LOG_DAEMON);
> }
> /**
>  * Log a message to the system log file (e.g. syslog on Unix).
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 35358: 44504 | 44505 | 44506 | 44507 | 44508 | 44509 | 44933 | 44934

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.