summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-11-21 23:48:55 +1100
committerDamien Miller <djm@mindrot.org>2003-11-21 23:48:55 +1100
commita8e06cef35c205e1aa562513c6d034a10c8c9a6d (patch)
treecf8bdb4466f553088c020b9179cabd6eaf196075 /session.c
parent8c5e91c03fdd2693f0635f8b2a9904bffc94ce16 (diff)
- djm@cvs.openbsd.org 2003/11/21 11:57:03
[everything] unexpand and delete whitespace at EOL; ok markus@ (done locally and RCS IDs synced)
Diffstat (limited to 'session.c')
-rw-r--r--session.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/session.c b/session.c
index b1e6255f4..3a3a09b5b 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.167 2003/11/04 08:54:09 djm Exp $"); 36RCSID("$OpenBSD: session.c,v 1.168 2003/11/21 11:57:03 djm Exp $");
37 37
38#include "ssh.h" 38#include "ssh.h"
39#include "ssh1.h" 39#include "ssh1.h"
@@ -980,7 +980,7 @@ do_setup_env(Session *s, const char *shell)
980#endif 980#endif
981 981
982#ifdef GSSAPI 982#ifdef GSSAPI
983 /* Allow any GSSAPI methods that we've used to alter 983 /* Allow any GSSAPI methods that we've used to alter
984 * the childs environment as they see fit 984 * the childs environment as they see fit
985 */ 985 */
986 ssh_gssapi_do_child(&env, &envsize); 986 ssh_gssapi_do_child(&env, &envsize);
@@ -1012,7 +1012,7 @@ do_setup_env(Session *s, const char *shell)
1012 path = child_get_env(env, "PATH"); 1012 path = child_get_env(env, "PATH");
1013# endif /* HAVE_ETC_DEFAULT_LOGIN */ 1013# endif /* HAVE_ETC_DEFAULT_LOGIN */
1014 if (path == NULL || *path == '\0') { 1014 if (path == NULL || *path == '\0') {
1015 child_set_env(&env, &envsize, "PATH", 1015 child_set_env(&env, &envsize, "PATH",
1016 s->pw->pw_uid == 0 ? 1016 s->pw->pw_uid == 0 ?
1017 SUPERUSER_PATH : _PATH_STDPATH); 1017 SUPERUSER_PATH : _PATH_STDPATH);
1018 } 1018 }
@@ -1266,7 +1266,7 @@ do_setusercontext(struct passwd *pw)
1266 endgrent(); 1266 endgrent();
1267# ifdef USE_PAM 1267# ifdef USE_PAM
1268 /* 1268 /*
1269 * PAM credentials may take the form of supplementary groups. 1269 * PAM credentials may take the form of supplementary groups.
1270 * These will have been wiped by the above initgroups() call. 1270 * These will have been wiped by the above initgroups() call.
1271 * Reestablish them here. 1271 * Reestablish them here.
1272 */ 1272 */