]> granicus.if.org Git - pdns/commitdiff
auth: make sure we really are using glibc
authorJames Taylor <james@jtaylor.id.au>
Tue, 25 Jun 2019 09:33:04 +0000 (19:33 +1000)
committerPeter van Dijk <peter.van.dijk@powerdns.com>
Mon, 1 Jul 2019 20:31:26 +0000 (22:31 +0200)
Make sure we're using glibc and not uclibc pretending to be glibc

(cherry picked from commit 7ac0df2a59ddd6e92ede2bca590ec0c76eb67559)

pdns/receiver.cc

index e6686787b38ef9c19a265df5d66759525cf3e38c..209db7af89410d2d7082543cbc1857ce462d157d 100644 (file)
@@ -354,7 +354,7 @@ static int guardian(int argc, char **argv)
   }
 }
 
-#ifdef __GLIBC__
+#ifdef __GLIBC__ && !defined(__UCLIBC__)
 #include <execinfo.h>
 static void tbhandler(int num)
 {
@@ -386,7 +386,7 @@ int main(int argc, char **argv)
   s_programname="pdns";
   s_starttime=time(0);
 
-#ifdef __GLIBC__
+#ifdef __GLIBC__ && !defined(__UCLIBC__)
   signal(SIGSEGV,tbhandler);
   signal(SIGFPE,tbhandler);
   signal(SIGABRT,tbhandler);
@@ -450,7 +450,7 @@ int main(int argc, char **argv)
     
     // we really need to do work - either standalone or as an instance
 
-#ifdef __GLIBC__
+#ifdef __GLIBC__ && !defined(__UCLIBC__)
     if(!::arg().mustDo("traceback-handler")) {
       g_log<<Logger::Warning<<"Disabling traceback handler"<<endl;
       signal(SIGSEGV,SIG_DFL);