From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 9 Oct 2013 22:45:15 +0000 (+0200)
Subject: Use TEST_LISTEN in incoming-listen.conf.in instead of unix only hardcoded address
X-Git-Tag: dbus-1.7.8~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f0366019d6f344c64b23a0cac29c175fed1673e;p=thirdparty%2Fdbus.git

Use TEST_LISTEN in incoming-listen.conf.in instead of unix only hardcoded address

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68506
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/configure.ac b/configure.ac
index bfacd0a47..b29c8f092 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1774,6 +1774,7 @@ dbus-1.pc
 dbus-1-uninstalled.pc
 test/data/valid-config-files/debug-allow-all.conf
 test/data/valid-config-files/debug-allow-all-sha1.conf
+test/data/valid-config-files/incoming-limit.conf
 test/data/valid-config-files-system/debug-allow-all-pass.conf
 test/data/valid-config-files-system/debug-allow-all-fail.conf
 test/data/valid-service-files/org.freedesktop.DBus.TestSuite.PrivServer.service
diff --git a/test/data/valid-config-files/incoming-limit.conf b/test/data/valid-config-files/incoming-limit.conf.in
similarity index 94%
rename from test/data/valid-config-files/incoming-limit.conf
rename to test/data/valid-config-files/incoming-limit.conf.in
index abfab3f77..40ff22447 100644
--- a/test/data/valid-config-files/incoming-limit.conf
+++ b/test/data/valid-config-files/incoming-limit.conf.in
@@ -3,7 +3,7 @@
 <busconfig>
   <!-- Our well-known bus type, don't change this -->
   <type>session</type>
-  <listen>unix:tmpdir=/tmp</listen>
+  <listen>@TEST_LISTEN@</listen>
 
   <policy context="default">
     <!-- Allow everything to be sent -->