diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-09 20:04:50 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-06-09 20:04:50 +0000 |
commit | 1c2bafebb3237625fd8ecdbfde7f7bf0842824e0 (patch) | |
tree | ef159324d185c37762919912807955a46d3ab9ee | |
parent | 4daea86fd45a588acdb1036f8458e88dccffcdd3 (diff) |
- markus@cvs.openbsd.org 2002/06/08 05:40:01
[readconf.c]
just warn about Deprecated options for now
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readconf.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -9,6 +9,9 @@ | |||
9 | - markus@cvs.openbsd.org 2002/06/08 05:17:01 | 9 | - markus@cvs.openbsd.org 2002/06/08 05:17:01 |
10 | [readconf.c readconf.h ssh.1 ssh.c] | 10 | [readconf.c readconf.h ssh.1 ssh.c] |
11 | deprecate FallBackToRsh and UseRsh; patch from djm@ | 11 | deprecate FallBackToRsh and UseRsh; patch from djm@ |
12 | - markus@cvs.openbsd.org 2002/06/08 05:40:01 | ||
13 | [readconf.c] | ||
14 | just warn about Deprecated options for now | ||
12 | 15 | ||
13 | 20020607 | 16 | 20020607 |
14 | - (bal) Removed --{enable/disable}-suid-ssh | 17 | - (bal) Removed --{enable/disable}-suid-ssh |
@@ -840,4 +843,4 @@ | |||
840 | - (stevesk) entropy.c: typo in debug message | 843 | - (stevesk) entropy.c: typo in debug message |
841 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 844 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
842 | 845 | ||
843 | $Id: ChangeLog,v 1.2191 2002/06/09 20:04:02 mouring Exp $ | 846 | $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 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.96 2002/06/08 05:17:01 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.97 2002/06/08 05:40:01 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -670,7 +670,7 @@ parse_int: | |||
670 | break; | 670 | break; |
671 | 671 | ||
672 | case oDeprecated: | 672 | case oDeprecated: |
673 | fatal("%s line %d: Deprecated option \"%s\"", | 673 | error("%s line %d: Deprecated option \"%s\"", |
674 | filename, linenum, keyword); | 674 | filename, linenum, keyword); |
675 | break; | 675 | break; |
676 | 676 | ||