- Allow root access to any key. Patch from

   markus.friedl@informatik.uni-erlangen.de

diff --git a/ChangeLog b/ChangeLog
index b6c604e83dd72df3efee86ebffd2f0d9629e07b6..cb59d7012f0157fc62454c947a53551f18f2ea32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
  - Warning was valid - possible race condition on PTYs. Avoided using 
    platform-specific code.
  - Document some common problems
+ - Allow root access to any key. Patch from 
+   markus.friedl@informatik.uni-erlangen.de
 
 20000207
  - Removed SOCKS code. Will support through a ProxyCommand.

diff --git a/authfile.c b/authfile.c
index f2699708f32ea2bddddf8d0be067b4d3af64b2b2..1e46ea6106c8c652ae797fa020a97697576dffe0 100644 (file)
--- a/authfile.c
+++ b/authfile.c
@@ -228,7 +228,7 @@ load_private_key(const char *filename, const char *passphrase,
 
        /* check owner and modes */
        if (fstat(fd, &st) < 0 ||
-           (st.st_uid != 0 && st.st_uid != getuid()) ||
+           (st.st_uid != 0 && getuid() != 0 && st.st_uid != getuid()) ||
            (st.st_mode & 077) != 0) {
                close(fd);
                error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");