- (dtucker) [entropy.c] Remove unnecessary tests for getuid and geteuid

   calls, since they can't possibly fail.  ok djm@

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 @@
+20050927
+ - (dtucker) [entropy.c] Remove unnecessary tests for getuid and geteuid
+   calls, since they can't possibly fail.  ok djm@
+
 20050924
  - (dtucker) [auth2.c] Move start_pam() calls out of if-else block to remove
    duplicate call.  ok djm@
@@ -3013,4 +3017,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3894 2005/09/24 02:43:51 dtucker Exp $
+$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 @@
  * XXX: we should tell the child how many bytes we need.
  */
 
-RCSID("$Id: entropy.c,v 1.49 2005/07/17 07:26:44 djm Exp $");
+RCSID("$Id: entropy.c,v 1.50 2005/09/27 09:50:25 dtucker Exp $");
 
 #ifndef OPENSSL_PRNG_ONLY
 #define RANDOM_SEED_SIZE 48
@@ -145,10 +145,8 @@ init_rng(void)
                     "have %lx", OPENSSL_VERSION_NUMBER, SSLeay());
 
 #ifndef OPENSSL_PRNG_ONLY
-        if ((original_uid = getuid()) == -1)
-                fatal("getuid: %s", strerror(errno));
-        if ((original_euid = geteuid()) == -1)
-                fatal("geteuid: %s", strerror(errno));
+        original_uid = getuid();
+        original_euid = geteuid();
 #endif
 }