From nobody Thu May 19 11:36:19 2022 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 0E7B41B30309; Thu, 19 May 2022 11:36:20 +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 4L3nql6wbXz3Nlx; Thu, 19 May 2022 11:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652960180; 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=9578oTK3UAFYx437MwcVZsQUlJXtE+Y6JhnTQod+QdU=; b=l7Bvc04E68rWLs5u56YcuPLj4YGZ5m/ffOKxjuvZxGVfqI9h/DXYv0bMtnB7zOunOtwe5b tLJ1/1XDqkGvJXEOKrutbtphoV15E16gBput6yxpb09h2eQ0D67AOxhe+9LEnZE8k8/4yF hlMrEjE876y+j0fXnZE0Y5wvCzQFIWipyhJ+PfgHyZaKmdKgEW/BcyPThbXx7962gan34o qN9H7U/Jh81d5G1eCiDYkk7J5ctgJYwYIVThK0g0E0wbAlIg/QWeIeMmbj1y3FqAlUO/qi tlKnc/voTkoRps77RduOcc/JTeU/DOd4P/6e5+h+5LWx+2m47iMC6drKN4dLFw== 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 C9F321CF2F; Thu, 19 May 2022 11:36:19 +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 24JBaJ0d024923; Thu, 19 May 2022 11:36:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24JBaJCn024922; Thu, 19 May 2022 11:36:19 GMT (envelope-from git) Date: Thu, 19 May 2022 11:36:19 GMT Message-Id: <202205191136.24JBaJCn024922@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: 20feb7838da5 - stable/13 - ssh: update sshd_config for prohibit-password 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: 20feb7838da56a9ddef83042133a89ded8ee5b13 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652960180; 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=9578oTK3UAFYx437MwcVZsQUlJXtE+Y6JhnTQod+QdU=; b=ZM40jnEevSoFZZTkC90WxNbgnCNOnClfyxYtdYczLaneR/sTEbLVdQLLijKUwXib89MDP5 pjk0FrAxJn0iClH5JQSAwL8rNr6XFuGUW1kQsl+6eTQYCt8sNgJPt/+8Hcz7HZJMGwU6j5 jL/4CXg5If7NdzePMstrPoiFJLw8p+ZOgCJMqSQlpBLsDrDzBLinKiAJcAwmx2atsFrDyY ZxQq+/dR0UGr3pt8JUWiiHEBKpnRFbcb7qr2EH3GdP0bhHm++yIfObDcVx6J2Rrl258GuR +1Qd11dtCNPNVW6AQscbPwi8eoar31krKKPQqOetX9WY2bApylT6hucTg4+zvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652960180; a=rsa-sha256; cv=none; b=TdoTk8i7X0VvNEmjGXuwmVxiiLkEbDFYe5MponXd7EWRcPBJT59CkmAvaAUegYKmLWuVrp AmQzJhKYtrqhNvGmEdgJDSG11dAPsuTHk+iZBXlrsTPFx5/Xd6sgY3FCaKsryXG+/DRyAg LwNUNbx9DDZycYIjb1bMRaPIjAdcwBWyJnlPGWy0vvGRC75fbRZEZF4a1ZOh3a5HQ5HWRW VU6frqSH9lSUt6xSXoeL+cwD5qKBjY1RrjmqpruUnP6EaHNXuVNIE+hUT4YIvbYvAD90rk ddA4Ji8cCKUu59DBihPXLWfR+YpSfWNLz72ZqtlmPwCwZLDly1er3YZUHBCDTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=20feb7838da56a9ddef83042133a89ded8ee5b13 commit 20feb7838da56a9ddef83042133a89ded8ee5b13 Author: Ed Maste AuthorDate: 2022-05-10 14:08:21 +0000 Commit: Ed Maste CommitDate: 2022-05-19 11:36:10 +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 (cherry picked from commit 0e12eb7b58ae29ccf52571e82af99c3a3a04b399) --- 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 eb9bdcc437fb..00b6c4366526 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -79,7 +79,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'.