refuse to start if there is no configuration file for sshd. ok: deraadt

2 files changed, 5 insertions, 3 deletions

diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c
index 4c9c67f66cd..4990dee7cce 100644
--- a/usr.bin/ssh/servconf.c
+++ b/usr.bin/ssh/servconf.c
@@ -12,7 +12,7 @@ Created: Mon Aug 21 15:48:58 1995 ylo
 */
 
 #include "includes.h"
-RCSID("$Id: servconf.c,v 1.15 1999/10/14 19:56:02 markus Exp $");
+RCSID("$Id: servconf.c,v 1.16 1999/10/14 20:17:24 markus Exp $");
 
 #include "ssh.h"
 #include "servconf.h"
@@ -272,7 +272,7 @@ void read_server_config(ServerOptions *options, const char *filename)
   if (!f)
     {
       perror(filename);
-      return;
+      exit(1);
     }
 
   linenum = 0;
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index e4958a291cd..7c5a908c286 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sat Apr 22 21:55:14 1995 ylo
 .\"
-.\" $Id: sshd.8,v 1.15 1999/10/14 19:56:02 markus Exp $
+.\" $Id: sshd.8,v 1.16 1999/10/14 20:17:23 markus Exp $
 .\"
 .Dd September 25, 1999
 .Dt SSHD 8
@@ -118,6 +118,8 @@ intended for debugging for the server.
 .It Fl f Ar configuration_file
 Specifies the name of the configuration file.  The default is
 .Pa /etc/sshd_config .
+.Nm
+refuses to start if there is no configuration file.
 .It Fl g Ar login_grace_time
 Gives the grace time for clients to authenticate themselves (default
 300 seconds).  If the client fails to authenticate the user within