From 8aab22fe4545f69a278351f990ccd021f16e25ff Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 25 Nov 2015 10:51:43 +0100 Subject: [PATCH] core: don't handle SIGUSR1 and SIGUSR2 signals for pre 2.36.0 glib https://bugzilla.gnome.org/show_bug.cgi?id=758614 Reported-by: Glenn Washburn --- src/main-utils.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main-utils.c b/src/main-utils.c index 76dbc1500d..7425d0bc91 100644 --- a/src/main-utils.c +++ b/src/main-utils.c @@ -79,8 +79,11 @@ nm_main_utils_setup_signals (GMainLoop *main_loop) signal (SIGPIPE, SIG_IGN); g_unix_signal_add (SIGHUP, sighup_handler, GINT_TO_POINTER (SIGHUP)); - g_unix_signal_add (SIGUSR1, sighup_handler, GINT_TO_POINTER (SIGUSR1)); - g_unix_signal_add (SIGUSR2, sighup_handler, GINT_TO_POINTER (SIGUSR2)); + if (nm_glib_check_version (2, 36, 0)) { + g_unix_signal_add (SIGUSR1, sighup_handler, GINT_TO_POINTER (SIGUSR1)); + g_unix_signal_add (SIGUSR2, sighup_handler, GINT_TO_POINTER (SIGUSR2)); + } else + nm_log_warn (LOGD_CORE, "glib-version: cannot handle SIGUSR1 and SIGUSR2 signals. Consider upgrading glib to 2.36.0 or newer"); g_unix_signal_add (SIGINT, sigint_handler, main_loop); g_unix_signal_add (SIGTERM, sigterm_handler, main_loop); }