gdm r6289 - in trunk: . daemon

[lmedinas svn gnome org]

Author: lmedinas
Date: Tue Jul  8 19:20:35 2008
New Revision: 6289
URL: http://svn.gnome.org/viewvc/gdm?rev=6289&view=rev

Log:
2008-07-08  Luis Medinas  <lmedinas gnome org>

        * daemon/gdm-session-worker.c 
(gdm_session_worker_initialize_pam):

        Added missing ifdefs for usage with pam_xauth_data feature
        from libpam. Patch from Mirco MÃller <macslow bangang de>.
        Closes bgo #541413.



Modified:
   trunk/ChangeLog
   trunk/daemon/gdm-session-worker.c

Modified: trunk/daemon/gdm-session-worker.c
==============================================================================
--- trunk/daemon/gdm-session-worker.c	(original)
+++ trunk/daemon/gdm-session-worker.c	Tue Jul  8 19:20:35 2008
@@ -927,6 +927,7 @@
 #endif
 }
 
+#ifdef PAM_XAUTHDATA
 static struct pam_xauth_data *
 _get_xauth_for_pam (const char *x11_authority_file)
 {
@@ -955,6 +956,7 @@
         XauDisposeAuth (auth);
         return retval;
 }
+#endif
 
 static gboolean
 gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
@@ -967,7 +969,9 @@
                                    GError          **error)
 {
         struct pam_conv        pam_conversation;
+#ifdef PAM_XAUTHDATA
         struct pam_xauth_data *pam_xauth;
+#endif
         int                    error_code;
         char                  *pam_tty;