From e9d1f34f727030a2933f78e689e27db028524834 Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 12 Feb 2019 14:06:52 +0100
Subject: [PATCH] Utility::random() and srandom() is not used anymore.

---
 modules/randombackend/randombackend.cc |  4 ++--
 pdns/common_startup.cc                 |  4 +---
 pdns/unix_utility.cc                   | 13 -------------
 pdns/utility.hh                        |  5 -----
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/modules/randombackend/randombackend.cc b/modules/randombackend/randombackend.cc
index 6cec85188..525beb897 100644
--- a/modules/randombackend/randombackend.cc
+++ b/modules/randombackend/randombackend.cc
@@ -22,11 +22,11 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "pdns/utility.hh"
 #include "pdns/dnsbackend.hh"
 #include "pdns/dns.hh"
 #include "pdns/dnsbackend.hh"
 #include "pdns/dnspacket.hh"
+#include "pdns/dns_random.hh"
 #include "pdns/pdnsexception.hh"
 #include "pdns/logger.hh"
 #include "pdns/version.hh"
@@ -59,7 +59,7 @@ public:
     } else if (qdomain == d_ourname) {
       if(type.getCode() == QType::A || type.getCode() == QType::ANY) {
         ostringstream os;
-        os<<Utility::random()%256<<"."<<Utility::random()%256<<"."<<Utility::random()%256<<"."<<Utility::random()%256;
+        os<<dns_random(256)<<"."<<dns_random(256)<<"."<<dns_random(256)<<"."<<dns_random(256);
         d_answer=os.str(); // our random ip address
       } else {
         d_answer="";
diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index ccdfbe8b2..f4959a611 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -496,9 +496,7 @@ static void triggerLoadOfLibraries()
 
 void mainthread()
 {
-   Utility::srandom(time(0) ^ getpid());
-
-   int newgid=0;      
+   int newgid=0;
    if(!::arg()["setgid"].empty()) 
      newgid=Utility::makeGidNumeric(::arg()["setgid"]);      
    int newuid=0;      
diff --git a/pdns/unix_utility.cc b/pdns/unix_utility.cc
index f06d90cb6..b77d7a808 100644
--- a/pdns/unix_utility.cc
+++ b/pdns/unix_utility.cc
@@ -213,19 +213,6 @@ int Utility::makeUidNumeric(const string &username)
 }
 
 
-// Returns a random number.
-long int Utility::random( void )
-{
-  return rand();
-}
-
-// Sets the random seed.
-void Utility::srandom( unsigned int seed )
-{
-  ::srandom(seed);
-}
-
-
 // Writes a vector.
 int Utility::writev(int socket, const iovec *vector, size_t count )
 {
diff --git a/pdns/utility.hh b/pdns/utility.hh
index 2672a1826..2b0ea3c06 100644
--- a/pdns/utility.hh
+++ b/pdns/utility.hh
@@ -128,11 +128,6 @@ public:
 
   //! Writes a vector.
   static int writev( Utility::sock_t socket, const iovec *vector, size_t count );
-  //! Returns a random number.
-  static long int random( void );
-
-  //! Sets the random seed.
-  static void srandom( unsigned int seed );
 
   //! Drops the program's group privileges.
   static void dropGroupPrivs( int uid, int gid );
-- 
2.40.0