]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
gettime: Use secure_getenv over getenv. 146/head
authorChris Lamb <chris@chris-lamb.co.uk>
Sun, 31 Mar 2019 14:59:45 +0000 (15:59 +0100)
committerChris Lamb <chris@chris-lamb.co.uk>
Sun, 31 Mar 2019 15:00:01 +0000 (16:00 +0100)
README
configure.ac
lib/defines.h
libmisc/gettime.c

diff --git a/README b/README
index 952ac5787f066c6f152c0ababc26da374e8a32e9..26cfff1e8fa866a0db1b750b5d07ab2f302f35b1 100644 (file)
--- a/README
+++ b/README
@@ -51,6 +51,7 @@ Brian R. Gaeke <brg@dgate.org>
 Calle Karlsson <ckn@kash.se>
 Chip Rosenthal <chip@unicom.com>
 Chris Evans <lady0110@sable.ox.ac.uk>
+Chris Lamb <chris@chris-lamb.co.uk>
 Cristian Gafton <gafton@sorosis.ro>
 Dan Walsh <dwalsh@redhat.com>
 Darcy Boese <possum@chardonnay.niagara.com>
index da236722766b7872a25e32d6f2c99023f28b3443..a738ad662cc37443e1ff0fa3a444d1355abe2be1 100644 (file)
@@ -110,6 +110,9 @@ AC_REPLACE_FUNCS(sgetgrent sgetpwent sgetspent)
 AC_REPLACE_FUNCS(snprintf strcasecmp strdup strerror strstr)
 
 AC_CHECK_FUNC(setpgrp)
+AC_CHECK_FUNC(secure_getenv, [AC_DEFINE(HAS_SECURE_GETENV,
+                                        1,
+                                        [Defined to 1 if you have the declaration of 'secure_getenv'])])
 
 if test "$ac_cv_header_shadow_h" = "yes"; then
        AC_CACHE_CHECK(for working shadow group support,
index cded1417fd121cfd87c22963033bc2ef9f53685b..2fb1b56eca6bc83679e95f42d382eb7426b3d18c 100644 (file)
@@ -382,4 +382,10 @@ extern char *strerror ();
 # endif
 #endif
 
+#ifdef HAVE_SECURE_GETENV
+#  define shadow_getenv(name) secure_getenv(name)
+# else
+#  define shadow_getenv(name) getenv(name)
+#endif
+
 #endif                         /* _DEFINES_H_ */
index 53eaf51670bb4390680cba914ea25cfb21cc5206..0e25a4b750616245bebdc116298366cf774b84bd 100644 (file)
@@ -52,7 +52,7 @@
        unsigned long long epoch;
 
        fallback = time (NULL);
-       source_date_epoch = getenv ("SOURCE_DATE_EPOCH");
+       source_date_epoch = shadow_getenv ("SOURCE_DATE_EPOCH");
 
        if (!source_date_epoch)
                return fallback;