From: Cristian Rodríguez <crrodriguez@opensuse.org>
Date: Tue, 5 Feb 2013 05:08:03 +0000 (-0300)
Subject: build-sys: test for secure_getenv() too.
X-Git-Tag: v2.23-rc1~242
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=075f4bfd3413f79f395870ae86de1964252854ad;p=thirdparty%2Futil-linux.git

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 d3a8e9e7f9..d26a686b02 100644
--- 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 c78419a388..c79e0e0de0 100644
--- 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);