diff options
| author | Dan Winship <danw@redhat.com> | 2015-01-12 11:31:10 -0500 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2015-01-19 11:29:13 -0500 |
| commit | c5b3e93792ed4feadf9bf50c43bc6d0c3739c354 (patch) | |
| tree | bdd8ab844831c13955f0a9a195f787efb89545b4 /src/ppp-manager | |
| parent | 1c435dc87478d0bd917f555d16f1ad7dbf6c1e96 (diff) | |
| download | NetworkManager-c5b3e93792ed4feadf9bf50c43bc6d0c3739c354.tar.gz | |
core: use GUnixSignalWatchSource to simplify signal handling
Replace the pthread_sigwait()-based signal handling with
g_unix_signal_add()-based handling, and get rid of all the
now-unnecessary calls to nm_unblock_posix_signals() when spawning
subprocesses.
As a bonus, this also fixes the "^C in gdb kills NM too" bug.
Diffstat (limited to 'src/ppp-manager')
| -rw-r--r-- | src/ppp-manager/nm-ppp-manager.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 4fac96dcd2..c436ab4f43 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -46,7 +46,6 @@ #include "nm-ppp-manager.h" #include "nm-dbus-manager.h" #include "nm-logging.h" -#include "nm-posix-signals.h" #include "nm-platform.h" #include "nm-core-internal.h" @@ -1032,12 +1031,6 @@ pppd_child_setup (gpointer user_data G_GNUC_UNUSED) /* We are in the child process at this point */ pid_t pid = getpid (); setpgid (pid, pid); - - /* - * We blocked signals in main(). We need to restore original signal - * mask for pppd here so that it can receive signals. - */ - nm_unblock_posix_signals (NULL); } static void |