summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2012-05-16 11:56:33 +1200
committerRobert Ancell <robert.ancell@canonical.com>2012-05-16 11:56:33 +1200
commite0b6875af56f621ab4cb295e52e79538a2e2fc71 (patch)
tree35853c48a8a3c6b98c579359b45b08748d212b3e /src
parentdfc2ba3299f2879524c6c51b302e446cd2b3ee70 (diff)
downloadlightdm-e0b6875af56f621ab4cb295e52e79538a2e2fc71.tar.gz
Don't set PAM_XDISPLAY or PAM_XAUTHDATA if not supported
Diffstat (limited to 'src')
-rw-r--r--src/session-child.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/session-child.c b/src/session-child.c
index b04ae2d9..f871069f 100644
--- a/src/session-child.c
+++ b/src/session-child.c
@@ -255,11 +255,15 @@ session_child_run (int argc, char **argv)
}
if (xdisplay)
{
+#ifdef PAM_XDISPLAY
pam_set_item (pam_handle, PAM_XDISPLAY, xdisplay);
+#endif
pam_set_item (pam_handle, PAM_TTY, xdisplay);
}
else if (tty)
pam_set_item (pam_handle, PAM_TTY, tty);
+
+#ifdef PAM_XAUTHDATA
if (xauthority)
{
struct pam_xauth_data value;
@@ -270,6 +274,7 @@ session_child_run (int argc, char **argv)
value.datalen = xauth_get_authorization_data_length (xauthority);
pam_set_item (pam_handle, PAM_XAUTHDATA, &value);
}
+#endif
/* Authenticate */
if (do_authenticate)