From nobody Thu Apr 27 16:48:44 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6hWw4JxCz47Q1b; Thu, 27 Apr 2023 16:48:44 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q6hWw2xvtz3kns; Thu, 27 Apr 2023 16:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682614124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KfyW//Ez7AaLMTbKvVw/uQYYWsulyioaSFeswrxbBFk=; b=O3m6DE6Gk/AqmZz9UsWNNNUZHBNklZtXN4M8PjxODB++vr3U+ZGAJwcqWsn4U1N3Vlj4QJ u87lvtPwFt35d88Z769Cv1O20EsTesWWb1DyEcz4lCmkYlDMPa91nipEJxkocUPCYr+FDM hvEzzU7l/ey+WFjNnvNhiI96ElBDMFV8lUYaoWR/OJpu9C90pnGzSTwuE/ABuXGkVv2Clz D2Hme/NW9kfyDUJR5+IngGuh9i97U4Nyh2xp8qITNhSnmCjXOrJJ3jq6hNYP54341gYyMQ f42ygpFP3bZUYtJwr0ozs/C8+tW/s4mhGuQB0rVEfB8oa85cKzpQo4yfj/1DFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682614124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KfyW//Ez7AaLMTbKvVw/uQYYWsulyioaSFeswrxbBFk=; b=CQ4JGF5jAbqj3H7pfivsirLfS4hx/c2281O1T6UHfwAuwRUcvbMBTPklTX8W4T/nTvuWz8 gCFL2qXjWO19TCNxLSpSXkgV6qjkhVGv8OELD53v39XFqDRfHbPynuwWGBUVvuleuyXOVq iqn7SDfBe7W6NMcoB8ggBxEkCKT5uXKFAHVw2/gBJmqCQvPomn2ZnTJ4Dkao4UXNc5gpmK NQtXDifuzPN7EAedgO8b465UqDt2JFqSMwAPjGBBpncgSFTsxW4xG24jdiET/FWjjSnY5q jBOUb5mH0uiq4X5vIxx4D1lU460pcUWdZYY8JX3NOxWGhZqp+CWJY/2og7TcJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682614124; a=rsa-sha256; cv=none; b=DNBhD1wyN31RRmfOcIc7ArxkWvcPoZmDmcoa4XSDd6Gz7cY48o6Z6Fbol2C4JlvgGmJkDq DtBpJzjCrPYW9TGpiBhLXm9F5CnY7Ue3/CqOe5XfrPpl4+uweo7LL7CzUxrgXKgPePmkVI oOBr8kELMOefkwlImy/NOp6FHhpwinbKBKbUtvwGfBLem01N6RWITlqTIKM7M6RVeGF5nw o5ZefzJHhI96E4WFmId8t0maa6DaGVptHyfQf8HR1lmgrdqepXW+bpveuj30ghusbV0JHK x3CnzVvVEoXMvQQ7dU8e1KCDTU0PBlWvv38loRvppcFmYNdkeGxTn2qC7z7M7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6hWw224GzPwL; Thu, 27 Apr 2023 16:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RGmiiY014612; Thu, 27 Apr 2023 16:48:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RGmiC7014611; Thu, 27 Apr 2023 16:48:44 GMT (envelope-from git) Date: Thu, 27 Apr 2023 16:48:44 GMT Message-Id: <202304271648.33RGmiC7014611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 545163d9bc9c - stable/12 - openssh: restore PrintLastLog option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 545163d9bc9c807cad78577bfe3346efb2d02482 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=545163d9bc9c807cad78577bfe3346efb2d02482 commit 545163d9bc9c807cad78577bfe3346efb2d02482 Author: Ed Maste AuthorDate: 2023-04-20 00:09:13 +0000 Commit: Ed Maste CommitDate: 2023-04-27 16:48:33 +0000 openssh: restore PrintLastLog option Upstream's autoconf sets DISABLE_LASTLOG if lastlog.ll_line does not exist, but PrintLastLog also works with utmpx and other mechanisms. Reported upstream at https://lists.mindrot.org/pipermail/openssh-unix-dev/2022-May/040242.html PR: 209441 Sponsored by: The FreeBSD Foundation (cherry picked from commit 43c6b7a60aff069da7e0ba6c87d3d7a532e812f6) (cherry picked from commit 170511589e4d15a27ee92979691cfc1b26929bb7) (cherry picked from commit 170520f882297617eaee7665a6813d03243e87a4) --- crypto/openssh/config.h | 2 +- crypto/openssh/configure.ac | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h index e267ba122719..c40746f48410 100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@ -113,7 +113,7 @@ /* #undef DISABLE_FD_PASSING */ /* Define if you don't want to use lastlog */ -#define DISABLE_LASTLOG 1 +/* #undef DISABLE_LASTLOG */ /* Define if you don't want to use your system's login() call */ /* #undef DISABLE_LOGIN */ diff --git a/crypto/openssh/configure.ac b/crypto/openssh/configure.ac index 56da82b81756..ef1a3c559ece 100644 --- a/crypto/openssh/configure.ac +++ b/crypto/openssh/configure.ac @@ -1016,6 +1016,7 @@ mips-sony-bsd|mips-sony-newsos4) [NetBSD read function is sometimes redirected, breaking atomicio comparisons against it]) ;; *-*-freebsd*) + SKIP_DISABLE_LASTLOG_DEFINE=yes AC_DEFINE([LOCKED_PASSWD_PREFIX], ["*LOCKED*"], [Account locked with pw(1)]) AC_DEFINE([SSH_TUN_FREEBSD], [1], [Open tunnel devices the FreeBSD way]) AC_CHECK_HEADER([net/if_tap.h], ,