- (djm) Warning fix on entropy.c saved uid stuff. Patch from Mark Miller

   <markm@swoon.net>

diff --git a/ChangeLog b/ChangeLog
index 98f4b4adb8c6482d9995e929a99a8d559a33134b..ec37f7d703961f168ed2bd7bbe152ef1c4ed4637 100644 (file)
--- 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 34bb5eb1b3dfef218b600310394c5f26003bd1eb..850bd17b3512e99052aed0efae86909a06014fd8 100644 (file)
--- 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 */