build-sys: test for secure_getenv() too.

In current glibc versions, internal __secure_getenv
no longer exists and was replaced by secure_getenv()

Signed-off-by: Cristian Rodríguez <crrodriguez@opensuse.org>

diff --git a/configure.ac b/configure.ac
index d3a8e9e7f97a3c0945b8778f89ef803c27675acb..d26a686b02070dc97395e46ccd6cd8600e2c88f0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -298,6 +298,7 @@ AC_CHECK_DECL([strsignal],
 
 AC_CHECK_FUNCS([ \
        __fpending \
+       secure_getenv \
        __secure_getenv \
        err \
        errx \

diff --git a/lib/env.c b/lib/env.c
index c78419a388dbaf6f16c46ed30872a5f4701b47e4..c79e0e0de04b170664b9ecbe826d17e57f6e84a6 100644 (file)
--- a/lib/env.c
+++ b/lib/env.c
@@ -100,8 +100,9 @@ char *safe_getenv(const char *arg)
                return NULL;
 #endif
 #endif
-
-#ifdef HAVE___SECURE_GETENV
+#ifdef HAVE_SECURE_GETENV
+return secure_getenv(arg);
+#elif HAVE___SECURE_GETENV
        return __secure_getenv(arg);
 #else
        return getenv(arg);