Import of OpenSSH 3.7p1

[gssapi-openssh.git] / openssh / entropy.c

diff --git a/openssh/entropy.c b/openssh/entropy.c
index 5050a4f1f369a359f20e7656513df21c01f0ab99..2d8cec0142c3afee4f02ca06a6fdd00b3449d7c8 100644 (file)
--- a/openssh/entropy.c
+++ b/openssh/entropy.c
@@ -75,7 +75,7 @@ seed_rng(void)
        if (pipe(p) == -1)
                fatal("pipe: %s", strerror(errno));
 
-       old_sigchld = mysignal(SIGCHLD, SIG_DFL);
+       old_sigchld = signal(SIGCHLD, SIG_DFL);
        if ((pid = fork()) == -1)
                fatal("Couldn't fork: %s", strerror(errno));
        if (pid == 0) {
@@ -89,8 +89,8 @@ seed_rng(void)
                if (original_uid != original_euid && 
                    ( seteuid(getuid()) == -1 || 
                      setuid(original_uid) == -1) ) {
-                       fprintf(stderr, "(rand child) setuid(%d): %s\n", 
-                           original_uid, strerror(errno));
+                       fprintf(stderr, "(rand child) setuid(%li): %s\n", 
+                           (long int)original_uid, strerror(errno));
                        _exit(1);
                }
                
@@ -116,7 +116,7 @@ seed_rng(void)
        if (waitpid(pid, &ret, 0) == -1)
               fatal("Couldn't wait for ssh-rand-helper completion: %s", 
                   strerror(errno));
-       mysignal(SIGCHLD, old_sigchld);
+       signal(SIGCHLD, old_sigchld);
 
        /* We don't mind if the child exits upon a SIGPIPE */
        if (!WIFEXITED(ret) &&