[gdm] worker: give session control of the tty

[Ray Strode <halfline src gnome org>]

commit 99c4809c5589175855eceff2b73f9cbb6ac57aa1
Author: Ray Strode <rstrode redhat com>
Date:   Mon Feb 23 14:43:09 2015 -0500

    worker: give session control of the tty
    
    The X server relies on the controlling tty to be set up
    properly when getting run in a non-privileged mode.  This
    commit makes sure that happens.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=745031

 daemon/gdm-session-worker.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index 39e97b5..a5c684c 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -1836,7 +1836,7 @@ gdm_session_worker_start_session (GdmSessionWorker  *worker,
                 const char * const * environment;
                 char  *home_dir;
                 int    stdin_fd = -1, stdout_fd = -1, stderr_fd = -1;
-                gboolean has_journald = FALSE;
+                gboolean has_journald = FALSE, needs_controlling_terminal = FALSE;
                 sigset_t mask;
 
                 /* Leak the TTY into the session as stdin so that it stays open
@@ -1845,6 +1845,7 @@ gdm_session_worker_start_session (GdmSessionWorker  *worker,
                         dup2 (worker->priv->session_tty_fd, STDIN_FILENO);
                         close (worker->priv->session_tty_fd);
                         worker->priv->session_tty_fd = -1;
+                        needs_controlling_terminal = TRUE;
                 } else {
                         stdin_fd = open ("/dev/null", O_RDWR);
                         dup2 (stdin_fd, STDIN_FILENO);
@@ -1878,6 +1879,14 @@ gdm_session_worker_start_session (GdmSessionWorker  *worker,
                         _exit (2);
                 }
 
+#ifdef WITH_SYSTEMD
+                /* Take control of the tty
+                 */
+                if (needs_controlling_terminal) {
+                        ioctl (STDIN_FILENO, TIOCSCTTY, 0);
+                }
+#endif
+
                 environment = gdm_session_worker_get_environment (worker);
 
                 g_assert (geteuid () == getuid ());