summaryrefslogtreecommitdiff
path: root/configs/releng/airootfs/etc
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2021-08-24 19:32:04 -0400
committerDavid P <megver83@parabola.nu>2021-08-24 19:32:13 -0400
commit388f67f632d8493cb4d58a4e7a1c65c75e60a40c (patch)
tree0a19035d330436a7ba52028d2171e263ad82a6e9 /configs/releng/airootfs/etc
parent3cb2f96bb185feb0804ee2920b7331f21d35e97e (diff)
sync with archiso
imported: 019f5aa (HEAD -> master, origin/master, origin/HEAD) Merge remote-tracking branch 'nl6720/gpg-sender' 3c6cdb1 .gitlab/ci/build_archiso.sh: use mkarchiso's -G option 59dffcf mkarchiso: support setting gpg sender ea9572b mkarchiso: add some sane gpg options to override those set in user's gpg.conf d3caf6f Merge remote-tracking branch 'nl6720/openssh-8.7p1' 56dc96e configs/*/airootfs/etc/ssh/sshd_config: update to openssh 8.7p1-1 a915e34 Merge remote-tracking branch 'nl6720/netboot-version' 0a58431 mkarchiso: put version files in netboot artifacts a560de4 Merge remote-tracking branch 'nl6720/no-mount' b040ef1 mkarchiso: ensure there are no existing image files before trying to create them 6185448 mkarchiso: copy files to ext4 image using mkfs.ext4's -d option instead of mounting the file system Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs/releng/airootfs/etc')
-rw-r--r--configs/releng/airootfs/etc/ssh/sshd_config10
1 files changed, 5 insertions, 5 deletions
diff --git a/configs/releng/airootfs/etc/ssh/sshd_config b/configs/releng/airootfs/etc/ssh/sshd_config
index 8ef1758..93f7d63 100644
--- a/configs/releng/airootfs/etc/ssh/sshd_config
+++ b/configs/releng/airootfs/etc/ssh/sshd_config
@@ -1,4 +1,4 @@
-# $OpenBSD: sshd_config,v 1.103 2018/04/09 20:41:22 tj Exp $
+# $OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $
# This is the sshd server system-wide configuration file. See
# sshd_config(5) for more information.
@@ -58,7 +58,7 @@ AuthorizedKeysFile .ssh/authorized_keys
#PermitEmptyPasswords no
# Change to no to disable s/key passwords
-ChallengeResponseAuthentication no
+#KbdInteractiveAuthentication yes
# Kerberos options
#KerberosAuthentication no
@@ -72,13 +72,13 @@ ChallengeResponseAuthentication no
# Set this to 'yes' to enable PAM authentication, account processing,
# and session processing. If this is enabled, PAM authentication will
-# be allowed through the ChallengeResponseAuthentication and
+# be allowed through the KbdInteractiveAuthentication and
# PasswordAuthentication. Depending on your PAM configuration,
-# PAM authentication via ChallengeResponseAuthentication may bypass
+# PAM authentication via KbdInteractiveAuthentication may bypass
# the setting of "PermitRootLogin without-password".
# If you just want the PAM account and session checks to run without
# PAM authentication, then enable this but set PasswordAuthentication
-# and ChallengeResponseAuthentication to 'no'.
+# and KbdInteractiveAuthentication to 'no'.
UsePAM yes
#AllowAgentForwarding yes