From 9746758a2e5fb5c237382b62de0a1e079a1ef6e9 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Fri, 7 Mar 2025 15:10:00 +0000
Subject: [PATCH] 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>
---
 bus/system.conf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bus/system.conf.in b/bus/system.conf.in
index d2f3244b..dea09bd5 100644
--- 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> -->