From: djm <djm>
Date: Mon, 26 Feb 2001 22:47:16 +0000 (+0000)
Subject:  - (djm) Warning fix on entropy.c saved uid stuff. Patch from Mark Miller
X-Git-Tag: V_2_5_1_P2~17
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/d5c4c52e91bae71bda9a1beab2a1a6d8ddbe6760

 - (djm) Warning fix on entropy.c saved uid stuff. Patch from Mark Miller
   <markm@swoon.net>
---

diff --git a/ChangeLog b/ChangeLog
index 98f4b4ad..ec37f7d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
  - (djm) Search for -lcrypt on FreeBSD too
  - (djm) fatal() on OpenSSL version mismatch
  - (djm) Move PAM init to after fork for non-Solaris derived PAMs
+ - (djm) Warning fix on entropy.c saved uid stuff. Patch from Mark Miller
+   <markm@swoon.net>
 
 20010226
  - (bal) Fixed bsd-snprinf.c so it now honors 'BROKEN_SNPRINTF' again.
diff --git a/entropy.c b/entropy.c
index 34bb5eb1..850bd17b 100644
--- a/entropy.c
+++ b/entropy.c
@@ -850,8 +850,8 @@ void init_rng(void)
 	 * Propagate the privileged uid to all of our uids.
 	 * Set the effective uid to the given (unprivileged) uid. 
 	 */
-	if (original_uid != original_euid && setuid(original_euid) == -1 || 
-	    seteuid(original_uid) == -1)
+	if (original_uid != original_euid && (setuid(original_euid) == -1 || 
+	    seteuid(original_uid) == -1))
 		fatal("Couldn't give up privileges");
 #endif /* SAVED_IDS_WORK_WITH_SETEUID */
 
@@ -866,8 +866,8 @@ void init_rng(void)
 	 * Propagate the real uid (usually more privileged) to effective uid
 	 * as well.
 	 */
-	if (original_uid != original_euid && seteuid(original_euid) == -1 || 
-	    setuid(original_uid) == -1)
+	if (original_uid != original_euid && (seteuid(original_euid) == -1 || 
+	    setuid(original_uid) == -1))
 		fatal("Couldn't restore privileges");
 #endif /* SAVED_IDS_WORK_WITH_SETEUID */