summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2007-06-19 17:12:35 +0000
committerColin Watson <cjwatson@debian.org>2007-06-19 17:12:35 +0000
commit3c8b23e84bd3ab115dbc372f67bc400b32910f27 (patch)
tree0065d43ee86ab7738b70c0b8b5b0e999bdce7181 /sshd.c
parentd2738eb9f31d20d0abfdbb1dd41e6af5e521a5d9 (diff)
- 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).
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c4
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)
1430 /* Fill in default values for those options not explicitly set. */ 1430 /* Fill in default values for those options not explicitly set. */
1431 fill_default_server_options(&options); 1431 fill_default_server_options(&options);
1432 1432
1433 /* challenge-response is implemented via keyboard interactive */
1434 if (options.challenge_response_authentication)
1435 options.kbd_interactive_authentication = 1;
1436
1433 /* set default channel AF */ 1437 /* set default channel AF */
1434 channel_set_af(options.address_family); 1438 channel_set_af(options.address_family);
1435 1439