From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 6 Jun 2019 10:55:18 +0000 (+0200)
Subject: utility: drop privs only when needed
X-Git-Tag: dnsdist-1.4.0-rc1~110^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c7848b32af97e15450847b668808236e86ff908;p=thirdparty%2Fpdns.git

utility: drop privs only when needed
---

diff --git a/pdns/unix_utility.cc b/pdns/unix_utility.cc
index 201c73fc0d..0d180cfc84 100644
--- a/pdns/unix_utility.cc
+++ b/pdns/unix_utility.cc
@@ -126,7 +126,7 @@ void Utility::usleep(unsigned long usec)
 // Drops the program's group privileges.
 void Utility::dropGroupPrivs( uid_t uid, gid_t gid )
 {
-  if(gid) {
+  if(gid && gid != getegid()) {
     if(setgid(gid)<0) {
       g_log<<Logger::Critical<<"Unable to set effective group id to "<<gid<<": "<<stringerror()<<endl;
       exit(1);
@@ -154,7 +154,7 @@ void Utility::dropGroupPrivs( uid_t uid, gid_t gid )
 // Drops the program's user privileges.
 void Utility::dropUserPrivs( uid_t uid )
 {
-  if(uid) {
+  if(uid && uid != geteuid()) {
     if(setuid(uid)<0) {
       g_log<<Logger::Critical<<"Unable to set effective user id to "<<uid<<": "<<stringerror()<<endl;
       exit(1);