isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Don't export getaddrinfo symbols if we found the function in a library.

Browse Source
This commit is contained in:
Todd C. Miller
2014-07-30 15:08:05 -06:00
parent 7a988d489c
commit 0a9e9016f1
2 changed files with 71 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
configure vendored
View File

@@ -19370,7 +19370,8 @@ $as_echo "no" >&6; }
fi fi
# #
# Check for getaddrinfo and add any required libs to NET_LIBS # Check for getaddrinfo and add any required libs to NET_LIBS.
# If it was added to LIBOBJS we need to export the symbols.
# #
OLIBS="$LIBS" OLIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
@@ -19465,13 +19466,8 @@ esac
fi fi
fi fi
for lib in $LIBS; do case " $LIBOBJS " in
case "$OLIBS" in *" getaddrinfo.$ac_objext "* )
*"$lib"*) ;;
*) NET_LIBS="$NET_LIBS $lib";;
esac
done
if test X"$ax_cv_func_getaddrinfo" = X"no"; then
for _sym in sudo_getaddrinfo sudo_freeaddrinfo sudo_gai_strerror; do for _sym in sudo_getaddrinfo sudo_freeaddrinfo sudo_gai_strerror; do
COMPAT_EXP="${COMPAT_EXP}${_sym} COMPAT_EXP="${COMPAT_EXP}${_sym}
@@ -19555,7 +19551,16 @@ $as_echo "no" >&6; }
fi fi
fi ;;
*)
for lib in $LIBS; do
case "$OLIBS" in
*"$lib"*) ;;
*) NET_LIBS="${NET_LIBS} $lib";;
esac
done
;;
esac
LIBS="$OLIBS" LIBS="$OLIBS"
for ac_func in getprogname for ac_func in getprogname

23
configure.ac
View File

@@ -2746,17 +2746,13 @@ AC_CHECK_FUNC(syslog, [], [
done done
]) ])
# #
# Check for getaddrinfo and add any required libs to NET_LIBS # Check for getaddrinfo and add any required libs to NET_LIBS.
# If it was added to LIBOBJS we need to export the symbols.
# #
OLIBS="$LIBS" OLIBS="$LIBS"
AX_FUNC_GETADDRINFO AX_FUNC_GETADDRINFO
for lib in $LIBS; do case " $LIBOBJS " in
case "$OLIBS" in *" getaddrinfo.$ac_objext "* )
*"$lib"*) ;;
*) NET_LIBS="$NET_LIBS $lib";;
esac
done
if test X"$ax_cv_func_getaddrinfo" = X"no"; then
SUDO_APPEND_COMPAT_EXP(sudo_getaddrinfo sudo_freeaddrinfo sudo_gai_strerror) SUDO_APPEND_COMPAT_EXP(sudo_getaddrinfo sudo_freeaddrinfo sudo_gai_strerror)
# We need libsudo_util to pull in dependent libraries for # We need libsudo_util to pull in dependent libraries for
# inet_pton(), gethostbyname(), and getservbyname() # inet_pton(), gethostbyname(), and getservbyname()
@@ -2780,7 +2776,16 @@ if test X"$ax_cv_func_getaddrinfo" = X"no"; then
SUDO_CHECK_LIB($lib, gethostbyname, [LT_DEP_LIBS="${LT_DEP_LIBS} $libs"; break], [], [$extralibs]) SUDO_CHECK_LIB($lib, gethostbyname, [LT_DEP_LIBS="${LT_DEP_LIBS} $libs"; break], [], [$extralibs])
done done
]) ])
fi ;;
*)
for lib in $LIBS; do
case "$OLIBS" in
*"$lib"*) ;;
*) NET_LIBS="${NET_LIBS} $lib";;
esac
done
;;
esac
LIBS="$OLIBS" LIBS="$OLIBS"
dnl dnl