From: Simon McVittie Date: Fri, 1 Apr 2022 17:58:34 +0000 (+0100) Subject: activation-helper: Never crash if unable to write oom_score_adj X-Git-Tag: dbus-1.15.0~25^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad72e3b9e352f6cb1d568bb01f0d79c2a63fc276;p=thirdparty%2Fdbus.git 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 --- diff --git a/bus/activation-helper.c b/bus/activation-helper.c index 8a4fd732d..df0472ce3 100644 --- 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;