From nobody Thu May 19 11:37:23 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 72E131B30614; Thu, 19 May 2022 11:37:23 +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 4L3nrz2mZpz3Nkl; Thu, 19 May 2022 11:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652960243; 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=wHmupmrSWdq3nQW5Ct1l280dURSkzMK9HxVg6iiZAMo=; b=Yl2QmcmSd+OtSWwfi/LYAatf+2k4HHchT5SOuDjgM/Q2yKfTBTftjykZ0E0/nDlPfAiwJQ Y5cx+sOTE1EtnG9c4xjgvQ+6dCyjkr/lDPyjociRu0mO5nY4TtkWQebJ30xTyP/WY+KKxL A8uprouBmgM4yKirMvmMz64jb57chdIYJQ5TLXUiu6vTXp95rzq8eFezJtdTw6ZArR4y0S D65wglCwi8HpCcWht3UxHPvaaGe1zAxGVsPTqDAZMsrWp7iytEkxU0lB8NM99mc0GMubTz Ct/vRKrT9phkkaET4rRlJWdHUuzSnnPQ7lvuEb6tGwFpDozlbMbstNpaRxg4Wg== 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 3F5881D10E; Thu, 19 May 2022 11:37:23 +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 24JBbNH6025112; Thu, 19 May 2022 11:37:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24JBbNKw025111; Thu, 19 May 2022 11:37:23 GMT (envelope-from git) Date: Thu, 19 May 2022 11:37:23 GMT Message-Id: <202205191137.24JBbNKw025111@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: d6f9bae2573a - stable/12 - 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/stable/12 X-Git-Reftype: branch X-Git-Commit: d6f9bae2573a4439553b169c2568394d47cdc775 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652960243; 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=wHmupmrSWdq3nQW5Ct1l280dURSkzMK9HxVg6iiZAMo=; b=py/z2N8GJtpvEcgz+uYzXvIKKxOyULcIX9ONO3aHB6SDB8OjmaAVwymTPFIk/ucnlN/cTk tWZEFQi8/h+HMahD/SqDgjmrsI6LRS7gwhgUsdsUspSWUAlBMrC4zuhhAjihWPg1kGgehH jmmXeUuY11okfGjndlUzy7vKFJGlfFZDXIXoZLEzt6BAi+ojEZkBsKTd73e0pZdLwkTZ2o XNg9mYZ0XFbQSKjZsQwI0ub2PSv8HIQ+mVMjY358/DGreuHpa8AEgAMnjSerGMPsVyHtqI uNPtvcmowPfvngpTlbKoUUY/Tljr+wiPMGZSd/MjDnajx/P9wqgUNcGVQBa+NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652960243; a=rsa-sha256; cv=none; b=wfb/prR0CBc8r0W3b6tRsG2meJneafssAwqS8Q8Vzs69dVBK17h5AcWzQ6EIrPTm81xcke tdrtLzyecx36qKKFdZZowwKxuk9pofVibOHjnzW9kUwkGo8Hs8MWxQmQC+L4rrpD8oG2oG bs/ycMM10jIEbiGvbPDhqJUKZIhXJM2aOoUw59gkiugxUUhYu5d9irDA/mIyof6lWoyJ+M RGkufZtqcxIJMfar8JlubETmhsNy2yLdurvvB8heZGCWpTXrpH/PeSJSuOnLjiZgnsoh55 TcCza9xzlFIbqElno9JzWa0uc9QiOFiGCLa19seNHrOoid0M+LBMXfbSGYKJnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d6f9bae2573a4439553b169c2568394d47cdc775 commit d6f9bae2573a4439553b169c2568394d47cdc775 Author: Ed Maste AuthorDate: 2022-05-10 14:08:21 +0000 Commit: Ed Maste CommitDate: 2022-05-19 11:37:02 +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'.