diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-07-12 03:48:47 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2019-07-12 03:48:47 +0000 |
| commit | 97bcfd953b39bc66a8c23bfbe3f448ce468bd070 (patch) | |
| tree | adf34dc10f2dbf01c63028ee171bd05927e1f987 /security/openssh-portable/files/patch-session.c | |
| parent | Prepare for powerpc-on-clang by deleting hard-coded tests for libstdc++.so (diff) | |
Update to 8.0p1
Changes: https://www.openssh.com/txt/release-8.0
With help from: Lee Prokowich
Sponsored by: DellEMC
Notes
Notes:
svn path=/head/; revision=506433
Diffstat (limited to 'security/openssh-portable/files/patch-session.c')
| -rw-r--r-- | security/openssh-portable/files/patch-session.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/security/openssh-portable/files/patch-session.c b/security/openssh-portable/files/patch-session.c index 7d9ca879e664..342314fd5399 100644 --- a/security/openssh-portable/files/patch-session.c +++ b/security/openssh-portable/files/patch-session.c @@ -10,9 +10,9 @@ Reviewed by: ache Sponsored by: DARPA, NAI Labs ---- session.c.orig 2018-10-16 17:01:20.000000000 -0700 -+++ session.c 2018-11-10 11:45:14.645263000 -0800 -@@ -1020,6 +1020,9 @@ do_setup_env(struct ssh *ssh, Session *s, const char * +--- session.c.orig 2019-04-17 15:52:57.000000000 -0700 ++++ session.c 2019-07-02 16:15:23.270321000 -0700 +@@ -990,6 +990,9 @@ do_setup_env(struct ssh *ssh, Session *s, const char * struct passwd *pw = s->pw; #if !defined (HAVE_LOGIN_CAP) && !defined (HAVE_CYGWIN) char *path = NULL; @@ -22,7 +22,7 @@ Sponsored by: DARPA, NAI Labs #endif /* Initialize the environment. */ -@@ -1041,6 +1044,9 @@ do_setup_env(struct ssh *ssh, Session *s, const char * +@@ -1011,6 +1014,9 @@ do_setup_env(struct ssh *ssh, Session *s, const char * } #endif @@ -32,7 +32,7 @@ Sponsored by: DARPA, NAI Labs #ifdef GSSAPI /* Allow any GSSAPI methods that we've used to alter * the childs environment as they see fit -@@ -1058,11 +1064,21 @@ do_setup_env(struct ssh *ssh, Session *s, const char * +@@ -1028,11 +1034,21 @@ do_setup_env(struct ssh *ssh, Session *s, const char * child_set_env(&env, &envsize, "LOGIN", pw->pw_name); #endif child_set_env(&env, &envsize, "HOME", pw->pw_dir); @@ -58,19 +58,25 @@ Sponsored by: DARPA, NAI Labs #else /* HAVE_LOGIN_CAP */ # ifndef HAVE_CYGWIN /* -@@ -1082,11 +1098,6 @@ do_setup_env(struct ssh *ssh, Session *s, const char * +@@ -1052,17 +1068,9 @@ do_setup_env(struct ssh *ssh, Session *s, const char * # endif /* HAVE_CYGWIN */ #endif /* HAVE_LOGIN_CAP */ -- snprintf(buf, sizeof buf, "%.200s/%.50s", _PATH_MAILDIR, pw->pw_name); -- child_set_env(&env, &envsize, "MAIL", buf); +- if (!options.use_pam) { +- snprintf(buf, sizeof buf, "%.200s/%.50s", +- _PATH_MAILDIR, pw->pw_name); +- child_set_env(&env, &envsize, "MAIL", buf); +- } - /* Normal systems set SHELL by default. */ child_set_env(&env, &envsize, "SHELL", shell); - if (getenv("TZ")) - child_set_env(&env, &envsize, "TZ", getenv("TZ")); -@@ -1389,7 +1400,7 @@ do_setusercontext(struct passwd *pw) + if (s->term) + child_set_env(&env, &envsize, "TERM", s->term); + if (s->display) +@@ -1365,7 +1373,7 @@ do_setusercontext(struct passwd *pw) if (platform_privileged_uidswap()) { #ifdef HAVE_LOGIN_CAP if (setusercontext(lc, pw, pw->pw_uid, |