summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-01-03 14:52:53 +1100
committerDamien Miller <djm@mindrot.org>2003-01-03 14:52:53 +1100
commitdfedbf8e5a1f6719a9e91f79900d8cc0d055c453 (patch)
treec118120a5aca050291c2a568d9d8e196819127d8
parent02e16ad95fb1f56ab004b01a10aab89f7103c55d (diff)
- (djm) Bug #446: Set LOGIN env var to pw_name on AIX. Patch from
mii@ornl.gov
-rw-r--r--ChangeLog6
-rw-r--r--session.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 91b4c10bd..28e6ac4a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,9 @@
3 cjwatson@debian.org 3 cjwatson@debian.org
4 - (djm) Bug #460: Filling utmp[x]->ut_addr_v6 if present. Patch from 4 - (djm) Bug #460: Filling utmp[x]->ut_addr_v6 if present. Patch from
5 cjwatson@debian.org 5 cjwatson@debian.org
6 6 - (djm) Bug #446: Set LOGIN env var to pw_name on AIX. Patch from
7 mii@ornl.gov
8
720030101 920030101
8 - (stevesk) [session.c sshlogin.c sshlogin.h] complete portable 10 - (stevesk) [session.c sshlogin.c sshlogin.h] complete portable
9 parts of pass addrlen with sockaddr * fix. 11 parts of pass addrlen with sockaddr * fix.
@@ -923,4 +925,4 @@
923 save auth method before monitor_reset_key_state(); bugzilla bug #284; 925 save auth method before monitor_reset_key_state(); bugzilla bug #284;
924 ok provos@ 926 ok provos@
925 927
926$Id: ChangeLog,v 1.2539 2003/01/03 03:42:27 djm Exp $ 928$Id: ChangeLog,v 1.2540 2003/01/03 03:52:53 djm Exp $
diff --git a/session.c b/session.c
index 90d59513c..9832d7a83 100644
--- a/session.c
+++ b/session.c
@@ -969,6 +969,9 @@ do_setup_env(Session *s, const char *shell)
969 /* Set basic environment. */ 969 /* Set basic environment. */
970 child_set_env(&env, &envsize, "USER", pw->pw_name); 970 child_set_env(&env, &envsize, "USER", pw->pw_name);
971 child_set_env(&env, &envsize, "LOGNAME", pw->pw_name); 971 child_set_env(&env, &envsize, "LOGNAME", pw->pw_name);
972#ifdef _AIX
973 child_set_env(&env, &envsize, "LOGIN", pw->pw_name);
974#endif
972 child_set_env(&env, &envsize, "HOME", pw->pw_dir); 975 child_set_env(&env, &envsize, "HOME", pw->pw_dir);
973#ifdef HAVE_LOGIN_CAP 976#ifdef HAVE_LOGIN_CAP
974 if (setusercontext(lc, pw, pw->pw_uid, LOGIN_SETPATH) < 0) 977 if (setusercontext(lc, pw, pw->pw_uid, LOGIN_SETPATH) < 0)