Skip to contentSkip to conversation

Test for secure_getenv too.

PATCH In review Cristian Rodríguez 2 participants 2 messages Feb 5, 2013 – Feb 6, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Test for secure_getenv too.

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

---
 configure.ac | 1 +
 lib/env.c    | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
configure.ac +1 -0
index 9024809..39c7f20 100644
@@ -298,6 +298,7 @@ AC_CHECK_DECL([strsignal],
 
 AC_CHECK_FUNCS([ \
 	__fpending \
+	secure_getenv \
 	__secure_getenv \
 	err \
 	errx \
lib/env.c +3 -2
index 04e0f0b..9f81b44 100644
@@ -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);
Signature · 1 line
1.8.1.1
maintainer
#1 lore raw
Quoted 2 lines · Cristian Rodríguez

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

Good catch, applied. Thanks.

Karel

Signature · 2 lines
 Karel Zak  <[email protected]>
 http://karelzak.blogspot.com