diff options
author | Ray Strode <halfline@gmail.com> | 2018-07-19 14:08:54 +0000 |
---|---|---|
committer | Ray Strode <halfline@gmail.com> | 2018-07-19 14:08:54 +0000 |
commit | 47d6a70fab15cad094b90775f55dfbec80b38dc5 (patch) | |
tree | dbe3fb3f3736468972734252547bcb34722010a0 | |
parent | ec2f5a84fc190a6ce0da275067484e89dcc583d9 (diff) | |
parent | b0d1ca9ebf605abb63b95ef73d56d56a1109002e (diff) | |
download | gdm-47d6a70fab15cad094b90775f55dfbec80b38dc5.tar.gz |
Merge branch 'wip/rstrode/unblock-sigusr1' into 'master'
session-worker: unblock SIGUSR1 before PAM
Closes #399
See merge request GNOME/gdm!20
-rw-r--r-- | daemon/gdm-session-worker-job.c | 7 | ||||
-rw-r--r-- | daemon/gdm-session-worker.c | 15 |
2 files changed, 7 insertions, 15 deletions
diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c index 69dca2e5..7f3b4c14 100644 --- a/daemon/gdm-session-worker-job.c +++ b/daemon/gdm-session-worker-job.c @@ -117,12 +117,19 @@ session_worker_job_setup_journal_fds (void) static void session_worker_job_child_setup (GdmSessionWorkerJob *session_worker_job) { + sigset_t mask; session_worker_job_setup_journal_fds (); /* Terminate the process when the parent dies */ #ifdef HAVE_SYS_PRCTL_H prctl (PR_SET_PDEATHSIG, SIGTERM); #endif + /* + * Reset signal mask to default since it was altered by the + * manager process + */ + sigemptyset (&mask); + sigprocmask (SIG_SETMASK, &mask, NULL); } static void diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c index a0a755c6..c1d89cab 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c @@ -2026,8 +2026,6 @@ gdm_session_worker_start_session (GdmSessionWorker *worker, char *home_dir; int stdin_fd = -1, stdout_fd = -1, stderr_fd = -1; gboolean has_journald = FALSE, needs_controlling_terminal = FALSE; - sigset_t mask; - /* Leak the TTY into the session as stdin so that it stays open * without any races. */ if (worker->priv->session_tty_fd > 0) { @@ -2148,19 +2146,6 @@ gdm_session_worker_start_session (GdmSessionWorker *worker, */ signal (SIGPIPE, SIG_DFL); - /* - * Reset SIGUSR1 to default since it was blocked by the manager - * process for the X server startup handshake - */ - signal (SIGUSR1, SIG_DFL); - - /* - * Reset signal mask to default since it was altered by the - * manager process - */ - sigemptyset (&mask); - sigprocmask (SIG_SETMASK, &mask, NULL); - gdm_session_execute (worker->priv->arguments[0], worker->priv->arguments, (char **) |