xsession-child.c: Set PAM_XDISPLAY pam item. (Closes: #713960). Thank…

…s to Sjoerd Simons for providing the patch.
spanezz · Mar 23, 2016 · 2d2e8c4 · 2d2e8c4
1 parent 9b8ec1e
commit 2d2e8c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -10,6 +10,8 @@ nodm (0.12-1) UNRELEASED; urgency=low
   * Upstream code:
     - Bump upstream version to 0.12. Become new co-maintainer of nodm in Debian.
       (Closes: #813210).
+    - xsession-child.c: Set PAM_XDISPLAY pam item. (Closes: #713960). Thanks to
+      Sjoerd Simons for providing the patch.
   * debian/control:
     + Process with wrap-and-sort.
 

diff --git a/xsession-child.c b/xsession-child.c
@@ -219,6 +219,9 @@ static int setup_pam(struct nodm_xsession_child* s)
     s->pam_status = pam_set_item(s->pamh, PAM_TTY, (const void *) tty);
     if (s->pam_status == PAM_SUCCESS)
         s->pam_status = pam_set_item(s->pamh, PAM_RUSER, (const void *) "root");
+    if (s->pam_status == PAM_SUCCESS)
+        s->pam_status = pam_set_item(s->pamh, PAM_XDISPLAY, (const void *)
+          s->srv->name);
     if (s->pam_status != PAM_SUCCESS) {
         log_err("pam_set_item: %s", pam_strerror(s->pamh, s->pam_status));
         return E_PAM_ERROR;