- dtucker@cvs.openbsd.org 2004/05/27 00:50:13

     [readconf.c]
     Kill dead code after fatal(); ok djm@

diff --git a/ChangeLog b/ChangeLog
index d6b94ac2fa80d28e6f93a526eedb944a56f18f50..d6b235692e9ea19a86f45eccee5776d288f15d12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
    - markus@cvs.openbsd.org 2004/05/26 23:02:39
      [channels.c]
      missing freeaddrinfo; Andrey Matveev
+   - dtucker@cvs.openbsd.org 2004/05/27 00:50:13
+     [readconf.c]
+     Kill dead code after fatal(); ok djm@
 
 20040603
  - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions.

diff --git a/readconf.c b/readconf.c
index f4710e833f39c87b60911c200a9b96bd6d96a007..5aa371ed9a115a0ec7aa4bc4c070e6eb8e298bde 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.130 2004/04/27 09:46:36 djm Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.131 2004/05/27 00:50:13 dtucker Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -809,16 +809,11 @@ read_config_file(const char *filename, const char *host, Options *options,
        if (checkperm) {
                struct stat sb;
                
-               if (fstat(fileno(f), &sb) == -1) {
+               if (fstat(fileno(f), &sb) == -1)
                        fatal("fstat %s: %s", filename, strerror(errno));
-                       fclose(f);
-                       return (0);
-               }
                if (((sb.st_uid != 0 && sb.st_uid != getuid()) ||
-                   (sb.st_mode & 022) != 0)) {
+                   (sb.st_mode & 022) != 0))
                        fatal("Bad owner or permissions on %s", filename);
-                       return 0;
-               }
        }
 
        debug("Reading configuration data %.200s", filename);