diff options
author | Lennart Poettering <lennart@poettering.net> | 2010-11-18 03:58:05 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2010-11-18 04:00:26 +0100 |
commit | 78f848c7c76c91a3c203c3289382bc2972803d3d (patch) | |
tree | 000cd0d8b9ae7bb91bfaabc156e79015a7e3d691 | |
parent | e5f8b9380b9cb893dbb3449c7b1635e256752591 (diff) |
daemon: we better stay away from SIGQUIT since it is supposed to cause a core dump
-rw-r--r-- | avahi-daemon/dbus-protocol.c | 2 | ||||
-rw-r--r-- | avahi-daemon/main.c | 6 | ||||
-rw-r--r-- | man/avahi-autoipd.8.xml.in | 2 | ||||
-rw-r--r-- | man/avahi-daemon.8.xml.in | 2 | ||||
-rw-r--r-- | man/avahi-dnsconfd.8.xml.in | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c index 91ea8fa..eb8a662 100644 --- a/avahi-daemon/dbus-protocol.c +++ b/avahi-daemon/dbus-protocol.c @@ -197,7 +197,7 @@ static DBusHandlerResult msg_signal_filter_impl(AVAHI_GCC_UNUSED DBusConnection server->reconnect_timeout = server->poll_api->timeout_new(server->poll_api, &tv, reconnect_callback, NULL); } else { avahi_log_warn("Disconnected from D-Bus, exiting."); - raise(SIGQUIT); + raise(SIGTERM); } return DBUS_HANDLER_RESULT_HANDLED; diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index 1e8b255..d46f40a 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -1046,12 +1046,10 @@ static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GC switch (sig) { case SIGINT: - case SIGQUIT: case SIGTERM: avahi_log_info( "Got %s, quitting.", - sig == SIGINT ? "SIGINT" : - (sig == SIGQUIT ? "SIGQUIT" : "SIGTERM")); + sig == SIGINT ? "SIGINT" : "SIGTERM"); avahi_simple_poll_quit(simple_poll_api); break; @@ -1113,7 +1111,7 @@ static int run_server(DaemonConfig *c) { poll_api = avahi_simple_poll_get(simple_poll_api); - if (daemon_signal_init(SIGINT, SIGQUIT, SIGHUP, SIGTERM, SIGUSR1, 0) < 0) { + if (daemon_signal_init(SIGINT, SIGHUP, SIGTERM, SIGUSR1, 0) < 0) { avahi_log_error("Could not register signal handlers (%s).", strerror(errno)); goto finish; } diff --git a/man/avahi-autoipd.8.xml.in b/man/avahi-autoipd.8.xml.in index 477beb8..bdd9579 100644 --- a/man/avahi-autoipd.8.xml.in +++ b/man/avahi-autoipd.8.xml.in @@ -139,7 +139,7 @@ </section> <section name="Signals"> - <p><arg>SIGINT, SIGTERM, SIGQUIT</arg>: avahi-autoipd will shutdown. (Same as <opt>--kill</opt>)</p> + <p><arg>SIGINT, SIGTERM</arg>: avahi-autoipd will shutdown. (Same as <opt>--kill</opt>)</p> <p><arg>SIGHUP</arg>: avahi-autoipd will reannounce the acquired IP address. (Same as <opt>--refresh</opt>)</p> </section> diff --git a/man/avahi-daemon.8.xml.in b/man/avahi-daemon.8.xml.in index e93fc73..0c2990d 100644 --- a/man/avahi-daemon.8.xml.in +++ b/man/avahi-daemon.8.xml.in @@ -142,7 +142,7 @@ </section> <section name="Signals"> - <p><arg>SIGINT, SIGTERM, SIGQUIT</arg>: avahi-daemon will shutdown. (Same as <opt>--kill</opt>).</p> + <p><arg>SIGINT, SIGTERM</arg>: avahi-daemon will shutdown. (Same as <opt>--kill</opt>).</p> <p><arg>SIGHUP</arg>: avahi-daemon will reload unicast DNS server data from <file>/etc/resolv.conf</file> and static service definitions from <file>@servicedir@/</file>. (Same as <opt>--reload</opt>)</p> diff --git a/man/avahi-dnsconfd.8.xml.in b/man/avahi-dnsconfd.8.xml.in index e01ab44..7b09cd4 100644 --- a/man/avahi-dnsconfd.8.xml.in +++ b/man/avahi-dnsconfd.8.xml.in @@ -84,7 +84,7 @@ </section> <section name="Signals"> - <p><arg>SIGINT, SIGTERM, SIGQUIT</arg>: avahi-dnsconfd will shutdown. This is issued by passing --kill to avahi-daemon.</p> + <p><arg>SIGINT, SIGTERM</arg>: avahi-dnsconfd will shutdown. This is issued by passing --kill to avahi-daemon.</p> <p><arg>SIGHUP</arg>: avahi-dnsconfd will refresh the DNS server data.</p> </section> |