From c371e9798b2f97ba07420b05526a604dd6da5602 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 8 Dec 2008 10:58:04 -0500
Subject: [PATCH] Allow DBus.Introspection and DBus.Peer by default

---
 bus/system.conf.in                          |    3 +++
 test/name-test/run-test-systemserver.sh     |   10 ++++++++++
 test/name-test/tmp-session-like-system.conf |    5 ++++-
 3 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/bus/system.conf.in b/bus/system.conf.in
index ac2822f..8f31cc3 100644
--- a/bus/system.conf.in
+++ b/bus/system.conf.in
@@ -50,6 +50,9 @@
          even if they aren't in here -->
     <allow send_destination="org.freedesktop.DBus"/>
     <allow receive_sender="org.freedesktop.DBus"/>
+    <!-- Introspection and Peer methods are always allowed -->
+    <allow send_interface="org.freedesktop.DBus.Introspectable"/>
+    <allow send_interface="org.freedesktop.DBus.Peer"/>
     <!-- allow sending valid replies -->
     <allow send_requested_reply="true" send_type="method_return"/>
     <allow send_requested_reply="true" send_type="error"/>
diff --git a/test/name-test/run-test-systemserver.sh b/test/name-test/run-test-systemserver.sh
index fd82326..538227a 100755
--- a/test/name-test/run-test-systemserver.sh
+++ b/test/name-test/run-test-systemserver.sh
@@ -39,3 +39,13 @@ if ! grep -q 'DBus.Error' echo-error-output.tmp; then
   echo "====="
   exit 1
 fi
+
+echo "running test-expected-echo-introspect"
+${DBUS_TOP_BUILDDIR}/libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/tools/dbus-send --print-reply --dest=org.freedesktop.DBus.TestSuiteEchoService /org/freedesktop/TestSuite org.freedesktop.DBus.Introspectable.Introspect >echo-introspect-output.tmp 2>&1
+if ! grep -q 'DTD D-BUS Object Introspection' echo-introspect-output.tmp; then
+  echo "Introspection failed; output was:"
+  echo "====="
+  cat echo-introspect-output.tmp
+  echo "====="
+  exit 1
+fi
diff --git a/test/name-test/tmp-session-like-system.conf b/test/name-test/tmp-session-like-system.conf
index e483c89..261c123 100644
--- a/test/name-test/tmp-session-like-system.conf
+++ b/test/name-test/tmp-session-like-system.conf
@@ -25,10 +25,13 @@
     <!-- But allow all users to connect -->
     <allow user="*"/>
     <!-- Allow anyone to talk to the message bus -->
-    <!-- FIXME I think currently these eallow rules are always implicit 
+    <!-- FIXME I think currently these allow rules are always implicit 
          even if they aren't in here -->
     <allow send_destination="org.freedesktop.DBus"/>
     <allow receive_sender="org.freedesktop.DBus"/>
+    <!-- Introspection and Peer methods are always allowed -->
+    <allow send_interface="org.freedesktop.DBus.Introspectable"/>
+    <allow send_interface="org.freedesktop.DBus.Peer"/>
     <!-- valid replies are always allowed -->
     <allow send_requested_reply="true" send_type="method_return"/>
     <allow send_requested_reply="true" send_type="error"/>
-- 
1.6.0.4