XFree86-xdm-pam.patch

   1 diff -urN XFree86-4.0.1.orig/xc/programs/xdm/greeter/greet.c XFree86-4.0.1/xc/programs/xdm/greeter/greet.c
   2 --- XFree86-4.0.1.orig/xc/programs/xdm/greeter/greet.c  Wed Jun 14 21:43:33 2000
   3 +++ XFree86-4.0.1/xc/programs/xdm/greeter/greet.c       Sat Oct 21 02:00:56 2000
   4 @@ -180,7 +180,7 @@
   5      int opcode, evbase, errbase, majret, minret;
   6      unsigned int value = XkbPCF_GrabsUseXKBStateMask;
   7      if (XkbQueryExtension (dpy, &opcode, &evbase, &errbase, &majret, &minret)) {
   8 -       if (XkbSetPerClientControls (dpy, XkbPCF_GrabsUseXKBStateMask, &value))
   9 +       if (!XkbSetPerClientControls (dpy, XkbPCF_GrabsUseXKBStateMask, &value))
  10             LogError ("%s\n", "SetPerClientControls failed");
  11      }
  12      }
  13 diff -urN XFree86-4.0.1.orig/xc/programs/xdm/greeter/verify.c XFree86-4.0.1/xc/programs/xdm/greeter/verify.c
  14 --- XFree86-4.0.1.orig/xc/programs/xdm/greeter/verify.c Wed Jun 14 21:43:33 2000
  15 +++ XFree86-4.0.1/xc/programs/xdm/greeter/verify.c      Sat Oct 21 02:00:56 2000
  16 @@ -114,6 +114,7 @@
  17
  18  #ifdef USE_PAM
  19  static char *PAM_password;
  20 +extern pam_handle_t *pamh;
  21  static int pam_error;
  22
  23  static int PAM_conv (int num_msg,
  24 @@ -162,12 +163,8 @@
  25  Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
  26  {
  27         struct passwd   *p;
  28 -#ifdef USE_PAM
  29 -       pam_handle_t *pamh = thepamh();
  30 -#else
  31  #ifdef USESHADOW
  32         struct spwd     *sp;
  33 -#endif
  34  #endif
  35  #ifdef __OpenBSD__
  36         char            *s;
  37 diff -urN XFree86-4.0.1.orig/xc/programs/xdm/session.c XFree86-4.0.1/xc/programs/xdm/session.c
  38 --- XFree86-4.0.1.orig/xc/programs/xdm/session.c        Sat Jun 17 20:48:23 2000
  39 +++ XFree86-4.0.1/xc/programs/xdm/session.c     Sat Oct 21 02:02:15 2000
  40 @@ -97,9 +97,9 @@
  41  extern char    *crypt(CRYPT_ARGS);
  42  #endif
  43  #ifdef USE_PAM
  44 +pam_handle_t *pamh;
  45  pam_handle_t *thepamh()
  46  {
  47 -       static pam_handle_t *pamh = NULL;
  48         return pamh;
  49  }
  50  #endif
  51 @@ -467,9 +467,6 @@
  52         ResetServer (d);
  53      if (removeAuth)
  54      {
  55 -#ifdef USE_PAM
  56 -       pam_handle_t *pamh = thepamh();
  57 -#endif
  58         setgid (verify.gid);
  59         setuid (verify.uid);
  60         RemoveUserAuthorization (d, &verify);
  61 @@ -523,9 +520,6 @@
  62      int        pid;
  63  #ifdef HAS_SETUSERCONTEXT
  64      struct passwd* pwd;
  65 -#endif
  66 -#ifdef USE_PAM
  67 -    pam_handle_t *pamh = thepamh();
  68  #endif
  69
  70      if (verify->argv) {