summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2021-08-24 19:36:16 -0400
committerDavid P <megver83@parabola.nu>2021-08-24 19:36:44 -0400
commit1c7ae5925b9459f2dde3081fd5e0129cd0c6660a (patch)
tree73e9e2d7704644498016f497f5bae8947cfa810a
parent239f1b448d42cc7341a3ed8fc16f91312b118c6c (diff)
sync with releng/baseline
Signed-off-by: David P <megver83@parabola.nu>
-rw-r--r--README.rst3
-rw-r--r--lxde-openrc/airootfs/etc/ssh/sshd_config10
-rw-r--r--releng-openrc/airootfs/etc/ssh/sshd_config10
3 files changed, 12 insertions, 11 deletions
diff --git a/README.rst b/README.rst
index 12ef237..c2dca76 100644
--- a/README.rst
+++ b/README.rst
@@ -2,4 +2,5 @@
parabolaiso-configs
===================
-This repository hosts the parabolaiso extra configs for our custom ISOs, like the OpenRC and graphical ones, and custom bootstrap tarballs, like the armv7h ones. Parabola configs which do not come from archiso are found here. \ No newline at end of file
+This repository hosts the parabolaiso extra configs for our custom ISOs, like the OpenRC and graphical ones,
+and custom bootstrap profiles, like the armv7h ones. The Parabola configs which do not come from archiso are found here.
diff --git a/lxde-openrc/airootfs/etc/ssh/sshd_config b/lxde-openrc/airootfs/etc/ssh/sshd_config
index 8ef1758..93f7d63 100644
--- a/lxde-openrc/airootfs/etc/ssh/sshd_config
+++ b/lxde-openrc/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
diff --git a/releng-openrc/airootfs/etc/ssh/sshd_config b/releng-openrc/airootfs/etc/ssh/sshd_config
index 8ef1758..93f7d63 100644
--- a/releng-openrc/airootfs/etc/ssh/sshd_config
+++ b/releng-openrc/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