diff options
author | Damien Miller <djm@mindrot.org> | 2000-03-02 23:57:18 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-03-02 23:57:18 +1100 |
commit | 2453d01611c2abb76fc6e1355a70d628ccf8e446 (patch) | |
tree | b5fee24c3ebcd896c0c01a9f05a495971ead41e4 | |
parent | 204ad074e51c0e9c25666eb044e4c255bcfe64b6 (diff) |
- Allow root access to any key. Patch from
markus.friedl@informatik.uni-erlangen.de
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | authfile.c | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -10,6 +10,8 @@ | |||
10 | - Warning was valid - possible race condition on PTYs. Avoided using | 10 | - Warning was valid - possible race condition on PTYs. Avoided using |
11 | platform-specific code. | 11 | platform-specific code. |
12 | - Document some common problems | 12 | - Document some common problems |
13 | - Allow root access to any key. Patch from | ||
14 | markus.friedl@informatik.uni-erlangen.de | ||
13 | 15 | ||
14 | 20000207 | 16 | 20000207 |
15 | - Removed SOCKS code. Will support through a ProxyCommand. | 17 | - Removed SOCKS code. Will support through a ProxyCommand. |
diff --git a/authfile.c b/authfile.c index b0e832a04..a6dab7575 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -15,7 +15,7 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | RCSID("$Id: authfile.c,v 1.6 1999/12/07 04:38:32 damien Exp $"); | 18 | RCSID("$Id: authfile.c,v 1.7 2000/03/02 12:57:18 damien Exp $"); |
19 | 19 | ||
20 | #ifdef HAVE_OPENSSL | 20 | #ifdef HAVE_OPENSSL |
21 | #include <openssl/bn.h> | 21 | #include <openssl/bn.h> |
@@ -228,7 +228,7 @@ load_private_key(const char *filename, const char *passphrase, | |||
228 | 228 | ||
229 | /* check owner and modes */ | 229 | /* check owner and modes */ |
230 | if (fstat(fd, &st) < 0 || | 230 | if (fstat(fd, &st) < 0 || |
231 | (st.st_uid != 0 && st.st_uid != getuid()) || | 231 | (st.st_uid != 0 && getuid() != 0 && st.st_uid != getuid()) || |
232 | (st.st_mode & 077) != 0) { | 232 | (st.st_mode & 077) != 0) { |
233 | close(fd); | 233 | close(fd); |
234 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); | 234 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); |