diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-06 23:15:41 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-06 23:15:41 +0000 |
| commit | 856361ff5b8ce701cdb447085931d3076ee52008 (patch) | |
| tree | 05aa6d44983e8eff29bc45b9dc94ff8b7998fe3c /bus/system.conf.in | |
| parent | c8991b0f95a3b53bc98de9e029780bbe0a0b3114 (diff) | |
2003-04-06 Havoc Pennington <hp@pobox.com>
* dbus/dbus-sysdeps.c (_dbus_become_daemon): write the pidfile
here in the parent process, so we can return an error if it
fails. Also, move some of the code into the child so the parent
is less hosed if we fail midway through.
* bus/bus.c (bus_context_new): move pidfile detection further up
in the function, before we start overwriting sockets and such.
* bus/messagebus.in: adjust this a bit, not sure if it will work.
* configure.in: add --with-system-pid-file and --with-system-socket
2003-04-06 Colin Walters <walters@verbum.org>
* configure.in (DBUS_SYSTEM_PID_FILE): New variable.
* bus/system.conf.in: Declare a pidfile.
* bus/bus.c (bus_context_new): Test for an existing pid file, and
create one (if appropriate).
* bus/config-parser.c (enum ElementType) [ELEMENT_PIDFILE]: New.
(struct BusConfigParser) [pidfile]: New.
(element_type_to_name, merge_included, start_busconfig_child)
(bus_config_parser_end_element, bus_config_parser_content): Handle it.
(bus_config_parser_unref): Free it.
(bus_config_parser_get_pidfile): New function.
* bus/config-parser.h (_dbus_write_pid_file): Prototype.
* dbus/dbus-errors.h (DBUS_ERROR_PIDFILE_EXISTS): New error.
* dbus/dbus-sysdeps.c (_dbus_write_pid_file): New function.
* dbus/dbus-sysdeps.h: Prototype it.
Diffstat (limited to 'bus/system.conf.in')
| -rw-r--r-- | bus/system.conf.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bus/system.conf.in b/bus/system.conf.in index 15a4972e..0e570575 100644 --- a/bus/system.conf.in +++ b/bus/system.conf.in @@ -20,11 +20,14 @@ <!-- Fork into daemon mode --> <fork/> + <!-- Write a pid file --> + <pidfile>@DBUS_SYSTEM_PID_FILE@</pidfile> + <!-- Only allow socket-credentials-based authentication --> <auth>EXTERNAL</auth> <!-- Only listen on a local socket --> - <listen>unix:path=@EXPANDED_LOCALSTATEDIR@/@DBUS_SYSTEM_SOCKET@</listen> + <listen>unix:path=@DBUS_SYSTEM_SOCKET@</listen> <policy context="default"> <!-- Deny everything then punch holes --> |