- Move C/R -> kbdint special case to after the defaults have been

    loaded, which makes ChallengeResponse default to yes again. This was
    broken by the Match changes and not fixed properly subsequently
    (closes: #428968).

1 files changed, 4 insertions, 0 deletions

diff --git a/sshd.c b/sshd.c
index dd873ef72..985f05917 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1430,6 +1430,10 @@ main(int ac, char **av)
         /* Fill in default values for those options not explicitly set. */
         fill_default_server_options(&options);
 
+        /* challenge-response is implemented via keyboard interactive */
+        if (options.challenge_response_authentication)
+                options.kbd_interactive_authentication = 1;
+
         /* set default channel AF */
         channel_set_af(options.address_family);