From b9051ec9a49473b81bcd50868e3367186d919fb2 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Tue, 23 Jul 2002 21:11:09 +0000 Subject: [PATCH] - markus@cvs.openbsd.org 2002/07/22 11:03:06 [session.c] fallback to _PATH_STDPATH on setusercontext+LOGIN_SETPATH errors; --- ChangeLog | 5 ++++- session.c | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c3b914d9..fd1396175 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,9 @@ - stevesk@cvs.openbsd.org 2002/07/21 18:34:43 [auth-options.h] remove invalid comment + - markus@cvs.openbsd.org 2002/07/22 11:03:06 + [session.c] + fallback to _PATH_STDPATH on setusercontext+LOGIN_SETPATH errors; 20020722 - (bal) AIX tty data limiting patch fix by leigh@solinno.co.uk @@ -1439,4 +1442,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2399 2002/07/23 21:07:45 mouring Exp $ +$Id: ChangeLog,v 1.2400 2002/07/23 21:11:09 mouring Exp $ diff --git a/session.c b/session.c index 38388d43a..e2e30340c 100644 --- a/session.c +++ b/session.c @@ -33,7 +33,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: session.c,v 1.144 2002/07/19 15:43:33 markus Exp $"); +RCSID("$OpenBSD: session.c,v 1.145 2002/07/22 11:03:06 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -962,8 +962,10 @@ do_setup_env(Session *s, const char *shell) child_set_env(&env, &envsize, "LOGNAME", pw->pw_name); child_set_env(&env, &envsize, "HOME", pw->pw_dir); #ifdef HAVE_LOGIN_CAP - (void) setusercontext(lc, pw, pw->pw_uid, LOGIN_SETPATH); - child_set_env(&env, &envsize, "PATH", getenv("PATH")); + if (setusercontext(lc, pw, pw->pw_uid, LOGIN_SETPATH) < 0) + child_set_env(&env, &envsize, "PATH", _PATH_STDPATH); + else + child_set_env(&env, &envsize, "PATH", getenv("PATH")); #else /* HAVE_LOGIN_CAP */ # ifndef HAVE_CYGWIN /*