summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-06-15 10:27:55 +1000
committerDamien Miller <djm@mindrot.org>2004-06-15 10:27:55 +1000
commit3379385060dee8ad5eb766f8d88ab119fc2d19f6 (patch)
treef538cf44762d8b03900567d3b1bd32ccb08f0cc4 /readconf.c
parent3e4dffb140d3eb6eafddf2318baa8e4c33d4531e (diff)
- dtucker@cvs.openbsd.org 2004/05/27 00:50:13
[readconf.c] Kill dead code after fatal(); ok djm@
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/readconf.c b/readconf.c
index f4710e83..5aa371ed 100644
--- 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);