diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:40:29 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:40:29 +0000 |
commit | a25ec0b132c44c9e341e08464ff830de06b81126 (patch) | |
tree | e20842d80f9e25cb6cf09525abea63f7bf655dd7 /sshd.c | |
parent | 1b816ea846aca3ee89e7995373ace609e9518424 (diff) | |
parent | 70847d299887abb96f8703ca99db6d817b78960e (diff) |
import openssh-4.7p1-gsskex-20070927.patch
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.349 2007/02/21 11:00:05 dtucker Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.351 2007/05/22 10:18:52 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1425,6 +1425,10 @@ main(int ac, char **av) | |||
1425 | /* Fill in default values for those options not explicitly set. */ | 1425 | /* Fill in default values for those options not explicitly set. */ |
1426 | fill_default_server_options(&options); | 1426 | fill_default_server_options(&options); |
1427 | 1427 | ||
1428 | /* challenge-response is implemented via keyboard interactive */ | ||
1429 | if (options.challenge_response_authentication) | ||
1430 | options.kbd_interactive_authentication = 1; | ||
1431 | |||
1428 | /* set default channel AF */ | 1432 | /* set default channel AF */ |
1429 | channel_set_af(options.address_family); | 1433 | channel_set_af(options.address_family); |
1430 | 1434 | ||