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 /bus/config-parser.c | |
| 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 'bus/config-parser.c')
| -rw-r--r-- | bus/config-parser.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/bus/config-parser.c b/bus/config-parser.c index 972c05ac..bf4f6f7b 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -828,6 +828,13 @@ bus_config_parser_finished (BusConfigParser *parser, return FALSE; } + + if (parser->listen_on == NULL) + { + dbus_set_error (error, DBUS_ERROR_FAILED, + "Configuration file needs one or more <listen> elements giving addresses"); + return FALSE; + } return TRUE; } @@ -838,6 +845,12 @@ bus_config_parser_get_user (BusConfigParser *parser) return parser->user; } +DBusList** +bus_config_parser_get_addresses (BusConfigParser *parser) +{ + return &parser->listen_on; +} + #ifdef DBUS_BUILD_TESTS #include <stdio.h> |