bus: Correct commented-out default auth_timeout in system.conf

Commit 54d26df5 "config: change default auth_timeout to 5 seconds"
reduced the hard-coded default from 30 to 5 seconds, and the
commented-out informational copy of this information in system.conf
reflected that.

Commit 02e1ddf9 'Revert "config: change default auth_timeout to 5 seconds"'
subsequently increased hard-coded default back to 30 seconds, but did
not update the commented-out version in this file.

See also CVE-2014-3639, fd.o #80919, fd.o #86431.

Fixes: 1a36f983 "Document default limits in system.conf.in"
Fixes: 02e1ddf9 'Revert "config: change default auth_timeout to 5 seconds"'
Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/bus/system.conf.in b/bus/system.conf.in
index d2f3244b192064dfd1e5317a7328685bfb9de7ba..dea09bd5fcb8bc09085ff2aee8abc7c288b1d3b8 100644 (file)
--- a/bus/system.conf.in
+++ b/bus/system.conf.in
@@ -117,7 +117,7 @@
   <!-- <limit name="max_message_size">33554432</limit> -->
   <!-- <limit name="max_message_unix_fds">16</limit> -->
   <!-- <limit name="service_start_timeout">25000</limit> -->
-  <!-- <limit name="auth_timeout">5000</limit> -->
+  <!-- <limit name="auth_timeout">30000</limit> -->
   <!-- <limit name="pending_fd_timeout">150000</limit> -->
   <!-- <limit name="max_completed_connections">2048</limit> -->
   <!-- <limit name="max_incomplete_connections">64</limit> -->