X Strike Force XFree86 SVN commit: rev 956 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2004-01-21 16:19:40 -0500 (Wed, 21 Jan 2004)
New Revision: 956
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff
Log:
Fix some bit rot in patch to xdm's session.c file; upstream has changed
StartClient() to use a locally-scoped variable called pamh which is
initialized to the return of thepamh(), instead of calling thepamh() every
time the PAM handle is needed.
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-21 20:45:57 UTC (rev 955)
+++ branches/4.3.0/sid/debian/changelog 2004-01-21 21:19:40 UTC (rev 956)
@@ -127,8 +127,14 @@
- debian/po/{templates.pot,*.po}: cosmetic updates made by
debconf-updatepo
- -- Branden Robinson <branden@debian.org> Wed, 21 Jan 2004 13:43:27 -0500
+ * Fix some bit rot in patch to xdm's session.c file; upstream has changed
+ StartClient() to use a locally-scoped variable called pamh which is
+ initialized to the return of thepamh(), instead of calling thepamh() every
+ time the PAM handle is needed.
+ - debian/patches/002_xdm_fixes.diff
+ -- Branden Robinson <branden@debian.org> Wed, 21 Jan 2004 16:17:09 -0500
+
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
* Grab fixes to upstream CVS xf-4_3-branch since last pull.
Modified: branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff 2004-01-21 20:45:57 UTC (rev 955)
+++ branches/4.3.0/sid/debian/patches/002_xdm_fixes.diff 2004-01-21 21:19:40 UTC (rev 956)
@@ -2567,8 +2567,8 @@
return 1;
}
diff -urN xc/programs/xdm~/session.c xc/programs/xdm/session.c
---- xc/programs/xdm~/session.c 2003-10-07 18:06:53.000000000 -0500
-+++ xc/programs/xdm/session.c 2003-10-07 18:24:12.000000000 -0500
+--- xc/programs/xdm/session.c.orig 2004-01-21 16:14:39.000000000 -0500
++++ xc/programs/xdm/session.c 2004-01-21 16:15:09.000000000 -0500
@@ -54,7 +54,7 @@
#ifdef SECURE_RPC
# include <rpc/rpc.h>
@@ -2839,7 +2839,7 @@
}
}
#endif
-@@ -572,36 +572,38 @@
+@@ -572,20 +572,22 @@
#ifndef AIXV3
#ifndef HAS_SETUSERCONTEXT
@@ -2870,11 +2870,9 @@
return (0);
}
#endif /* QNX4 doesn't support multi-groups, no initgroups() */
- #ifdef USE_PAM
-- if (pamh) {
-- pam_error = pam_setcred (pamh, PAM_ESTABLISH_CRED);
-+ if (thepamh ()) {
-+ pam_error = pam_setcred (thepamh (), PAM_ESTABLISH_CRED);
+@@ -593,15 +595,15 @@
+ if (pamh) {
+ pam_error = pam_setcred (pamh, PAM_ESTABLISH_CRED);
if (pam_error != PAM_SUCCESS) {
- LogError ("pam_setcred for \"%s\" failed: %s\n",
- name, pam_strerror(pamh, pam_error));
Reply to: