summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--readconf.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b177fe72..b2040550 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,10 @@
- markus@cvs.openbsd.org 2002/06/08 12:36:53
[scp.c]
remove FallBackToRsh
+ - markus@cvs.openbsd.org 2002/06/08 12:46:14
+ [readconf.c]
+ silently ignore deprecated options, since FallBackToRsh might be passed
+ by remote scp commands.
20020607
- (bal) Removed --{enable/disable}-suid-ssh
@@ -849,4 +853,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2194 2002/06/09 20:06:29 mouring Exp $
+$Id: ChangeLog,v 1.2195 2002/06/09 20:13:27 mouring Exp $
diff --git a/readconf.c b/readconf.c
index 123406f5..79c27ae1 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.97 2002/06/08 05:40:01 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.98 2002/06/08 12:46:14 markus Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -670,9 +670,9 @@ parse_int:
break;
case oDeprecated:
- error("%s line %d: Deprecated option \"%s\"",
+ debug("%s line %d: Deprecated option \"%s\"",
filename, linenum, keyword);
- break;
+ return 0;
default:
fatal("process_config_line: Unimplemented opcode %d", opcode);