Make secure_getenv available

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 5eb9257113648ec86606b6f6d4f3d9156b4f03cf..b6ba4150b130e552b9666635585dc2717ac27702 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,7 @@ bin_PROGRAMS =
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
+       -D_GNU_SOURCE \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = \

diff --git a/configure.ac b/configure.ac
index e6d761c4c18723d90f1ba40fb73f9efb6d57d6b8..90f87eb725bf0b4864210db509dda2f5e2cf0b67 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -124,6 +124,11 @@ AC_CHECK_HEADERS_ONCE([
        time.h
 ])
 
+AC_CHECK_FUNCS([ \
+       __secure_getenv \
+       secure_getenv \
+])
+
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 PKG_CHECK_MODULES([OPING], [liboping])

diff --git a/src/daemon/util.h b/src/daemon/util.h
index b97084bfd4ea920522b0a6a918c3e766907e6234..8b8542cb3e51cb1ff1c5d9729941cb0fe1327c93 100644 (file)
--- a/src/daemon/util.h
+++ b/src/daemon/util.h
@@ -22,6 +22,15 @@
 #define COLLECTY_UTIL_H
 
 #include <stdint.h>
+#include <stdlib.h>
+
+#ifndef HAVE_SECURE_GETENV
+#  ifdef HAVE___SECURE_GETENV
+#    define secure_getenv __secure_getenv
+#  else
+#    error neither secure_getenv nor __secure_getenv is available
+#  endif
+#endif
 
 #define collecty_format_number(buffer, number) \
        __collecty_format_number(buffer, sizeof(buffer), number)