From 2211dac9a5f5bf34417da0b9384fb99cfca9d649 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 19 Jun 2019 15:35:28 +0200
Subject: [PATCH] utility: Remove makeUidNumeric and makeGidNumeric

---
 pdns/common_startup.cc |  5 +++--
 pdns/dynlistener.cc    |  2 +-
 pdns/misc.hh           |  2 --
 pdns/pdns_recursor.cc  |  4 ++--
 pdns/unix_utility.cc   | 34 ----------------------------------
 pdns/utility.hh        |  6 ------
 6 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 034e13e41..a8392579f 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -30,6 +30,7 @@
 #include "dynhandler.hh"
 #include "dnsseckeeper.hh"
 #include "threadname.hh"
+#include "misc.hh"
 
 #ifdef HAVE_SYSTEMD
 #include <systemd/sd-daemon.h>
@@ -501,10 +502,10 @@ void mainthread()
 
    gid_t newgid = 0;
    if(!::arg()["setgid"].empty())
-     newgid=Utility::makeGidNumeric(::arg()["setgid"]);
+     newgid = strToGID(::arg()["setgid"]);
    uid_t newuid = 0;
    if(!::arg()["setuid"].empty())
-     newuid=Utility::makeUidNumeric(::arg()["setuid"]);
+     newuid = strToUID(::arg()["setuid"]);
    
    g_anyToTcp = ::arg().mustDo("any-to-tcp");
    g_8bitDNS = ::arg().mustDo("8bit-dns");
diff --git a/pdns/dynlistener.cc b/pdns/dynlistener.cc
index c3a1dc7e3..28d11f32e 100644
--- a/pdns/dynlistener.cc
+++ b/pdns/dynlistener.cc
@@ -135,7 +135,7 @@ void DynListener::listenOnUnixDomain(const string& fname)
   if(!arg()["setgid"].empty()) {
     if(chmod(fname.c_str(),0660)<0)
       g_log<<Logger::Error<<"Unable to change group access mode of controlsocket at '"<<fname<<"', reason: "<<strerror(errno)<<endl;
-    if(chown(fname.c_str(),static_cast<uid_t>(-1),Utility::makeGidNumeric(arg()["setgid"]))<0)
+    if(chown(fname.c_str(),static_cast<uid_t>(-1), strToGID(arg()["setgid"]))<0)
       g_log<<Logger::Error<<"Unable to change group ownership of controlsocket at '"<<fname<<"', reason: "<<strerror(errno)<<endl;
   }
   
diff --git a/pdns/misc.hh b/pdns/misc.hh
index ee255e9b9..205f033d2 100644
--- a/pdns/misc.hh
+++ b/pdns/misc.hh
@@ -162,8 +162,6 @@ string uitoa(unsigned int i);
 string bitFlip(const string &str);
 
 void dropPrivs(int uid, int gid);
-int makeGidNumeric(const string &group);
-int makeUidNumeric(const string &user);
 void cleanSlashes(string &str);
 
 #if defined(_POSIX_THREAD_CPUTIME) && defined(CLOCK_THREAD_CPUTIME_ID)
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 82d4de2fb..e201f550b 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -4020,10 +4020,10 @@ static int serviceMain(int argc, char*argv[])
 
   int newgid=0;
   if(!::arg()["setgid"].empty())
-    newgid=Utility::makeGidNumeric(::arg()["setgid"]);
+    newgid = strToGID(::arg()["setgid"]);
   int newuid=0;
   if(!::arg()["setuid"].empty())
-    newuid=Utility::makeUidNumeric(::arg()["setuid"]);
+    newuid = strToUID(::arg()["setuid"]);
 
   Utility::dropGroupPrivs(newuid, newgid);
 
diff --git a/pdns/unix_utility.cc b/pdns/unix_utility.cc
index 0d180cfc8..3287711b1 100644
--- a/pdns/unix_utility.cc
+++ b/pdns/unix_utility.cc
@@ -178,40 +178,6 @@ int Utility::gettimeofday( struct timeval *tv, void *tz )
   return ::gettimeofday(tv,0);
 }
 
-
-
-// Retrieves a gid using a groupname.
-gid_t Utility::makeGidNumeric(const string &group)
-{
-  gid_t newgid;
-  if(!(newgid=atoi(group.c_str()))) {
-    errno=0;
-    struct group *gr=getgrnam(group.c_str());
-    if(!gr) {
-      g_log<<Logger::Critical<<"Unable to look up gid of group '"<<group<<"': "<< (errno ? strerror(errno) : "not found") <<endl;
-      exit(1);
-    }
-    newgid=gr->gr_gid;
-  }
-  return newgid;
-}
-
-
-// Retrieves an uid using a username.
-uid_t Utility::makeUidNumeric(const string &username)
-{
-  uid_t newuid;
-  if(!(newuid=atoi(username.c_str()))) {
-    struct passwd *pw=getpwnam(username.c_str());
-    if(!pw) {
-      g_log<<Logger::Critical<<"Unable to look up uid of user '"<<username<<"': "<< (errno ? strerror(errno) : "not found") <<endl;
-      exit(1);
-    }
-    newuid=pw->pw_uid;
-  }
-  return newuid;
-}
-
 // Sets the random seed.
 void Utility::srandom(void)
 {
diff --git a/pdns/utility.hh b/pdns/utility.hh
index 626131d8b..8a7083fd3 100644
--- a/pdns/utility.hh
+++ b/pdns/utility.hh
@@ -120,12 +120,6 @@ public:
   //! The inet_ntop() function converts an address from network format (usually a struct in_addr or some other binary form, in network byte order) to presentation format.
   static const char *inet_ntop( int af, const char *src, char *dst, size_t size );
 
-  //! Retrieves a gid using a groupname.
-  static gid_t makeGidNumeric( const string & group );
-  
-  //! Retrieves an uid using an username.
-  static uid_t makeUidNumeric( const string & username );
-
   //! Writes a vector.
   static int writev( Utility::sock_t socket, const iovec *vector, size_t count );
 
-- 
2.40.0