From 3379385060dee8ad5eb766f8d88ab119fc2d19f6 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 15 Jun 2004 10:27:55 +1000 Subject: - dtucker@cvs.openbsd.org 2004/05/27 00:50:13 [readconf.c] Kill dead code after fatal(); ok djm@ --- ChangeLog | 5 ++++- readconf.c | 11 +++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a92e6541..afc5c52ee 100644 --- 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. @@ -1190,4 +1193,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3376 2004/06/15 00:27:15 djm Exp $ +$Id: ChangeLog,v 1.3377 2004/06/15 00:27:55 djm Exp $ diff --git a/readconf.c b/readconf.c index f4710e833..5aa371ed9 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); -- cgit v1.2.3