about summary refs log tree commit diff
path: root/nixos/modules/services/networking/ssh
diff options
context:
space:
mode:
authorDaniel Frank <git@danielfrank.net>2022-01-14 21:59:11 +0100
committerDaniel Frank <git@danielfrank.net>2022-01-18 13:58:29 +0100
commit6d985ef1744ba2d2c3eacf269af52bd3eaf58f93 (patch)
tree62a4b61112a46006009e908c0fd7215815593a00 /nixos/modules/services/networking/ssh
parent3c2143ee7f1591b641c06eb8ac476c1b8c12e791 (diff)
downloadnixlib-6d985ef1744ba2d2c3eacf269af52bd3eaf58f93.tar
nixlib-6d985ef1744ba2d2c3eacf269af52bd3eaf58f93.tar.gz
nixlib-6d985ef1744ba2d2c3eacf269af52bd3eaf58f93.tar.bz2
nixlib-6d985ef1744ba2d2c3eacf269af52bd3eaf58f93.tar.lz
nixlib-6d985ef1744ba2d2c3eacf269af52bd3eaf58f93.tar.xz
nixlib-6d985ef1744ba2d2c3eacf269af52bd3eaf58f93.tar.zst
nixlib-6d985ef1744ba2d2c3eacf269af52bd3eaf58f93.zip
openssh: Rename option, old option is deprecated upstream
Diffstat (limited to 'nixos/modules/services/networking/ssh')
-rw-r--r--nixos/modules/services/networking/ssh/sshd.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index f19624aba022..7bfc70050992 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -81,6 +81,7 @@ in
   imports = [
     (mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
     (mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
+    (mkRenamedOptionModule [ "services" "openssh" "challengeResponseAuthentication" ] [ "services" "openssh" "kbdInteractiveAuthentication" ])
   ];
 
   ###### interface
@@ -218,11 +219,11 @@ in
         '';
       };
 
-      challengeResponseAuthentication = mkOption {
+      kbdInteractiveAuthentication = mkOption {
         type = types.bool;
         default = true;
         description = ''
-          Specifies whether challenge/response authentication is allowed.
+          Specifies whether keyboard-interactive authentication is allowed.
         '';
       };
 
@@ -534,7 +535,7 @@ in
         PermitRootLogin ${cfg.permitRootLogin}
         GatewayPorts ${cfg.gatewayPorts}
         PasswordAuthentication ${if cfg.passwordAuthentication then "yes" else "no"}
-        ChallengeResponseAuthentication ${if cfg.challengeResponseAuthentication then "yes" else "no"}
+        KbdInteractiveAuthentication ${if cfg.kbdInteractiveAuthentication then "yes" else "no"}
 
         PrintMotd no # handled by pam_motd