diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-03-21 10:38:53 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-03-21 10:38:53 +0100 |
| commit | 97b1bb568c534ce6cc664f2f91be5aa1b76ce4a4 (patch) | |
| tree | 38d8793fe8cc3c97b8c5caac018aed95e8edfa85 /servconf.c | |
| parent | - (dtucker) [README.platform] Info about blibpath on AIX. (diff) | |
| download | openssh-97b1bb568c534ce6cc664f2f91be5aa1b76ce4a4.tar.xz openssh-97b1bb568c534ce6cc664f2f91be5aa1b76ce4a4.zip | |
- 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@
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/servconf.c b/servconf.c index 1e3c213a5..d98650251 100644 --- a/servconf.c +++ b/servconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.c,v 1.170 2007/03/01 10:28:02 dtucker Exp $ */ +/* $OpenBSD: servconf.c,v 1.171 2007/03/09 05:20:06 dtucker Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -1387,8 +1387,4 @@ parse_server_config(ServerOptions *options, const char *filename, Buffer *conf, if (bad_options > 0) fatal("%s: terminating, %d bad configuration options", filename, bad_options); - - /* challenge-response is implemented via keyboard interactive */ - if (options->challenge_response_authentication == 1) - options->kbd_interactive_authentication = 1; } |