From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 28 Jun 2010 23:10:18 +0000 (+0200)
Subject: main: don't abort if daemon_close_all() cannot close valgrind fds
X-Git-Url: http://git.meshlink.io/?a=commitdiff_plain;h=b0cab6e5f1186efe2367aee6ef05128b3b72d179;hp=0a7c7f28abdecb3e8665ffef227d0449f74e48c9;p=catta

main: don't abort if daemon_close_all() cannot close valgrind fds
---

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 6dd2dcd..ca1a854 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -1525,10 +1525,8 @@ int main(int argc, char *argv[]) {
             daemon_log_use = DAEMON_LOG_SYSLOG;
 
         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 (daemon_close_all(-1) < 0)
+                avahi_log_warn("Failed to close all remaining file descriptors: %s", strerror(errno));
 
         if (make_runtime_dir() < 0)
             goto finish;