From d75d22e98aabefbe64c50ccfdc8b451d646884dc Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Wed, 30 Jul 2014 15:47:15 -0600
Subject: [PATCH] Fix exporting of asprintf/vasprintf symbols.

---
 configure    | 56 ++++++++++++++++++++++++++++++----------------------
 configure.ac | 27 +++++++++++--------------
 2 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/configure b/configure
index 74375f181..206fdc05d 100755
--- a/configure
+++ b/configure
@@ -18510,56 +18510,64 @@ $as_echo "$as_me: WARNING: Replacing missing/broken (v)snprintf() with sudo's ve
 $as_echo "#define PREFER_PORTABLE_SNPRINTF 1" >>confdefs.h
 
 fi
-for ac_func in asprintf vasprintf
+if test X"$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf" = X"yesyes"; then
+    # System has a C99-compliant v?snprintf(), check for v?asprintf()
+    for ac_func in asprintf
 do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf"
+if test "x$ac_cv_func_asprintf" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_ASPRINTF 1
 _ACEOF
 
-fi
-done
+else
 
-if test X"$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf" = X"yesyes"; then
-    # Don't add snprintf to LIBOBJS if it is already present.
-    if test X"$ac_cv_func_asprintf$ac_cv_func_vasprintf" != X"yesyes"; then
 	case " $LIBOBJS " in
   *" snprintf.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
  ;;
 esac
 
-    fi
-fi
-if test X"$ac_cv_have_working_snprintf" = X"no"; then
 
-    for _sym in sudo_snprintf; do
+    for _sym in sudo_asprintf; do
 	COMPAT_EXP="${COMPAT_EXP}${_sym}
 "
     done
 
+
 fi
-if test X"$ac_cv_have_working_vsnprintf" = X"no"; then
+done
 
-    for _sym in sudo_vsnprintf; do
-	COMPAT_EXP="${COMPAT_EXP}${_sym}
-"
-    done
+    for ac_func in vasprintf
+do :
+  ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
+if test "x$ac_cv_func_vasprintf" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VASPRINTF 1
+_ACEOF
 
-fi
-if test X"$ac_cv_func_asprintf" = X"no"; then
+else
 
-    for _sym in sudo_asprintf; do
+	case " $LIBOBJS " in
+  *" snprintf.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS snprintf.$ac_objext"
+ ;;
+esac
+
+
+    for _sym in sudo_vasprintf; do
 	COMPAT_EXP="${COMPAT_EXP}${_sym}
 "
     done
 
+
 fi
-if test X"$ac_cv_func_vasprintf" = X"no"; then
+done
 
-    for _sym in sudo_vasprintf; do
+else
+    # Missing or non-compliant v?snprintf(), assume missing/bad v?asprintf()
+
+    for _sym in sudo_snprintf sudo_vsnprintf sudo_asprintf sudo_vasprintf; do
 	COMPAT_EXP="${COMPAT_EXP}${_sym}
 "
     done
diff --git a/configure.ac b/configure.ac
index 78c9a339c..31db4d9a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2540,24 +2540,19 @@ if test X"$ac_cv_func_mkstemps$ac_cv_func_mkdtemp" != X"yesyes"; then
     fi
 fi
 AX_FUNC_SNPRINTF
-AC_CHECK_FUNCS(asprintf vasprintf)
 if test X"$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf" = X"yesyes"; then
-    # Don't add snprintf to LIBOBJS if it is already present.
-    if test X"$ac_cv_func_asprintf$ac_cv_func_vasprintf" != X"yesyes"; then
+    # System has a C99-compliant v?snprintf(), check for v?asprintf()
+    AC_CHECK_FUNCS(asprintf, [], [
 	AC_LIBOBJ(snprintf)
-    fi
-fi
-if test X"$ac_cv_have_working_snprintf" = X"no"; then
-    SUDO_APPEND_COMPAT_EXP(sudo_snprintf)
-fi
-if test X"$ac_cv_have_working_vsnprintf" = X"no"; then
-    SUDO_APPEND_COMPAT_EXP(sudo_vsnprintf)
-fi
-if test X"$ac_cv_func_asprintf" = X"no"; then
-    SUDO_APPEND_COMPAT_EXP(sudo_asprintf)
-fi
-if test X"$ac_cv_func_vasprintf" = X"no"; then
-    SUDO_APPEND_COMPAT_EXP(sudo_vasprintf)
+	SUDO_APPEND_COMPAT_EXP(sudo_asprintf)
+    ])
+    AC_CHECK_FUNCS(vasprintf, [], [
+	AC_LIBOBJ(snprintf)
+	SUDO_APPEND_COMPAT_EXP(sudo_vasprintf)
+    ])
+else
+    # Missing or non-compliant v?snprintf(), assume missing/bad v?asprintf()
+    SUDO_APPEND_COMPAT_EXP(sudo_snprintf sudo_vsnprintf sudo_asprintf sudo_vasprintf)
 fi
 # We wrap OpenBSD's strtonum() to get translatable error strings.
 AC_CHECK_FUNCS(strtonum)
-- 
2.40.0