From 97b1bb568c534ce6cc664f2f91be5aa1b76ce4a4 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 21 Mar 2007 20:38:53 +1100 Subject: - 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@ --- servconf.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'servconf.c') 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 , 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; } -- cgit v1.2.3 From f78bb41772ad72f4d05ecb594dfa243463c842da Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 20 May 2007 15:03:15 +1000 Subject: - dtucker@cvs.openbsd.org 2007/04/23 10:15:39 [servconf.c] Remove debug() left over from development. ok deraadt@ --- ChangeLog | 5 ++++- servconf.c | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'servconf.c') diff --git a/ChangeLog b/ChangeLog index f9bb0aba0..df9443c72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ u_int64_t arg is the same as 'unsigned long long'. from Dmitry V. Levin ok markus@ 'Yes, that looks correct' millert@ + - dtucker@cvs.openbsd.org 2007/04/23 10:15:39 + [servconf.c] + Remove debug() left over from development. ok deraadt@ 20070509 - (tim) [configure.ac] Bug #1287: Add missing test for ucred.h. @@ -2909,4 +2912,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4662 2007/05/20 04:59:32 dtucker Exp $ +$Id: ChangeLog,v 1.4663 2007/05/20 05:03:15 dtucker Exp $ diff --git a/servconf.c b/servconf.c index d98650251..1a7545171 100644 --- a/servconf.c +++ b/servconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.c,v 1.171 2007/03/09 05:20:06 dtucker Exp $ */ +/* $OpenBSD: servconf.c,v 1.172 2007/04/23 10:15:39 dtucker Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved @@ -592,7 +592,6 @@ match_cfg_line(char **condition, int line, const char *user, const char *host, debug("connection from %.100s matched 'Host " "%.100s' at line %d", host, arg, line); } else if (strcasecmp(attrib, "address") == 0) { - debug("address '%s' arg '%s'", address, arg); if (!address) { result = 0; continue; -- cgit v1.2.3