From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 20 Apr 2018 07:20:46 +0000 (+1200)
Subject: Use LSAN top level header file
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9149d2d6addbcb2806908fc334d816e05c8ea7a4;p=thirdparty%2Ffreeradius-server.git

Use LSAN top level header file
---

diff --git a/configure b/configure
index 0ea08c997a1..d65a8776958 100755
--- a/configure
+++ b/configure
@@ -7520,7 +7520,7 @@ for ac_header in \
   prot.h \
   pwd.h \
   resource.h \
-  sanitizer/common_interface_defs.h \
+  sanitizer/lsan_interface.h \
   semaphore.h \
   sia.h \
   siad.h \
diff --git a/configure.ac b/configure.ac
index 2e814f9d430..cb6990b46e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -789,7 +789,7 @@ AC_CHECK_HEADERS( \
   prot.h \
   pwd.h \
   resource.h \
-  sanitizer/common_interface_defs.h \
+  sanitizer/lsan_interface.h \
   semaphore.h \
   sia.h \
   siad.h \
diff --git a/src/include/autoconf.h.in b/src/include/autoconf.h.in
index 7b22f024ad4..5094776c4db 100644
--- a/src/include/autoconf.h.in
+++ b/src/include/autoconf.h.in
@@ -356,9 +356,8 @@
 /* Define to 1 if you have the <resource.h> header file. */
 #undef HAVE_RESOURCE_H
 
-/* Define to 1 if you have the <sanitizer/common_interface_defs.h> header
-   file. */
-#undef HAVE_SANITIZER_COMMON_INTERFACE_DEFS_H
+/* Define to 1 if you have the <sanitizer/lsan_interface.h> header file. */
+#undef HAVE_SANITIZER_LSAN_INTERFACE_H
 
 /* Define to 1 if you have the <semaphore.h> header file. */
 #undef HAVE_SEMAPHORE_H
diff --git a/src/lib/util/debug.c b/src/lib/util/debug.c
index cbc4faeae6c..ab1ace1219f 100644
--- a/src/lib/util/debug.c
+++ b/src/lib/util/debug.c
@@ -116,11 +116,11 @@ static TALLOC_CTX *talloc_autofree_ctx;
 #    include <sys/capability.h>
 #  endif
 
-#ifdef HAVE_SANITIZER_COMMON_INTERFACE_DEFS_H
-#  include <sanitizer/common_interface_defs.h>
+#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H
+#  include <sanitizer/lsan_interface.h>
 #endif
 
-#ifdef HAVE_SANITIZER_COMMON_INTERFACE_DEFS_H
+#ifdef HAVE_SANITIZER_LSAN_INTERFACE_H
 static int lsan_test_pipe[2] = {-1, -1};
 static int lsan_test_pid = -1;
 static int lsan_state = INT_MAX;
diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c
index 996de12df18..86e50e29759 100644
--- a/src/modules/rlm_python/rlm_python.c
+++ b/src/modules/rlm_python/rlm_python.c
@@ -32,6 +32,7 @@ RCSID("$Id$")
 #include <freeradius-devel/radiusd.h>
 #include <freeradius-devel/modules.h>
 #include <freeradius-devel/rad_assert.h>
+#include <freeradius-devel/lsan.h>
 
 #include <Python.h>
 #include <dlfcn.h>