From 238909aaff10489fe538c8c54e3f82fe8a54b849 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 2 Jun 2010 04:37:40 +0200 Subject: systemd: add support for acquiring socket from systemd --- avahi-daemon/main.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'avahi-daemon/main.c') diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index c3cbb0e..a32c706 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -79,6 +79,7 @@ #include "static-services.h" #include "static-hosts.h" #include "ini-file-parser.h" +#include "sd-daemon.h" #ifdef HAVE_DBUS #include "dbus-protocol.h" @@ -1455,10 +1456,11 @@ int main(int argc, char *argv[]) { if (config.use_syslog || config.daemonize) daemon_log_use = DAEMON_LOG_SYSLOG; - if (daemon_close_all(-1) < 0) { - avahi_log_error("Failed to close remaining file descriptors: %s", strerror(errno)); - goto finish; - } + if (sd_listen_fds(0) <= 0) + if (daemon_close_all(-1) < 0) { + avahi_log_error("Failed to close remaining file descriptors: %s", strerror(errno)); + goto finish; + } if (make_runtime_dir() < 0) goto finish; -- cgit