From: dtucker <dtucker>
Date: Tue, 27 Sep 2005 09:50:25 +0000 (+0000)
Subject:  - (dtucker) [entropy.c] Remove unnecessary tests for getuid and geteuid
X-Git-Tag: V_4_3_P1~230
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/759ab0d942c216fce0ea2db06370b89327b69f29

 - (dtucker) [entropy.c] Remove unnecessary tests for getuid and geteuid
   calls, since they can't possibly fail.  ok djm@
---

diff --git a/ChangeLog b/ChangeLog
index 5372a18c..7cd387da 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@
diff --git a/entropy.c b/entropy.c
index 5e73495d..b3081af9 100644
--- a/entropy.c
+++ b/entropy.c
@@ -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
 }