You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

41 lines
1.3 KiB

  1. From 7ac0df2a59ddd6e92ede2bca590ec0c76eb67559 Mon Sep 17 00:00:00 2001
  2. From: James Taylor <james@jtaylor.id.au>
  3. Date: Tue, 25 Jun 2019 19:33:04 +1000
  4. Subject: [PATCH] auth: make sure we really are using glibc
  5. Make sure we're using glibc and not uclibc pretending to be glibc
  6. ---
  7. pdns/receiver.cc | 6 +++---
  8. 1 file changed, 3 insertions(+), 3 deletions(-)
  9. diff --git a/pdns/receiver.cc b/pdns/receiver.cc
  10. index e6686787b3..209db7af89 100644
  11. --- a/pdns/receiver.cc
  12. +++ b/pdns/receiver.cc
  13. @@ -354,7 +354,7 @@ static int guardian(int argc, char **argv)
  14. }
  15. }
  16. -#ifdef __GLIBC__
  17. +#if defined(__GLIBC__) && !defined(__UCLIBC__)
  18. #include <execinfo.h>
  19. static void tbhandler(int num)
  20. {
  21. @@ -386,7 +386,7 @@ int main(int argc, char **argv)
  22. s_programname="pdns";
  23. s_starttime=time(0);
  24. -#ifdef __GLIBC__
  25. +#if defined(__GLIBC__) && !defined(__UCLIBC__)
  26. signal(SIGSEGV,tbhandler);
  27. signal(SIGFPE,tbhandler);
  28. signal(SIGABRT,tbhandler);
  29. @@ -450,7 +450,7 @@ int main(int argc, char **argv)
  30. // we really need to do work - either standalone or as an instance
  31. -#ifdef __GLIBC__
  32. +#if defined(__GLIBC__) && !defined(__UCLIBC__)
  33. if(!::arg().mustDo("traceback-handler")) {
  34. g_log<<Logger::Warning<<"Disabling traceback handler"<<endl;
  35. signal(SIGSEGV,SIG_DFL);