X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=avahi-daemon%2Fmain.c;h=1e8b2559173a8bcef3147c2864c3f32ddfb87c4d;hb=d3b2b3e99d65d64a4bcb6311cb64389cc7605a37;hp=de84f0fad52f57e4783b5ee5b5a6314372b53ce4;hpb=cf299fa93b0763bb885cf934cc07767032f6f1ed;p=catta

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index de84f0f..1e8b255 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -1075,6 +1075,16 @@ static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GC
 /* Imported from ../avahi-client/nss-check.c */
 int avahi_nss_support(void);
 
+static void ignore_signal(int sig)  {
+    struct sigaction sa;
+
+    memset(&sa, 0, sizeof(sa));
+    sa.sa_handler = SIG_IGN;
+    sa.sa_flags = SA_RESTART;
+
+    sigaction(sig, &sa, NULL);
+}
+
 static int run_server(DaemonConfig *c) {
     int r = -1;
     int error;
@@ -1091,6 +1101,8 @@ static int run_server(DaemonConfig *c) {
 
     assert(c);
 
+    ignore_signal(SIGPIPE);
+
     if (!(nss_support = avahi_nss_support()))
         avahi_log_warn("WARNING: No NSS support for mDNS detected, consider installing nss-mdns!");
 
@@ -1217,6 +1229,7 @@ static int run_server(DaemonConfig *c) {
             break;
     }
 
+    r = 0;
 
 finish:
 
@@ -1573,6 +1586,9 @@ int main(int argc, char *argv[]) {
             if (daemon_close_all(-1) < 0)
                 avahi_log_warn("Failed to close all remaining file descriptors: %s", strerror(errno));
 
+        daemon_reset_sigs(-1);
+        daemon_unblock_sigs(-1);
+
         if (make_runtime_dir() < 0)
             goto finish;
 
@@ -1620,6 +1636,9 @@ int main(int argc, char *argv[]) {
 
         if (run_server(&config) == 0)
             r = 0;
+
+        avahi_log_info("%s "PACKAGE_VERSION" exiting.", argv0);
+        sd_notifyf(0, "STATUS=%s "PACKAGE_VERSION" exiting.", argv0);
     }
 
 finish: