Author: branden
Date: 2003-10-24 20:35:48 -0500 (Fri, 24 Oct 2003)
New Revision: 714
Modified:
trunk/debian/patches/000_stolen_from_HEAD.diff
trunk/debian/patches/002_xdm_fixes.diff
Log:
Fix cut-n-paste errors made when backporting patch. Resync.
- debian/patches/000_stolen_from_HEAD.diff
- debian/patches/002_xdm_fixes.diff
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2003-10-24 22:36:18 UTC (rev
713)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2003-10-25 01:35:48 UTC (rev
714)
@@ -5393,28 +5393,27 @@
}
if (versions[version_index].major_version > Dont_Check)
---- xc/programs/xdm/session.c~ 2003-10-24 13:04:08.000000000 -0500
-+++ xc/programs/xdm/session.c 2003-10-24 13:07:21.000000000 -0500
-@@ -93,14 +93,14 @@
+--- xc/programs/xdm/session.c~ 2003-10-24 20:29:10.000000000 -0500
++++ xc/programs/xdm/session.c 2003-10-24 20:29:42.000000000 -0500
+@@ -93,13 +93,15 @@
extern char *crypt(CRYPT_ARGS);
#endif
#ifdef USE_PAM
-pam_handle_t **thepamhp()
--{
+pam_handle_t **
+thepamhp(void)
+ {
static pam_handle_t *pamh = NULL;
return &pamh;
}
-pam_handle_t *thepamh()
--{
+pam_handle_t *
+thepamh(void)
+ {
pam_handle_t **pamhp;
- pamhp = thepamhp();
-@@ -535,8 +535,9 @@
+@@ -535,8 +537,9 @@
#ifdef HAS_SETUSERCONTEXT
struct passwd* pwd;
#endif
@@ -5426,7 +5425,7 @@
#endif
if (verify->argv) {
-@@ -552,7 +553,7 @@
+@@ -552,7 +555,7 @@
}
#ifdef USE_PAM
if (pamh) pam_open_session(pamh, 0);
@@ -5435,7 +5434,7 @@
switch (pid = fork ()) {
case 0:
CleanUpChild ();
-@@ -598,8 +599,12 @@
+@@ -598,8 +601,13 @@
}
#endif /* QNX4 doesn't support multi-groups, no initgroups() */
#ifdef USE_PAM
@@ -5447,6 +5446,7 @@
+ LogError ("pam_setcred for \"%s\" failed: %s\n",
+ name, pam_strerror(pamh, pam_error));
+ return(0);
++ }
}
#endif
if (setuid(verify->uid) < 0)
Modified: trunk/debian/patches/002_xdm_fixes.diff
===================================================================
--- trunk/debian/patches/002_xdm_fixes.diff 2003-10-24 22:36:18 UTC (rev 713)
+++ trunk/debian/patches/002_xdm_fixes.diff 2003-10-25 01:35:48 UTC (rev 714)
@@ -1395,8 +1395,8 @@
} else {
user_pass = sp->sp_pwdp;
}
---- xc/programs/xdm/session.c~ 2003-10-24 13:23:21.000000000 -0500
-+++ xc/programs/xdm/session.c 2003-10-24 13:28:30.000000000 -0500
+--- xc/programs/xdm/session.c~ 2003-10-24 20:29:42.000000000 -0500
++++ xc/programs/xdm/session.c 2003-10-24 20:31:51.000000000 -0500
@@ -60,17 +60,17 @@
#endif
@@ -1422,7 +1422,7 @@
#else
/* should be in <grp.h> */
extern void setgrent(void);
-@@ -83,27 +83,29 @@
+@@ -83,29 +83,31 @@
extern void endspent(void);
#endif
#if defined(CSRG_BASED)
@@ -1445,6 +1445,7 @@
pam_handle_t **
-thepamhp(void)
+thepamhp (void)
+ {
static pam_handle_t *pamh = NULL;
return &pamh;
}
@@ -1452,6 +1453,7 @@
pam_handle_t *
-thepamh(void)
+thepamh (void)
+ {
pam_handle_t **pamhp;
- pamhp = thepamhp();
@@ -1459,7 +1461,7 @@
if (pamhp)
return *pamhp;
else
-@@ -136,12 +138,12 @@
+@@ -138,12 +140,12 @@
endgrent,
#ifdef USESHADOW
getspnam,
@@ -1475,7 +1477,7 @@
endpwent,
#endif
crypt,
-@@ -189,7 +191,7 @@
+@@ -191,7 +193,7 @@
}
#if defined(_POSIX_SOURCE) || defined(SYSV) || defined(SVR4)
@@ -1484,7 +1486,7 @@
#endif
static void
-@@ -246,7 +248,7 @@
+@@ -248,7 +250,7 @@
static int
IOErrorHandler (Display *dpy)
{
@@ -1493,7 +1495,7 @@
exit(RESERVER_DISPLAY);
/*NOTREACHED*/
return 0;
-@@ -255,7 +257,7 @@
+@@ -257,7 +259,7 @@
static int
ErrorHandler(Display *dpy, XErrorEvent *event)
{
@@ -1502,7 +1504,7 @@
if (XmuPrintDefaultErrorMessage (dpy, event, stderr) == 0) return 0;
exit(UNMANAGE_DISPLAY);
/*NOTREACHED*/
-@@ -288,13 +290,13 @@
+@@ -290,13 +292,13 @@
#ifdef GREET_USER_STATIC
greet_user_proc = GreetUser;
#else
@@ -1518,7 +1520,7 @@
exit(UNMANAGE_DISPLAY);
}
#endif
-@@ -500,7 +502,7 @@
+@@ -502,7 +504,7 @@
code = Krb5DisplayCCache(d->name, &ccache);
if (code)
@@ -1527,7 +1529,7 @@
error_message(code));
else {
code = krb5_cc_destroy(ccache);
-@@ -508,8 +510,8 @@
+@@ -510,8 +512,8 @@
if (code == KRB5_FCC_NOFILE) {
Debug ("No Kerberos ccache file found to destroy\n");
} else
@@ -1538,7 +1540,7 @@
} else
Debug ("Kerberos ccache destroyed\n");
krb5_cc_close(ccache);
-@@ -578,23 +580,22 @@
+@@ -580,23 +582,22 @@
#ifndef AIXV3
#ifndef HAS_SETUSERCONTEXT
@@ -1572,8 +1574,8 @@
return (0);
}
#endif /* QNX4 doesn't support multi-groups, no initgroups() */
-@@ -607,10 +608,9 @@
- return(0);
+@@ -610,10 +611,9 @@
+ }
}
#endif
- if (setuid(verify->uid) < 0)
@@ -1586,7 +1588,7 @@
return (0);
}
#else /* HAS_SETUSERCONTEXT */
-@@ -618,20 +618,17 @@
+@@ -621,20 +621,17 @@
* Set the user's credentials: uid, gid, groups,
* environment variables, resource limits, and umask.
*/
@@ -1616,7 +1618,7 @@
return (0);
}
#endif /* HAS_SETUSERCONTEXT */
-@@ -640,9 +637,9 @@
+@@ -643,9 +640,9 @@
* Set the user's credentials: uid, gid, groups,
* audit classes, user limits, and umask.
*/
@@ -1629,7 +1631,7 @@
return (0);
}
#endif /* AIXV3 */
-@@ -756,13 +753,13 @@
+@@ -759,13 +756,13 @@
execute (failsafeArgv, verify->userEnviron);
exit (1);
case -1:
@@ -1647,7 +1649,7 @@
Debug ("StartSession, fork succeeded %d\n", pid);
*pidp = pid;
return 1;
-@@ -929,9 +926,10 @@
+@@ -932,9 +929,10 @@
return env;
}
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
