From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 12 Apr 2018 10:39:00 +0000 (+0200)
Subject: Fix compilation and use of getrandom() when available
X-Git-Tag: dnsdist-1.3.1~159^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d2a703d30bb948a74c1c279b63bac0caf6c74be;p=thirdparty%2Fpdns.git

Fix compilation and use of getrandom() when available
---

diff --git a/pdns/dns_random.cc b/pdns/dns_random.cc
index 08378311eb..a5503bb9af 100644
--- a/pdns/dns_random.cc
+++ b/pdns/dns_random.cc
@@ -40,7 +40,7 @@
 #include <openssl/rand.h>
 #endif
 #if defined(HAVE_GETRANDOM)
-#include <linux/random.h>
+#include <sys/random.h>
 #endif
 
 static enum DNS_RNG {
@@ -131,7 +131,7 @@ static void dns_random_setup(void)
 #if defined(HAVE_KISS_RNG)
   } else if (rng == "kiss") {
     chosen_rng = RNG_KISS;
-    L<<Logger::Warning<<"kiss rng should not be used in production environment"<<std::endl;
+    g_log<<Logger::Warning<<"kiss rng should not be used in production environment"<<std::endl;
 #endif
   } else {
     throw PDNSException("Unsupported rng '" + rng + "'");
@@ -152,7 +152,7 @@ static void dns_random_setup(void)
     // some systems define getrandom but it does not really work, e.g. because it's
     // not present in kernel.
     if (getrandom(buf, sizeof(buf), 0) == -1) {
-       L<<Logger::Warning<<"getrandom() failed: "<<strerror(errno)<<", falling back to " + rdev<<std::endl;
+       g_log<<Logger::Warning<<"getrandom() failed: "<<strerror(errno)<<", falling back to " + rdev<<std::endl;
        chosen_rng = RNG_URANDOM;
     }
   }
@@ -261,7 +261,7 @@ unsigned int dns_random(unsigned int upper_bound) {
 #if defined(HAVE_GETRANDOM) && !defined(USE_URANDOM_ONLY)
       unsigned int num=0;
       while(num < min) {
-        if (getrandom(&num, sizeof(num), 0) != 0)
+        if (getrandom(&num, sizeof(num), 0) != sizeof(num))
           throw PDNSException("getrandom() failed: " + std::string(strerror(errno)));
       }
       return num % upper_bound;