From 1c2bafebb3237625fd8ecdbfde7f7bf0842824e0 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Sun, 9 Jun 2002 20:04:50 +0000 Subject: [PATCH] - markus@cvs.openbsd.org 2002/06/08 05:40:01 [readconf.c] just warn about Deprecated options for now --- ChangeLog | 5 ++++- readconf.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cdc486129..86cc9c3d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ - markus@cvs.openbsd.org 2002/06/08 05:17:01 [readconf.c readconf.h ssh.1 ssh.c] deprecate FallBackToRsh and UseRsh; patch from djm@ + - markus@cvs.openbsd.org 2002/06/08 05:40:01 + [readconf.c] + just warn about Deprecated options for now 20020607 - (bal) Removed --{enable/disable}-suid-ssh @@ -840,4 +843,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2191 2002/06/09 20:04:02 mouring Exp $ +$Id: ChangeLog,v 1.2192 2002/06/09 20:04:50 mouring Exp $ diff --git a/readconf.c b/readconf.c index c32a225ea..123406f53 100644 --- a/readconf.c +++ b/readconf.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: readconf.c,v 1.96 2002/06/08 05:17:01 markus Exp $"); +RCSID("$OpenBSD: readconf.c,v 1.97 2002/06/08 05:40:01 markus Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -670,7 +670,7 @@ parse_int: break; case oDeprecated: - fatal("%s line %d: Deprecated option \"%s\"", + error("%s line %d: Deprecated option \"%s\"", filename, linenum, keyword); break;