summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--entropy.c8
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d3673b9ce..428718dd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120050927
2 - (dtucker) [entropy.c] Remove unnecessary tests for getuid and geteuid
3 calls, since they can't possibly fail. ok djm@
4
120050924 520050924
2 - (dtucker) [auth2.c] Move start_pam() calls out of if-else block to remove 6 - (dtucker) [auth2.c] Move start_pam() calls out of if-else block to remove
3 duplicate call. ok djm@ 7 duplicate call. ok djm@
@@ -3013,4 +3017,4 @@
3013 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3017 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3014 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3018 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3015 3019
3016$Id: ChangeLog,v 1.3894 2005/09/24 02:43:51 dtucker Exp $ 3020$Id: ChangeLog,v 1.3895 2005/09/27 09:50:25 dtucker Exp $
diff --git a/entropy.c b/entropy.c
index 410bbb927..7f4a30783 100644
--- a/entropy.c
+++ b/entropy.c
@@ -45,7 +45,7 @@
45 * XXX: we should tell the child how many bytes we need. 45 * XXX: we should tell the child how many bytes we need.
46 */ 46 */
47 47
48RCSID("$Id: entropy.c,v 1.49 2005/07/17 07:26:44 djm Exp $"); 48RCSID("$Id: entropy.c,v 1.50 2005/09/27 09:50:25 dtucker Exp $");
49 49
50#ifndef OPENSSL_PRNG_ONLY 50#ifndef OPENSSL_PRNG_ONLY
51#define RANDOM_SEED_SIZE 48 51#define RANDOM_SEED_SIZE 48
@@ -145,10 +145,8 @@ init_rng(void)
145 "have %lx", OPENSSL_VERSION_NUMBER, SSLeay()); 145 "have %lx", OPENSSL_VERSION_NUMBER, SSLeay());
146 146
147#ifndef OPENSSL_PRNG_ONLY 147#ifndef OPENSSL_PRNG_ONLY
148 if ((original_uid = getuid()) == -1) 148 original_uid = getuid();
149 fatal("getuid: %s", strerror(errno)); 149 original_euid = geteuid();
150 if ((original_euid = geteuid()) == -1)
151 fatal("geteuid: %s", strerror(errno));
152#endif 150#endif
153} 151}
154 152