summaryrefslogtreecommitdiffstats
path: root/test/data
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-03-31 08:19:50 +0000
committerHavoc Pennington <hp@redhat.com>2003-03-31 08:19:50 +0000
commit29c71168cd17b11eed65023c97aff401d5305b01 (patch)
tree431a05106d857cf38abbdea74a375326f395485e /test/data
parentbc86794f23fa538a405813fb61b531c2eacc9ae1 (diff)
2003-03-31 Havoc Pennington <hp@pobox.com>
* dbus/dbus-transport-unix.c (_dbus_transport_new_for_domain_socket) (_dbus_transport_new_for_tcp_socket): these didn't need the "server" argument since they are always client side * dbus/dbus-server.c (dbus_server_get_address): new function * bus/main.c (main): take the configuration file as an argument. * test/data/valid-config-files/debug-allow-all.conf: new file to use with dispatch.c tests for example * bus/test-main.c (main): require test data dir * bus/bus.c (bus_context_new): change this to take a configuration file name as argument * doc/config-file.txt (Elements): add <servicedir> * bus/system.conf, bus/session.conf: new files * dbus/dbus-bus.c (dbus_bus_get): look for system bus on well-known socket if none set * configure.in: create system.conf and session.conf
Diffstat (limited to 'test/data')
-rw-r--r--test/data/valid-config-files/debug-allow-all.conf12
-rw-r--r--test/data/valid-config-files/session.conf31
-rw-r--r--test/data/valid-config-files/system.conf20
3 files changed, 63 insertions, 0 deletions
diff --git a/test/data/valid-config-files/debug-allow-all.conf b/test/data/valid-config-files/debug-allow-all.conf
new file mode 100644
index 00000000..86900ebb
--- /dev/null
+++ b/test/data/valid-config-files/debug-allow-all.conf
@@ -0,0 +1,12 @@
+<!-- Bus that listens on a debug pipe and doesn't create any restrictions -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+ <listen>debug-pipe:name=test-server</listen>
+ <policy context="default">
+ <allow send="*"/>
+ <allow receive="*"/>
+ <allow own="*"/>
+ </policy>
+</busconfig>
diff --git a/test/data/valid-config-files/session.conf b/test/data/valid-config-files/session.conf
new file mode 100644
index 00000000..fe7aa5f0
--- /dev/null
+++ b/test/data/valid-config-files/session.conf
@@ -0,0 +1,31 @@
+<!-- This configuration file controls the per-user-login-session message bus.
+ Add a session-local.conf and edit that rather than changing this
+ file directly. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+ <!-- FIXME - this is fairly complicated to fix.
+ Propose the following:
+ - add "unix:tmpdir=/tmp" which means unix domain transport
+ creates a socket with a random secure name
+ - add dbus_server_get_address() that gets the actual
+ server address
+ - add command line option or env variable to the daemon
+ causing it to print its list of addresses to a given
+ file descriptor
+ - session manager or whatever launches the session bus
+ reads the address from there and sets the env variable
+ -->
+ <listen>unix:path=/tmp/foobar</listen>
+ <policy context="default">
+ <!-- Allow everything -->
+ <allow send="*"/>
+ <allow receive="*"/>
+ <allow own="*"/>
+ </policy>
+
+ <!-- This is included last so local configuration can override what's
+ in this standard file -->
+ <include ignore_missing="yes">session-local.conf</include>
+</busconfig>
diff --git a/test/data/valid-config-files/system.conf b/test/data/valid-config-files/system.conf
new file mode 100644
index 00000000..e2c7ab7f
--- /dev/null
+++ b/test/data/valid-config-files/system.conf
@@ -0,0 +1,20 @@
+<!-- This configuration file controls the systemwide message bus.
+ Add a system-local.conf and edit that rather than changing this
+ file directly. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+ <user>fixme</user>
+ <listen>unix:path=/var/run/dbus/system_bus_socket</listen>
+ <policy context="default">
+ <!-- Deny everything -->
+ <deny send="*"/>
+ <deny receive="*"/>
+ <deny own="*"/>
+ </policy>
+
+ <!-- This is included last so local configuration can override what's
+ in this standard file -->
+ <include ignore_missing="yes">system-local.conf</include>
+</busconfig>