From nobody Thu Apr 27 16:45:54 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 4Q6hSg1FdDz47Q0F; Thu, 27 Apr 2023 16:45:55 +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 4Q6hSg0qWrz3jls; Thu, 27 Apr 2023 16:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682613955; 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=Pe0kCytzjmKa9jEv3dF26WjV/ygrfS1edBv0y0OIfLw=; b=QS/GLsyZq2M4NadCGycs590YUhnVEmgsZl5paYvkZbRSI6TzyRQ+UCG/qxlTAKErSNcdN2 Y8c7blBfKSQsWAjEueECINzGecfzSA9IneIzT1yAIHHQ0fVbo/5B33DHVuUdMdeZOtc6ex jjeNOUgnorik+bEDxlGD7AIwQGib3MX5zjMWpKSJRwqFP8a8PuqZGutKoEaTQBOJg85Bhg zcXQaeFTlcb2rLscgTLe9CWv5B7p2iZKPt0v2di0Dw7aGqypBe6rka+fqZbirzbMVcQD6z 9J4i0bscwR3arbAkNQUcdJpqwYYSsXFmzWiIFG50oH0dtXKoq75t6fzCOi7r6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682613955; 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=Pe0kCytzjmKa9jEv3dF26WjV/ygrfS1edBv0y0OIfLw=; b=Bxf/BqMniq9REGvrnPZdaOhclUW35d1MszGQGOjNg0VGNJQbBZ/PaEV5hJaNxAIKj5FlRh cmeIuqgXsCgNOsdw9fzn1ZfYRYQxU6DslHNE4VVhzvSwRfVQ9bueFYwvGztoRD9OlOAG+d mHXEW22HItPISY0nzjadDrRW95dNBH6Y9JqyRUu+BIBY56V+WQXomyGa8qYN5dlbHAJUy4 bgejdyqJYV8sHrbKwhKG2a20A0Ox78FQa2SJzU1yh7ULjdJYKlvQBw5PSee/nMNX2ImnG1 gRPBJ7S/hhDi6GcmOW74plKlb2n409+pDsIc8b8nN26H93YdLkMrlfoQ0f8kVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682613955; a=rsa-sha256; cv=none; b=Z1G6VCHYne8zpjts1KZwlRoLJNLIKf7+I9yeRLOziXx5frAFL7qbQvBmKyvCiizHSNmkWa NfFknbn2H4g0YoxO8U4JzTiakkTdg1JbppvuVueKghMGm/9EDYwMtTvYwroy7ubJcpMGtD Ycds1wQBm1ubakzOvT+RI5CQbBUWi3SwexCiwr3hLmH4ZgoJO/svTLO2iRDG4igkkRCdf3 p5TvHH7zmuYZxGPPSSlfCsQaOaufDzDpUmNhH/UcLWAUxg1WcNx+qsrHDhFqK7e+M2lhi8 P8cOpyasB3l5UNSHhE2YVApN6OvdVMqP1hWW5NB7yssFz9ENG+BTJl2bY+38UQ== 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 4Q6hSf70kKzQ3R; Thu, 27 Apr 2023 16:45:54 +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 33RGjs06013996; Thu, 27 Apr 2023 16:45:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RGjsNm013995; Thu, 27 Apr 2023 16:45:54 GMT (envelope-from git) Date: Thu, 27 Apr 2023 16:45:54 GMT Message-Id: <202304271645.33RGjsNm013995@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: 170520f88229 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 170520f882297617eaee7665a6813d03243e87a4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=170520f882297617eaee7665a6813d03243e87a4 commit 170520f882297617eaee7665a6813d03243e87a4 Author: Ed Maste AuthorDate: 2023-04-20 00:09:13 +0000 Commit: Ed Maste CommitDate: 2023-04-27 16:45:37 +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) --- 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 5c8728058c99..499184edf269 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 c5060c59ddf4..33d037c3f7ac 100644 --- a/crypto/openssh/configure.ac +++ b/crypto/openssh/configure.ac @@ -1037,6 +1037,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], ,