Commit 14aec745 authored by HardenedBSD Sync Service's avatar HardenedBSD Sync Service
Browse files

Merge remote-tracking branch 'freebsd/stable/12' into hardened/12-stable/master

parents 24e0e041 7bc8d9ed
......@@ -108,7 +108,11 @@
tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config
tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config
13) Commit, and hunker down for the inevitable storm of complaints.
13) Check for references to obsolete configuration options
(e.g., ChallengeResponseAuthentication in sshd_config) which
may exist in release/ scripts.
14) Commit, and hunker down for the inevitable storm of complaints.
......
......@@ -1078,12 +1078,6 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
# endif /* HAVE_CYGWIN */
#endif /* HAVE_LOGIN_CAP */
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);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment