diff options
| author | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
| commit | 34b1c46437df982495d08a8bbb8bd0b262d8af48 (patch) | |
| tree | 1db29ec39d9f733922b3a33cabcc8e6486fa06aa /src/nm-activation-request.c | |
| parent | 50fc50153b0036516b853aa576dc435bd53ce736 (diff) | |
| parent | 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (diff) | |
Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
Diffstat (limited to 'src/nm-activation-request.c')
| -rw-r--r-- | src/nm-activation-request.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 30ce7515..2c084b87 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -35,7 +35,6 @@ #include "nm-device.h" #include "nm-active-connection.h" #include "nm-settings-connection.h" -#include "nm-posix-signals.h" #include "nm-auth-subject.h" G_DEFINE_TYPE (NMActRequest, nm_act_request, NM_TYPE_ACTIVE_CONNECTION) @@ -196,16 +195,6 @@ clear_share_rules (NMActRequest *req) priv->share_rules = NULL; } -static void -share_child_setup (gpointer user_data G_GNUC_UNUSED) -{ - /* We are in the child process at this point */ - pid_t pid = getpid (); - setpgid (pid, pid); - - nm_unblock_posix_signals (NULL); -} - void nm_act_request_set_shared (NMActRequest *req, gboolean shared) { @@ -243,7 +232,7 @@ nm_act_request_set_shared (NMActRequest *req, gboolean shared) nm_log_info (LOGD_SHARING, "Executing: %s", cmd); if (!g_spawn_sync ("/", argv, envp, G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, - share_child_setup, NULL, NULL, NULL, &status, &error)) { + NULL, NULL, NULL, NULL, &status, &error)) { nm_log_warn (LOGD_SHARING, "Error executing command: (%d) %s", error ? error->code : -1, (error && error->message) ? error->message : "(unknown)"); |