From c1b04cc6a53df3e9d1ba9783d3a1c8a46a1672c0 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 10 Oct 2013 00:45:15 +0200
Subject: [PATCH] Use TEST_LISTEN in incoming-listen.conf.in instead of unix
 only hardcoded address

---
 configure.ac                                        |    1 +
 test/data/valid-config-files/incoming-limit.conf    |   18 ------------------
 test/data/valid-config-files/incoming-limit.conf.in |   18 ++++++++++++++++++
 3 Dateien geändert, 19 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-)
 delete mode 100644 test/data/valid-config-files/incoming-limit.conf
 create mode 100644 test/data/valid-config-files/incoming-limit.conf.in

diff --git a/configure.ac b/configure.ac
index 9a51c57..51d72b9 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
deleted file mode 100644
index abfab3f..0000000
--- a/test/data/valid-config-files/incoming-limit.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- Our well-known bus type, don't change this -->
-  <type>session</type>
-  <listen>unix:tmpdir=/tmp</listen>
-
-  <policy context="default">
-    <!-- Allow everything to be sent -->
-    <allow send_destination="*" eavesdrop="true"/>
-    <!-- Allow everything to be received -->
-    <allow eavesdrop="true"/>
-    <!-- Allow anyone to own anything -->
-    <allow own="*"/>
-  </policy>
-
-  <limit name="max_incoming_bytes">1</limit>
-</busconfig>
diff --git a/test/data/valid-config-files/incoming-limit.conf.in b/test/data/valid-config-files/incoming-limit.conf.in
new file mode 100644
index 0000000..40ff224
--- /dev/null
+++ b/test/data/valid-config-files/incoming-limit.conf.in
@@ -0,0 +1,18 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- Our well-known bus type, don't change this -->
+  <type>session</type>
+  <listen>@TEST_LISTEN@</listen>
+
+  <policy context="default">
+    <!-- Allow everything to be sent -->
+    <allow send_destination="*" eavesdrop="true"/>
+    <!-- Allow everything to be received -->
+    <allow eavesdrop="true"/>
+    <!-- Allow anyone to own anything -->
+    <allow own="*"/>
+  </policy>
+
+  <limit name="max_incoming_bytes">1</limit>
+</busconfig>
-- 
1.7.10.4