- stevesk@cvs.openbsd.org 2002/08/08 23:54:52

[openssh.git] / entropy.c

diff --git a/entropy.c b/entropy.c
index f31395947503aae21b2de1889bdff12b11bf3663..5050a4f1f369a359f20e7656513df21c01f0ab99 100644 (file)
--- a/entropy.c
+++ b/entropy.c
@@ -87,9 +87,10 @@ seed_rng(void)
                close(devnull);
 
                if (original_uid != original_euid && 
-                   setuid(original_uid) == -1) {
-                       fprintf(stderr, "(rand child) setuid: %s\n", 
-                           strerror(errno));
+                   ( seteuid(getuid()) == -1 || 
+                     setuid(original_uid) == -1) ) {
+                       fprintf(stderr, "(rand child) setuid(%d): %s\n", 
+                           original_uid, strerror(errno));
                        _exit(1);
                }
                
@@ -114,7 +115,7 @@ seed_rng(void)
 
        if (waitpid(pid, &ret, 0) == -1)
               fatal("Couldn't wait for ssh-rand-helper completion: %s", 
-                  strerror(errno));
+                  strerror(errno));
        mysignal(SIGCHLD, old_sigchld);
 
        /* We don't mind if the child exits upon a SIGPIPE */