diff options
author | Damien Miller <djm@mindrot.org> | 2004-06-15 10:27:55 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2004-06-15 10:27:55 +1000 |
commit | 3379385060dee8ad5eb766f8d88ab119fc2d19f6 (patch) | |
tree | f538cf44762d8b03900567d3b1bd32ccb08f0cc4 | |
parent | 3e4dffb140d3eb6eafddf2318baa8e4c33d4531e (diff) |
- dtucker@cvs.openbsd.org 2004/05/27 00:50:13
[readconf.c]
Kill dead code after fatal(); ok djm@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readconf.c | 11 |
2 files changed, 7 insertions, 9 deletions
@@ -6,6 +6,9 @@ | |||
6 | - markus@cvs.openbsd.org 2004/05/26 23:02:39 | 6 | - markus@cvs.openbsd.org 2004/05/26 23:02:39 |
7 | [channels.c] | 7 | [channels.c] |
8 | missing freeaddrinfo; Andrey Matveev | 8 | missing freeaddrinfo; Andrey Matveev |
9 | - dtucker@cvs.openbsd.org 2004/05/27 00:50:13 | ||
10 | [readconf.c] | ||
11 | Kill dead code after fatal(); ok djm@ | ||
9 | 12 | ||
10 | 20040603 | 13 | 20040603 |
11 | - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions. | 14 | - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions. |
@@ -1190,4 +1193,4 @@ | |||
1190 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1193 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1191 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1194 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1192 | 1195 | ||
1193 | $Id: ChangeLog,v 1.3376 2004/06/15 00:27:15 djm Exp $ | 1196 | $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 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.130 2004/04/27 09:46:36 djm Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.131 2004/05/27 00:50:13 dtucker Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -809,16 +809,11 @@ read_config_file(const char *filename, const char *host, Options *options, | |||
809 | if (checkperm) { | 809 | if (checkperm) { |
810 | struct stat sb; | 810 | struct stat sb; |
811 | 811 | ||
812 | if (fstat(fileno(f), &sb) == -1) { | 812 | if (fstat(fileno(f), &sb) == -1) |
813 | fatal("fstat %s: %s", filename, strerror(errno)); | 813 | fatal("fstat %s: %s", filename, strerror(errno)); |
814 | fclose(f); | ||
815 | return (0); | ||
816 | } | ||
817 | if (((sb.st_uid != 0 && sb.st_uid != getuid()) || | 814 | if (((sb.st_uid != 0 && sb.st_uid != getuid()) || |
818 | (sb.st_mode & 022) != 0)) { | 815 | (sb.st_mode & 022) != 0)) |
819 | fatal("Bad owner or permissions on %s", filename); | 816 | fatal("Bad owner or permissions on %s", filename); |
820 | return 0; | ||
821 | } | ||
822 | } | 817 | } |
823 | 818 | ||
824 | debug("Reading configuration data %.200s", filename); | 819 | debug("Reading configuration data %.200s", filename); |