From nobody Thu May 12 15:17:14 2022 X-Original-To: dev-commits-src-all@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 880741ACE42D; Thu, 12 May 2022 15:17:14 +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 4Kzb3t3PYGz4t4M; Thu, 12 May 2022 15:17:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652368634; 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=7ns3SlseNAams3LHhLMTfkSp6UlJXQ8QJCtz3N3jKvM=; b=TTXEW9EXJInv39Eacl0+Y1ahdoXaOHT6GC9lucyO7gE/PbcQx5I+Y3aLuMhnnmhk7VEp/o D0zqInbh3AJQSmgC9qqPUjPGY/oIOFU3GXJFa2XJYRQX5tJ1KwAiNFTMfUfjRU02ugY0bp wtv8KDhSk9dxbPvY3wAeceJ/Y7r59moGuYk6+S2xLhPnnoS54o6Ouol19rm3PUbVR7bwdm 6udgkjjkZkwQQ3Kiu1/A7DoSnuVAzjAcgvxa6gugwoSsjEcNGQVoQSXipJr9yMe1jOyU2/ 0IE0OAHR5t1VLOn4jDEHB8B2pbfBiZoKFS0uGZy8A/vfUUzWVg5ytdE961W6QA== 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 4DE6010B36; Thu, 12 May 2022 15:17:14 +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 24CFHEHX099325; Thu, 12 May 2022 15:17:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24CFHESx099324; Thu, 12 May 2022 15:17:14 GMT (envelope-from git) Date: Thu, 12 May 2022 15:17:14 GMT Message-Id: <202205121517.24CFHESx099324@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0e12eb7b58ae - main - ssh: update sshd_config for prohibit-password option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 0e12eb7b58ae29ccf52571e82af99c3a3a04b399 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652368634; 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=7ns3SlseNAams3LHhLMTfkSp6UlJXQ8QJCtz3N3jKvM=; b=hUpFHJIOyY5255k/OhzAWTObhnP8vBA5335PbAPHieYfdhfJhDtYYqdlNKx3y3peWjFIPO 5gJYKbl7wP91gFOY9gVjb893JnwFOw7ooxpK2DJpvbOHEkZclyv9oLuXVbMfpLWOnyvkrh k84YrK/LimenTaB5hAT3bw5TivpIwvH7iwuN9qdPImyJGzd/nePq3eyAIcJP/59jo5RXpc pHFs5rVS3J52wW4WrJVD+nKQ+1h7cXhJ9gmw3Z/uC6oML8PkmVoGDbsceFqYCE//9aWnF4 hE9Y7fd2eeSRfpWJq9F6YW3sGqxcheJmuPNC/iHur67o6dLstI6aj1SwW34njQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652368634; a=rsa-sha256; cv=none; b=WsH0LGHiDhh+UA6l1qys45Zda/+iTwPtGJLy2yjrAY3pzB+j93wU3hEGphPZTYftQWxgC2 ZeX3Q0mPjzgj/II/k80AOoS24yywCOkiaQ64ZdCnl7DMGCX/3ewaPw15NwNZl+uwFyUN+9 Mp2POuR7ibQdo8x+XeS6UdFp8uzFgvvykD8ZwKB+PGr9T8gGHPmQZjhcvhCEz176E61iNo XEvZNopGxD+56OfQ07WIbBBhZKpm62mrVE5O/yFrwleDqszyLKqbThRq2bXn9U66GfLxTo 6p/bs9UBE7k+mpRz5/DmRGWpprjOKhE7GSK9MqmCuqoWInJ/bk+BxfrM8gj3yQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0e12eb7b58ae29ccf52571e82af99c3a3a04b399 commit 0e12eb7b58ae29ccf52571e82af99c3a3a04b399 Author: Ed Maste AuthorDate: 2022-05-10 14:08:21 +0000 Commit: Ed Maste CommitDate: 2022-05-12 15:16:09 +0000 ssh: update sshd_config for prohibit-password option The PermitRootLogin option "prohibit-password" was added as a synonym for "without-password" in 2015. Then in 2017 these were swapped: "prohibit-password" became the canonical option and "without-password" became a deprecated synonym (in OpenSSH commit 071325f458). The UsePAM description in sshd_config still mentioned "without-password." Update it to match the new canonical option. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- crypto/openssh/sshd_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index bb2e1098368e..956a4bd7d7af 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -78,7 +78,7 @@ AuthorizedKeysFile .ssh/authorized_keys # be allowed through the KbdInteractiveAuthentication and # PasswordAuthentication. Depending on your PAM configuration, # PAM authentication via KbdInteractiveAuthentication may bypass -# the setting of "PermitRootLogin without-password". +# the setting of "PermitRootLogin prohibit-password". # If you just want the PAM account and session checks to run without # PAM authentication, then enable this but set PasswordAuthentication # and KbdInteractiveAuthentication to 'no'.