diff options
Diffstat (limited to 'test/data')
-rw-r--r-- | test/data/valid-config-files/session.conf | 31 | ||||
-rw-r--r-- | test/data/valid-config-files/system.conf | 20 |
2 files changed, 0 insertions, 51 deletions
diff --git a/test/data/valid-config-files/session.conf b/test/data/valid-config-files/session.conf deleted file mode 100644 index fe7aa5f0..00000000 --- a/test/data/valid-config-files/session.conf +++ /dev/null @@ -1,31 +0,0 @@ -<!-- 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 deleted file mode 100644 index e2c7ab7f..00000000 --- a/test/data/valid-config-files/system.conf +++ /dev/null @@ -1,20 +0,0 @@ -<!-- 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> |