summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--session.c8
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 @@
16 - stevesk@cvs.openbsd.org 2002/07/21 18:34:43 16 - stevesk@cvs.openbsd.org 2002/07/21 18:34:43
17 [auth-options.h] 17 [auth-options.h]
18 remove invalid comment 18 remove invalid comment
19 - markus@cvs.openbsd.org 2002/07/22 11:03:06
20 [session.c]
21 fallback to _PATH_STDPATH on setusercontext+LOGIN_SETPATH errors;
19 22
2020020722 2320020722
21 - (bal) AIX tty data limiting patch fix by leigh@solinno.co.uk 24 - (bal) AIX tty data limiting patch fix by leigh@solinno.co.uk
@@ -1439,4 +1442,4 @@
1439 - (stevesk) entropy.c: typo in debug message 1442 - (stevesk) entropy.c: typo in debug message
1440 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1443 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1441 1444
1442$Id: ChangeLog,v 1.2399 2002/07/23 21:07:45 mouring Exp $ 1445$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 @@
33 */ 33 */
34 34
35#include "includes.h" 35#include "includes.h"
36RCSID("$OpenBSD: session.c,v 1.144 2002/07/19 15:43:33 markus Exp $"); 36RCSID("$OpenBSD: session.c,v 1.145 2002/07/22 11:03:06 markus Exp $");
37 37
38#include "ssh.h" 38#include "ssh.h"
39#include "ssh1.h" 39#include "ssh1.h"
@@ -962,8 +962,10 @@ do_setup_env(Session *s, const char *shell)
962 child_set_env(&env, &envsize, "LOGNAME", pw->pw_name); 962 child_set_env(&env, &envsize, "LOGNAME", pw->pw_name);
963 child_set_env(&env, &envsize, "HOME", pw->pw_dir); 963 child_set_env(&env, &envsize, "HOME", pw->pw_dir);
964#ifdef HAVE_LOGIN_CAP 964#ifdef HAVE_LOGIN_CAP
965 (void) setusercontext(lc, pw, pw->pw_uid, LOGIN_SETPATH); 965 if (setusercontext(lc, pw, pw->pw_uid, LOGIN_SETPATH) < 0)
966 child_set_env(&env, &envsize, "PATH", getenv("PATH")); 966 child_set_env(&env, &envsize, "PATH", _PATH_STDPATH);
967 else
968 child_set_env(&env, &envsize, "PATH", getenv("PATH"));
967#else /* HAVE_LOGIN_CAP */ 969#else /* HAVE_LOGIN_CAP */
968# ifndef HAVE_CYGWIN 970# ifndef HAVE_CYGWIN
969 /* 971 /*