about summary refs log tree commit diff
path: root/src/main.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2013-02-09 03:16:54 +0100
committerMichael Biebl <biebl@debian.org>2013-02-09 03:16:54 +0100
commite17c5736fc3722ce51cb33f3edb203960125a4c1 (patch)
tree2b41ee92b307915e9d97f0ef2c012fc793653599 /src/main.c
parent9c202e3e860b3be9e1f8882630b69affbb130102 (diff)
Imported Upstream version 0.9.7.997 upstream/0.9.7.997
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/src/main.c b/src/main.c
index b074bd8a..85bfc272 100644
--- a/src/main.c
+++ b/src/main.c
@@ -88,22 +88,6 @@ signal_handling_thread (void *arg)
 		sigwait (&signal_set, &signo);
 
 		switch (signo) {
-		case SIGSEGV:
-		case SIGBUS:
-		case SIGILL:
-		case SIGABRT:
-		case SIGQUIT:
-			nm_log_warn (LOGD_CORE, "caught signal %d. Generating backtrace...", signo);
-			nm_logging_backtrace ();
-			exit (1);
-			break;
-		case SIGFPE:
-		case SIGPIPE:
-			nm_log_warn (LOGD_CORE, "caught signal %d, shutting down abnormally. Generating backtrace...", signo);
-			nm_logging_backtrace ();
-			quit_early = TRUE; /* for quitting before entering the main loop */
-			g_main_loop_quit (main_loop);
-			break;
 		case SIGINT:
 		case SIGTERM:
 			nm_log_info (LOGD_CORE, "caught signal %d, shutting down normally.", signo);
@@ -142,13 +126,6 @@ setup_signals (void)
 	sigemptyset (&signal_set);
 	sigaddset (&signal_set, SIGHUP);
 	sigaddset (&signal_set, SIGINT);
-	sigaddset (&signal_set, SIGQUIT);
-	sigaddset (&signal_set, SIGILL);
-	sigaddset (&signal_set, SIGABRT);
-	sigaddset (&signal_set, SIGFPE);
-	sigaddset (&signal_set, SIGBUS);
-	sigaddset (&signal_set, SIGSEGV);
-	sigaddset (&signal_set, SIGPIPE);
 	sigaddset (&signal_set, SIGTERM);
 	sigaddset (&signal_set, SIGUSR1);
 
@@ -529,16 +506,10 @@ main (int argc, char *argv[])
 	dbus_threads_init_default ();
 #endif
 
-#ifndef HAVE_DBUS_GLIB_DISABLE_LEGACY_PROP_ACCESS
-#error HAVE_DBUS_GLIB_DISABLE_LEGACY_PROP_ACCESS not defined
-#endif
-
-#if HAVE_DBUS_GLIB_DISABLE_LEGACY_PROP_ACCESS
 	/* Ensure that non-exported properties don't leak out, and that the
 	 * introspection 'access' permissions are respected.
 	 */
 	dbus_glib_global_set_disable_legacy_property_access ();
-#endif
 
 	nm_logging_start (become_daemon);