summaryrefslogtreecommitdiff
path: root/dbus/dbus-message.c
diff options
context:
space:
mode:
authorMatt Fischer <matt.fischer@garmin.com>2013-02-20 15:23:42 -0600
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-04-11 13:34:55 +0100
commit977293549d909c50490f0376bc90ec3c93cb2ad5 (patch)
treeef76fa1d2e0cb0613007ba1330446a026abe7f61 /dbus/dbus-message.c
parent2ab900b678abb6df62790549b55230215f20a8a4 (diff)
downloaddbus-977293549d909c50490f0376bc90ec3c93cb2ad5.tar.gz
Set default maximum number of Unix fds according to OS
QNX has an arbitrary limit to the number of file descriptors which may be passed in a message, which is smaller than the current default. This patch therefore changes the default from a hardcoded constant to a macro, which is determined at configure time by looking at the host operating system. [This reduces the limit from 4096 (session)/1024 (system) to 128 fds per message on QNX, and 1024 fds per message on other operating systems. I think the reduced session bus limit on other OSs is a reasonable change too, given that the default hard/soft ulimits in Linux are only 4096/1024 fds per process. -smcv] Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61176 Reviewed-by: Simon McVittie <simon.mcvittie.collabora.co.uk>
Diffstat (limited to 'dbus/dbus-message.c')
-rw-r--r--dbus/dbus-message.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 71bcee60..619bc695 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -3802,7 +3802,7 @@ _dbus_message_loader_new (void)
SCM_RIGHTS works we need to preallocate an fd array of the maximum
number of unix fds we want to receive in advance. A
try-and-reallocate loop is not possible. */
- loader->max_message_unix_fds = 1024;
+ loader->max_message_unix_fds = DBUS_DEFAULT_MESSAGE_UNIX_FDS;
if (!_dbus_string_init (&loader->data))
{