From owner-svn-ports-all@freebsd.org Mon Mar 23 21:56:18 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DAE72271393; Mon, 23 Mar 2020 21:56:18 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48mSrL0c5jz47TG; Mon, 23 Mar 2020 21:56:18 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E2F6C1D166; Mon, 23 Mar 2020 21:56:17 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02NLuHe7072288; Mon, 23 Mar 2020 21:56:17 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02NLuHJs072287; Mon, 23 Mar 2020 21:56:17 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <202003232156.02NLuHJs072287@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 23 Mar 2020 21:56:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529010 - head/security/openssh-portable/files X-SVN-Group: ports-head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/security/openssh-portable/files X-SVN-Commit-Revision: 529010 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2020 21:56:19 -0000 Author: bdrewery Date: Mon Mar 23 21:56:17 2020 New Revision: 529010 URL: https://svnweb.freebsd.org/changeset/ports/529010 Log: Fix build without PAM option Modified: head/security/openssh-portable/files/patch-session.c Modified: head/security/openssh-portable/files/patch-session.c ============================================================================== --- head/security/openssh-portable/files/patch-session.c Mon Mar 23 21:51:24 2020 (r529009) +++ head/security/openssh-portable/files/patch-session.c Mon Mar 23 21:56:17 2020 (r529010) @@ -9,10 +9,18 @@ to the child process. Reviewed by: ache Sponsored by: DARPA, NAI Labs - ---- 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 * +--- session.c.orig 2020-02-13 16:40:54.000000000 -0800 ++++ session.c 2020-03-23 14:50:01.165781000 -0700 +@@ -946,7 +946,7 @@ read_etc_default_login(char ***env, u_int *envsize, ui + } + #endif /* HAVE_ETC_DEFAULT_LOGIN */ + +-#if defined(USE_PAM) || defined(HAVE_CYGWIN) ++#if defined(USE_PAM) || defined(HAVE_CYGWIN) || defined(HAVE_LOGIN_CAP) + static void + copy_environment_blacklist(char **source, char ***env, u_int *envsize, + const char *blacklist) +@@ -994,6 +994,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 +30,7 @@ Sponsored by: DARPA, NAI Labs #endif /* Initialize the environment. */ -@@ -1011,6 +1014,9 @@ do_setup_env(struct ssh *ssh, Session *s, const char * +@@ -1015,6 +1018,9 @@ do_setup_env(struct ssh *ssh, Session *s, const char * } #endif @@ -32,7 +40,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 -@@ -1028,11 +1034,21 @@ do_setup_env(struct ssh *ssh, Session *s, const char * +@@ -1032,11 +1038,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,7 +66,7 @@ Sponsored by: DARPA, NAI Labs #else /* HAVE_LOGIN_CAP */ # ifndef HAVE_CYGWIN /* -@@ -1052,17 +1068,9 @@ do_setup_env(struct ssh *ssh, Session *s, const char * +@@ -1056,17 +1072,9 @@ do_setup_env(struct ssh *ssh, Session *s, const char * # endif /* HAVE_CYGWIN */ #endif /* HAVE_LOGIN_CAP */ @@ -76,7 +84,7 @@ Sponsored by: DARPA, NAI Labs if (s->term) child_set_env(&env, &envsize, "TERM", s->term); if (s->display) -@@ -1365,7 +1373,7 @@ do_setusercontext(struct passwd *pw) +@@ -1369,7 +1377,7 @@ do_setusercontext(struct passwd *pw) if (platform_privileged_uidswap()) { #ifdef HAVE_LOGIN_CAP if (setusercontext(lc, pw, pw->pw_uid,