From nobody Tue Oct 11 13:26:04 2022 X-Original-To: dev-commits-src-main@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 4MmxPT0g6Xz4fjx6; Tue, 11 Oct 2022 13:26:05 +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 4MmxPT03vFz3hD2; Tue, 11 Oct 2022 13:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665494765; 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=y+j565oLKgLSLhkbGhlQdy/BxKqFG38YOoeF7H6R+tA=; b=qp3URSF4zvl6KPZ76TYGhWSZu+FNVPsblQBNq7lfWByBPkLp+A2aGD0xCt7fV7P/Z/LhYI IxqRZ3o6urGPCzjbVds1ZAQDKjaC/HUvOk/tL0KMASRJcJaes0DEup+lSBQo8oiipacP7p jfazYMJ1w/88OWTl7VVfAa93OWyvAgDsTT7U4LGk7Xa4WlQGzByDoeUxQwUjcyx9aIk1M0 rRvFiQvjMi/AUFYrv2wESB3zakrQ4sgdY5FZ+BPw7WyeV6VRoL5WFAP7z+rDFRfSpZIzDs Lec5aiV/2YpH5MFg7HhRJzXd1FjoBzvff05hyRGHPetc+agidcbdX7XBYc90Mg== 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 4MmxPS604fzyGJ; Tue, 11 Oct 2022 13:26:04 +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 29BDQ4ZC063288; Tue, 11 Oct 2022 13:26:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29BDQ4l4063287; Tue, 11 Oct 2022 13:26:04 GMT (envelope-from git) Date: Tue, 11 Oct 2022 13:26:04 GMT Message-Id: <202210111326.29BDQ4l4063287@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: 6e6c45e66f68 - main - nanobsd: update copies of SSH config files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 6e6c45e66f68e68b451a27430f51a687e00bad15 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665494765; 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=y+j565oLKgLSLhkbGhlQdy/BxKqFG38YOoeF7H6R+tA=; b=JFvoEjZvCey7AZFP/nURKzcg1fGtj+Ni1OjwGc0jyhn6WyiVTlpFvD21Hay1jqMAI5zdQH TJZrewemFv2jPdbRTHPRr3bkDs61wI9wOxMIyKSXc7lOMY1daKqUn2HlAZgUH9yEv3/tI5 IhZXDuz+rz1PN3gGHWpQ4LdpGN2HrSGlDlNNrm/plhZo0Cy0dDlMwn3V3+msU5jA3NNVCx W8Oezydws9b/TBOvR6m1GJTOkLyWSzo/NbzBvGPXI6coSGR+LBcNuDO4AWDNhLAhBEP8ss 7+/ufkhv1RwcIGjVBtRK1vMn/tG9KXhISWu7TlfCiTzspD08IkrX+Wv0bFCe2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665494765; a=rsa-sha256; cv=none; b=cs9t9usH5OKwBq9XWw3zroRItOWNcNLsde2GvG/wPCeBUw3nm1PhqFnWYFUEk8kF5NcHKz cnwg36WT4Odepgr9jglpx4kSBjPZVOxVEXb/3wMbL9ZpZX9A0BLteStX0jBJAeUZF05o4T rOhgci2JfoHjjXtX0xsVA/Md0cYLzfxx30iysXlZo6yPkEA2w55+p2u+v1hCbHHTQWFWKt eAjiwPf7Tk/xPBsc9bCUCTTbFGIC6nvXNaXfZpgRZx2EGAt1k+V03sDUv/QP1dCoczRjGZ S6Z5o+WC9VcNJO6puiHtOPu+Ul4y1FUC5hriWz9mmzW4W8UKvWUk+CGBq4v7YA== 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=6e6c45e66f68e68b451a27430f51a687e00bad15 commit 6e6c45e66f68e68b451a27430f51a687e00bad15 Author: Ed Maste AuthorDate: 2022-10-11 13:25:14 +0000 Commit: Ed Maste CommitDate: 2022-10-11 13:25:39 +0000 nanobsd: update copies of SSH config files Sponsored by: The FreeBSD Foundation --- tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config | 2 -- tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config b/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config index 02d72f367089..306e8f950efd 100644 --- a/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config +++ b/tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config @@ -1,5 +1,4 @@ # $OpenBSD: ssh_config,v 1.35 2020/07/17 03:43:42 dtucker Exp $ -# $FreeBSD$ # This is the ssh client system-wide configuration file. See # ssh_config(5) for more information. This file provides defaults for @@ -46,4 +45,3 @@ # RekeyLimit 1G 1h # UserKnownHostsFile ~/.ssh/known_hosts.d/%k # VerifyHostKeyDNS yes -# VersionAddendum FreeBSD-20220413 diff --git a/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config b/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config index 95087e838a56..623495cd89fe 100644 --- a/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config +++ b/tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config @@ -1,5 +1,4 @@ # $OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $ -# $FreeBSD$ # This is the sshd server system-wide configuration file. See # sshd_config(5) for more information. @@ -58,6 +57,7 @@ AuthorizedKeysFile .ssh/authorized_keys #IgnoreRhosts yes # Change to yes to enable built-in password authentication. +# Note that passwords may also be accepted via KbdInteractiveAuthentication. #PasswordAuthentication no #PermitEmptyPasswords no @@ -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'. @@ -105,7 +105,7 @@ AuthorizedKeysFile .ssh/authorized_keys #PermitTunnel no #ChrootDirectory none #UseBlacklist no -#VersionAddendum FreeBSD-20220413 +#VersionAddendum FreeBSD-20220415 # no default banner path #Banner none