summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-09-12 18:32:20 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-09-12 18:32:20 +0000
commitedc0cf26d11d708320ade92e066d4f3e84e20112 (patch)
tree88abb6fc3997b9b090bebd2e1f04676086e8b24e /readconf.c
parent7d199962015ad042208beb54cf4a8fb72053f468 (diff)
- stevesk@cvs.openbsd.org 2001/09/03 20:58:33
[readconf.c readconf.h ssh.c] fatal() for nonexistent -Fssh_config. ok markus@
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/readconf.c b/readconf.c
index 04895be6..6a426ae0 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.88 2001/08/30 16:04:35 stevesk Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.89 2001/09/03 20:58:33 stevesk Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -670,10 +670,10 @@ parse_int:
/*
* Reads the config file and modifies the options accordingly. Options
* should already be initialized before this call. This never returns if
- * there is an error. If the file does not exist, this returns immediately.
+ * there is an error. If the file does not exist, this returns 0.
*/
-void
+int
read_config_file(const char *filename, const char *host, Options *options)
{
FILE *f;
@@ -684,7 +684,7 @@ read_config_file(const char *filename, const char *host, Options *options)
/* Open the file. */
f = fopen(filename, "r");
if (!f)
- return;
+ return 0;
debug("Reading configuration data %.200s", filename);
@@ -704,6 +704,7 @@ read_config_file(const char *filename, const char *host, Options *options)
if (bad_options > 0)
fatal("%s: terminating, %d bad configuration options",
filename, bad_options);
+ return 1;
}
/*