From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 20 Feb 2018 09:26:04 +0000 (+0100)
Subject: auth: guard gethosntame call
X-Git-Tag: dnsdist-1.3.1~50^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6fbcb6e94e4ec445e9f002869037971f97bbd54;p=pdns

auth: guard gethosntame call
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index af0944ba2..3b0829e0d 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -3212,7 +3212,7 @@ static int serviceMain(int argc, char*argv[])
     if (gethostname(tmp, sizeof(tmp)-1) == 0){
       SyncRes::s_serverID = tmp;
     } else {
-      L<<Logger::Warning<<"Unable to get the hostname, NSID and id.server values will be empty: "<<strerror(errno)<<endl;
+      g_log<<Logger::Warning<<"Unable to get the hostname, NSID and id.server values will be empty: "<<strerror(errno)<<endl;
     }
   }
 
diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index d62e0f1df..3efe6b3c0 100644
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -576,8 +576,11 @@ int main(int argc, char **argv)
 
     if(::arg()["server-id"].empty()) {
       char tmp[128];
-      gethostname(tmp, sizeof(tmp)-1);
-      ::arg().set("server-id")=tmp;
+      if(gethostname(tmp, sizeof(tmp)-1) == 0) {
+        ::arg().set("server-id")=tmp;
+      } else {
+        g_log<<Logger::Warning<<"Unable to get the hostname, NSID and id.server values will be empty: "<<strerror(errno)<<endl;
+      }
     }
 
     UeberBackend::go();