summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dbus/dbus-spawn.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
index b4aff676..0459dc21 100644
--- a/dbus/dbus-spawn.c
+++ b/dbus/dbus-spawn.c
@@ -1397,13 +1397,11 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p,
}
else if (grandchild_pid == 0)
{
- const char *error_str = NULL;
-
- if (!_dbus_reset_oom_score_adj (&error_str))
- {
- /* TODO: Strictly speaking, this is not async-signal-safe. */
- _dbus_warn ("%s: %s", error_str, strerror (errno));
- }
+ /* This might not succeed in a dbus-daemon that started as root
+ * and dropped privileges, so don't log an error on failure.
+ * (Also, we can't safely log errors here anyway, because logging
+ * is not async-signal safe). */
+ _dbus_reset_oom_score_adj (NULL);
/* Go back to ignoring SIGPIPE, since it's evil
*/