From d4d05ccce7b6f66cde52cc11a8d187351c6789b1 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 10 Jan 2023 12:52:10 +0100 Subject: [PATCH] secure_getenv: Fix warning on Android. * m4/secure_getenv.m4 (gl_FUNC_SECURE_GETENV): Test for issetugid using gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS. * lib/secure_getenv.c: Fix comment regarding issetugid. --- ChangeLog | 7 +++++++ lib/secure_getenv.c | 2 +- m4/secure_getenv.m4 | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59eec4d62c..14e3e56617 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-01-10 Bruno Haible + + secure_getenv: Fix warning on Android. + * m4/secure_getenv.m4 (gl_FUNC_SECURE_GETENV): Test for issetugid using + gl_CHECK_FUNCS_ANDROID instead of AC_CHECK_FUNCS. + * lib/secure_getenv.c: Fix comment regarding issetugid. + 2023-01-10 Bruno Haible renameat, renameatu: Fix warning on Android. diff --git a/lib/secure_getenv.c b/lib/secure_getenv.c index 8b2dd5ec17..a0bc0cf817 100644 --- a/lib/secure_getenv.c +++ b/lib/secure_getenv.c @@ -30,7 +30,7 @@ secure_getenv (char const *name) { #if HAVE___SECURE_GETENV /* glibc */ return __secure_getenv (name); -#elif HAVE_ISSETUGID /* OS X, FreeBSD, NetBSD, OpenBSD */ +#elif HAVE_ISSETUGID /* musl, OS X, FreeBSD, NetBSD, OpenBSD, Solaris, Minix */ if (issetugid ()) return NULL; return getenv (name); diff --git a/m4/secure_getenv.m4 b/m4/secure_getenv.m4 index 85104e3488..acb06507cc 100644 --- a/m4/secure_getenv.m4 +++ b/m4/secure_getenv.m4 @@ -1,4 +1,4 @@ -# Look up an environment variable more securely. +# secure_getenv.m4 serial 2 dnl Copyright 2013-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ AC_DEFUN([gl_FUNC_SECURE_GETENV], AC_DEFUN([gl_PREREQ_SECURE_GETENV], [ AC_CHECK_FUNCS([__secure_getenv]) if test $ac_cv_func___secure_getenv = no; then - AC_CHECK_FUNCS([issetugid]) + gl_CHECK_FUNCS_ANDROID([issetugid], [[#include ]]) fi AC_CHECK_FUNCS_ONCE([getuid geteuid getgid getegid]) ]) -- 2.39.5