fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-30 16:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Make uid 0 immune to pending_fd_timeout limit"

Browse source 
This reverts commit 3f407671ec.

This special case is no longer needed: we believe we have now fixed the
root cause.
This commit is contained in:
Simon McVittie 2017-02-01 10:55:48 +00:00
parent 892f084eed
commit e0cfe554bc
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bus/connection.c
View file

@ -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)",