diff options
author | Havoc Pennington <hp@redhat.com> | 2003-03-31 08:19:50 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2003-03-31 08:19:50 +0000 |
commit | 29c71168cd17b11eed65023c97aff401d5305b01 (patch) | |
tree | 431a05106d857cf38abbdea74a375326f395485e /doc | |
parent | bc86794f23fa538a405813fb61b531c2eacc9ae1 (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 'doc')
-rw-r--r-- | doc/Makefile.am | 1 | ||||
-rw-r--r-- | doc/config-file.txt | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index ff9249f6..2761155d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,5 @@ EXTRA_DIST= \ + config-file.txt \ dbus-specification.html \ dbus-specification.sgml \ dbus-test-plan.html \ diff --git a/doc/config-file.txt b/doc/config-file.txt index df1e43d8..5502c82b 100644 --- a/doc/config-file.txt +++ b/doc/config-file.txt @@ -62,7 +62,10 @@ Elements: Example: <listen>unix:path=/tmp/foo</listen> If there are multiple <listen> elements, then the bus listens - on multiple addresses. + on multiple addresses. The bus will pass its address to + activated services or other interested parties with + the last address given in <listen> first. That is, + apps will try to connect to the last <listen> address first. <auth> @@ -73,6 +76,13 @@ Elements: Example: <auth>EXTERNAL</auth> Example: <auth>DBUS_COOKIE_SHA1</auth> + <servicedir> + + Adds a directory to scan for .service files. Directories are + scanned starting with the last to appear in the config file + (the first .service file found that provides a particular + service will be used). + <policy> context="(default|mandatory)" one of the context/user/group attributes is mandatory |