From: Simon McVittie <smcv@debian.org>
Date: Wed, 1 Feb 2017 10:55:48 +0000 (+0000)
Subject: Revert "Make uid 0 immune to pending_fd_timeout limit"
X-Git-Tag: dbus-1.11.10~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0cfe554bc04bdc9ec08c6f174182d5ab887fe0a;p=thirdparty%2Fdbus.git

Revert "Make uid 0 immune to pending_fd_timeout limit"

This reverts commit 3f407671ecf821eb38ea7af5b160bfb93a9f4584.

This special case is no longer needed: we believe we have now fixed the
root cause.
---

diff --git a/bus/connection.c b/bus/connection.c
index 4337dc845..dd02ccd03 100644
--- a/bus/connection.c
+++ b/bus/connection.c
@@ -701,24 +701,10 @@ pending_unix_fds_timeout_cb (void *data)
 {
   DBusConnection *connection = data;
   BusConnectionData *d = BUS_CONNECTION_DATA (connection);
-  unsigned long uid;
   int limit;
 
   _dbus_assert (d != NULL);
   limit = bus_context_get_pending_fd_timeout (d->connections->context);
-
-  if (dbus_connection_get_unix_user (connection, &uid) && uid == 0)
-    {
-      bus_context_log (d->connections->context, DBUS_SYSTEM_LOG_WARNING,
-                       "Connection \"%s\" (%s) has had Unix fds pending for "
-                       "too long (pending_fd_timeout=%dms); tolerating it, "
-                       "because it has uid 0",
-                       d->name != NULL ? d->name : "(null)",
-                       bus_connection_get_loginfo (connection),
-                       limit);
-      return TRUE;
-    }
-
   bus_context_log (d->connections->context, DBUS_SYSTEM_LOG_WARNING,
       "Connection \"%s\" (%s) has had Unix fds pending for too long, "
       "closing it (pending_fd_timeout=%d ms)",