activation-helper: Never crash if unable to write oom_score_adj

_dbus_warn() normally only logs a warning, but can be made fatal by
environment variables. In particular, we do that during unit testing,
which can result in a build-time test failure if dbus is built in a
sandbox environment that prevents write access.

_dbus_log() does only the logging part of _dbus_warn(), which seems
more appropriate here.

Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/bus/activation-helper.c b/bus/activation-helper.c
index 8a4fd732df59bb25fe89c4227195fc7ee310f3fa..df0472ce3169cd520792c317685329306b988ecf 100644 (file)
--- a/bus/activation-helper.c
+++ b/bus/activation-helper.c
@@ -348,7 +348,7 @@ exec_for_correct_user (char *exec, char *user, DBusError *error)
   /* Resetting the OOM score adjustment is best-effort, so we don't
    * treat a failure to do so as fatal. */
   if (!_dbus_reset_oom_score_adj (&error_str))
-    _dbus_warn ("%s: %s", error_str, strerror (errno));
+    _dbus_log (DBUS_SYSTEM_LOG_WARNING, "%s: %s", error_str, strerror (errno));
 
   if (!switch_user (user, error))
     return FALSE;