summaryrefslogtreecommitdiff
path: root/security/openssh-portable/files/patch-session.c
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2020-11-20 03:41:56 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2020-11-20 03:41:56 +0000
commit4bc67aef4720fe98ace40a9f43b0ab0f7a46a518 (patch)
tree7872877efd366fa28f1ff88aaa49d4bc67dd6d08 /security/openssh-portable/files/patch-session.c
parentmath/py-uncertainties: Update 3.1.4 -> 3.1.5 (diff)
- Add pkg-config dependency which avoids some maintainer testing errors
and also removes a few unneeded library links such as -lcurses. - libfido2 package is broken with pkg-config and base ssl. Workaround this by not using pkg-config for that library for now. - Add USES=localbase to simplify some options - Make crypt(3) MD5 password support optional but still on-by-default. The default in FreeBSD changed in 10.0 but that does not mean - Enable -Werror - Remove some old baggage from the port build o The zlib version check has not been needed for a while. o sshd.8 has not had %%PREFIX%% or %$RC_SCRIPT_NAME%% since 2011 and is not worth more patches/complexity. o The strnvis(3) problem noted in r311891 was fixed in OpenSSH 7.4. o autoreconf is run so it makes no sense to patch configure for -ldes o --with-md5-passwords is not needed as our crypt(3) supports it natively. This is only relevant without PAM.
Notes
Notes: svn path=/head/; revision=555734
Diffstat (limited to 'security/openssh-portable/files/patch-session.c')
-rw-r--r--security/openssh-portable/files/patch-session.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/security/openssh-portable/files/patch-session.c b/security/openssh-portable/files/patch-session.c
index 92a7756bffd7..84c78b3f9526 100644
--- a/security/openssh-portable/files/patch-session.c
+++ b/security/openssh-portable/files/patch-session.c
@@ -13,8 +13,8 @@ to the child process.
Reviewed by: ache
Sponsored by: DARPA, NAI Labs
---- session.c.orig 2020-02-13 16:40:54.000000000 -0800
-+++ session.c 2020-03-23 16:01:07.583958000 -0700
+--- session.c.orig 2020-09-27 00:25:01.000000000 -0700
++++ session.c 2020-11-19 14:41:50.745308000 -0800
@@ -946,7 +946,7 @@ read_etc_default_login(char ***env, u_int *envsize, ui
}
#endif /* HAVE_ETC_DEFAULT_LOGIN */
@@ -58,7 +58,16 @@ Sponsored by: DARPA, NAI Labs
if (s->term)
child_set_env(&env, &envsize, "TERM", s->term);
if (s->display)
-@@ -1369,7 +1387,7 @@ do_setusercontext(struct passwd *pw)
+@@ -1285,7 +1303,7 @@ do_nologin(struct passwd *pw)
+ #ifdef HAVE_LOGIN_CAP
+ if (login_getcapbool(lc, "ignorenologin", 0) || pw->pw_uid == 0)
+ return;
+- nl = login_getcapstr(lc, "nologin", def_nl, def_nl);
++ nl = (char*)login_getcapstr(lc, "nologin", def_nl, def_nl);
+ #else
+ if (pw->pw_uid == 0)
+ return;
+@@ -1373,7 +1391,7 @@ do_setusercontext(struct passwd *pw)
if (platform_privileged_uidswap()) {
#ifdef HAVE_LOGIN_CAP
if (setusercontext(lc, pw, pw->pw_uid,