diff options
author | Darren Tucker <dtucker@zip.com.au> | 2007-03-21 20:38:53 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2007-03-21 20:38:53 +1100 |
commit | 97b1bb568c534ce6cc664f2f91be5aa1b76ce4a4 (patch) | |
tree | 38d8793fe8cc3c97b8c5caac018aed95e8edfa85 | |
parent | 5548e8cf2ea9be7c45cb6d1ee4b91e2c673123d3 (diff) |
- dtucker@cvs.openbsd.org 2007/03/09 05:20:06
[servconf.c sshd.c]
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.
Found by okan at demirmen.com, ok djm@ "please do it" deraadt@
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | servconf.c | 6 | ||||
-rw-r--r-- | sshd.c | 6 |
3 files changed, 16 insertions, 7 deletions
@@ -1,3 +1,12 @@ | |||
1 | 20070321 | ||
2 | - (dtucker) OpenBSD CVS Sync | ||
3 | - dtucker@cvs.openbsd.org 2007/03/09 05:20:06 | ||
4 | [servconf.c sshd.c] | ||
5 | Move C/R -> kbdint special case to after the defaults have been | ||
6 | loaded, which makes ChallengeResponse default to yes again. This | ||
7 | was broken by the Match changes and not fixed properly subsequently. | ||
8 | Found by okan at demirmen.com, ok djm@ "please do it" deraadt@ | ||
9 | |||
1 | 20070313 | 10 | 20070313 |
2 | - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include | 11 | - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include |
3 | string.h to prevent warnings, from vapier at gentoo.org. | 12 | string.h to prevent warnings, from vapier at gentoo.org. |
@@ -2826,4 +2835,4 @@ | |||
2826 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 2835 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
2827 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 2836 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
2828 | 2837 | ||
2829 | $Id: ChangeLog,v 1.4640 2007/03/13 10:00:45 dtucker Exp $ | 2838 | $Id: ChangeLog,v 1.4641 2007/03/21 09:38:53 dtucker Exp $ |
diff --git a/servconf.c b/servconf.c index 1e3c213a5..d98650251 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.c,v 1.170 2007/03/01 10:28:02 dtucker Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.171 2007/03/09 05:20:06 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -1387,8 +1387,4 @@ parse_server_config(ServerOptions *options, const char *filename, Buffer *conf, | |||
1387 | if (bad_options > 0) | 1387 | if (bad_options > 0) |
1388 | fatal("%s: terminating, %d bad configuration options", | 1388 | fatal("%s: terminating, %d bad configuration options", |
1389 | filename, bad_options); | 1389 | filename, bad_options); |
1390 | |||
1391 | /* challenge-response is implemented via keyboard interactive */ | ||
1392 | if (options->challenge_response_authentication == 1) | ||
1393 | options->kbd_interactive_authentication = 1; | ||
1394 | } | 1390 | } |
@@ -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.350 2007/03/09 05:20:06 dtucker 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 |
@@ -1421,6 +1421,10 @@ main(int ac, char **av) | |||
1421 | /* Fill in default values for those options not explicitly set. */ | 1421 | /* Fill in default values for those options not explicitly set. */ |
1422 | fill_default_server_options(&options); | 1422 | fill_default_server_options(&options); |
1423 | 1423 | ||
1424 | /* challenge-response is implemented via keyboard interactive */ | ||
1425 | if (options.challenge_response_authentication) | ||
1426 | options.kbd_interactive_authentication = 1; | ||
1427 | |||
1424 | /* set default channel AF */ | 1428 | /* set default channel AF */ |
1425 | channel_set_af(options.address_family); | 1429 | channel_set_af(options.address_family); |
1426 | 1430 | ||