summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/servconf.c b/servconf.c
index 26adf0140..f56cc1803 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.172 2007/04/23 10:15:39 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
@@ -604,7 +604,6 @@ match_cfg_line(char **condition, int line, const char *user, const char *host,
604 debug("connection from %.100s matched 'Host " 604 debug("connection from %.100s matched 'Host "
605 "%.100s' at line %d", host, arg, line); 605 "%.100s' at line %d", host, arg, line);
606 } else if (strcasecmp(attrib, "address") == 0) { 606 } else if (strcasecmp(attrib, "address") == 0) {
607 debug("address '%s' arg '%s'", address, arg);
608 if (!address) { 607 if (!address) {
609 result = 0; 608 result = 0;
610 continue; 609 continue;
@@ -1407,8 +1406,4 @@ parse_server_config(ServerOptions *options, const char *filename, Buffer *conf,
1407 if (bad_options > 0) 1406 if (bad_options > 0)
1408 fatal("%s: terminating, %d bad configuration options", 1407 fatal("%s: terminating, %d bad configuration options",
1409 filename, bad_options); 1408 filename, bad_options);
1410
1411 /* challenge-response is implemented via keyboard interactive */
1412 if (options->challenge_response_authentication == 1)
1413 options->kbd_interactive_authentication = 1;
1414} 1409}