- synaptics docs update

[packages/XFree86.git] / XFree86-xdm-pam.patch

diff --git a/XFree86-xdm-pam.patch b/XFree86-xdm-pam.patch
index 699c7ca9310147d6df1b3a3f2420e39758db80c4..f14bce63d3e666f54a74be5b029bf1f3f59f2576 100644 (file)
--- a/XFree86-xdm-pam.patch
+++ b/XFree86-xdm-pam.patch
@@ -1,23 +1,11 @@
-diff -urN XFree86-4.0.1.orig/xc/programs/xdm/greeter/greet.c XFree86-4.0.1/xc/programs/xdm/greeter/greet.c
---- XFree86-4.0.1.orig/xc/programs/xdm/greeter/greet.c Wed Jun 14 21:43:33 2000
-+++ XFree86-4.0.1/xc/programs/xdm/greeter/greet.c      Sat Oct 21 02:00:56 2000
-@@ -180,7 +180,7 @@
-     int opcode, evbase, errbase, majret, minret;
-     unsigned int value = XkbPCF_GrabsUseXKBStateMask;
-     if (XkbQueryExtension (dpy, &opcode, &evbase, &errbase, &majret, &minret)) {
--      if (XkbSetPerClientControls (dpy, XkbPCF_GrabsUseXKBStateMask, &value))
-+      if (!XkbSetPerClientControls (dpy, XkbPCF_GrabsUseXKBStateMask, &value))
-           LogError ("%s\n", "SetPerClientControls failed");
-     }
-     }
-diff -urN XFree86-4.0.1.orig/xc/programs/xdm/greeter/verify.c XFree86-4.0.1/xc/programs/xdm/greeter/verify.c
---- XFree86-4.0.1.orig/xc/programs/xdm/greeter/verify.c        Wed Jun 14 21:43:33 2000
-+++ XFree86-4.0.1/xc/programs/xdm/greeter/verify.c     Sat Oct 21 02:00:56 2000
+diff -Nur XFree86-4.0.2.org/xc/programs/xdm/greeter/verify.c XFree86-4.0.2/xc/programs/xdm/greeter/verify.c
+--- XFree86-4.0.2.org/xc/programs/xdm/greeter/verify.c Wed Nov 29 17:46:09 2000
++++ XFree86-4.0.2/xc/programs/xdm/greeter/verify.c     Thu Dec 21 12:02:33 2000
 @@ -114,6 +114,7 @@
  
  #ifdef USE_PAM
  static char *PAM_password;
-+pam_handle_t *pamh;
++extern pam_handle_t *pamh;
  static int pam_error;
  
  static int PAM_conv (int num_msg,
@@ -26,7 +14,7 @@ diff -urN XFree86-4.0.1.orig/xc/programs/xdm/greeter/verify.c XFree86-4.0.1/xc/p
  {
        struct passwd   *p;
 -#ifdef USE_PAM
--      pam_handle_t *pamh = thepamh();
+-      pam_handle_t **pamhp = thepamhp();
 -#else
  #ifdef USESHADOW
        struct spwd     *sp;
@@ -34,31 +22,31 @@ diff -urN XFree86-4.0.1.orig/xc/programs/xdm/greeter/verify.c XFree86-4.0.1/xc/p
  #endif
  #ifdef __OpenBSD__
        char            *s;
-diff -urN XFree86-4.0.1.orig/xc/programs/xdm/session.c XFree86-4.0.1/xc/programs/xdm/session.c
---- XFree86-4.0.1.orig/xc/programs/xdm/session.c       Sat Jun 17 20:48:23 2000
-+++ XFree86-4.0.1/xc/programs/xdm/session.c    Sat Oct 21 02:02:15 2000
+diff -Nur XFree86-4.0.2.org/xc/programs/xdm/session.c XFree86-4.0.2/xc/programs/xdm/session.c
+--- XFree86-4.0.2.org/xc/programs/xdm/session.c        Tue Dec  5 01:59:35 2000
++++ XFree86-4.0.2/xc/programs/xdm/session.c    Thu Dec 21 12:06:41 2000
 @@ -97,9 +97,9 @@
  extern        char    *crypt(CRYPT_ARGS);
  #endif
  #ifdef USE_PAM
-+extern pam_handle_t *pamh;
- pam_handle_t *thepamh()
++pam_handle_t *pamh;
+ pam_handle_t **thepamhp()
  {
 -      static pam_handle_t *pamh = NULL;
-       return pamh;
+       return &pamh;
  }
- #endif
-@@ -467,9 +467,6 @@
-       ResetServer (d);
-     if (removeAuth)
-     {
--#ifdef USE_PAM
+ 
+@@ -472,9 +472,6 @@
+ SessionExit (struct display *d, int status, int removeAuth)
+ {
+ #ifdef USE_PAM
 -      pam_handle_t *pamh = thepamh();
 -#endif
-       setgid (verify.gid);
-       setuid (verify.uid);
-       RemoveUserAuthorization (d, &verify);
-@@ -523,9 +520,6 @@
+-#ifdef USE_PAM
+     if (pamh) {
+         /* shutdown PAM session */
+       pam_close_session(pamh, 0);
+@@ -535,9 +532,6 @@
      int       pid;
  #ifdef HAS_SETUSERCONTEXT
      struct passwd* pwd;