Don't set PAM_XDISPLAY or PAM_XAUTHDATA if not supported

diff --git a/NEWS b/NEWS
index c7a738e9056eda6785f02715b4d526a86be58d16..f35ddbaf949f6be5a5f066247589e117c3a0e404 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Overview of changes in lightdm 1.3.1
 
     * Fix wrapper path in AppArmor profile (broken since 1.1.1)
     * Add show-manual-login and allow-guest options to lightdm-set-defaults
+    * Don't set PAM_XDISPLAY or PAM_XAUTHDATA if not supported
 
 Overview of changes in lightdm 1.2.0
 

diff --git a/src/session-child.c b/src/session-child.c
index b04ae2d9a5b5eb2aeb54a6d2e6fe186c2550eccd..f871069fd391e97c16300f8dc00f5214a5fafc44 100644 (file)
--- 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)