summaryrefslogtreecommitdiffstats
path: root/avahi-daemon/main.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-06-02 04:37:40 +0200
committerLennart Poettering <lennart@poettering.net>2010-06-25 00:59:31 +0200
commit238909aaff10489fe538c8c54e3f82fe8a54b849 (patch)
treeafe8cb2df6318fcc1c949ddc8284450a6c8fc9d4 /avahi-daemon/main.c
parent4de1dfb3b436075727bed0aed048c8a072d811f3 (diff)
systemd: add support for acquiring socket from systemd
Diffstat (limited to 'avahi-daemon/main.c')
-rw-r--r--avahi-daemon/main.c10
1 files changed, 6 insertions, 4 deletions
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;