--- ssh.c 15 Aug 2004 07:23:34 -0000 1.207
+++ ssh.c 24 Aug 2004 01:20:32 -0000
@@ -645,7 +645,7 @@
          * user's home directory if it happens to be on a NFS volume where
          * root is mapped to nobody.
          */
- if (original_effective_uid == 0) {
+ if (original_effective_uid == 0 && original_real_uid != 0) {
                 PRIV_START;
                 permanently_set_uid(pw);
         }