From 403920f796c3cbeca1bba58bda497da4770e7d0a Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Mon, 15 Sep 2014 12:55:54 +0100
Subject: Imported Upstream version 1.8.8

---
 bus/session.conf.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'bus/session.conf.in')

diff --git a/bus/session.conf.in b/bus/session.conf.in
index 74d9d1fd..cfe9544f 100644
--- a/bus/session.conf.in
+++ b/bus/session.conf.in
@@ -49,9 +49,11 @@
   <limit name="max_outgoing_bytes">1000000000</limit>
   <limit name="max_outgoing_unix_fds">250000000</limit>
   <limit name="max_message_size">1000000000</limit>
-  <limit name="max_message_unix_fds">@DEFAULT_MESSAGE_UNIX_FDS@</limit>
+  <!-- We do not override max_message_unix_fds here since the in-kernel
+       limit is also relatively low -->
   <limit name="service_start_timeout">120000</limit>  
   <limit name="auth_timeout">240000</limit>
+  <limit name="pending_fd_timeout">150000</limit>
   <limit name="max_completed_connections">100000</limit>  
   <limit name="max_incomplete_connections">10000</limit>
   <limit name="max_connections_per_user">100000</limit>
-- 
cgit v1.2.3