mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Un-break AIX build.

Browse Source 
In commit d0a02bdb8, I'd supposed that uniformly probing for
ldap_bind would make the intent clearer.  However, that seems
not to work on AIX, for obscure reasons (maybe it's a macro
there?).  Revert to the former behavior of probing
ldap_simple_bind for thread-safe cases and ldap_bind otherwise.

Per buildfarm member hoverfly.

Discussion: https://postgr.es/m/17083-a19190d9591946a7@postgresql.org
This commit is contained in:
Tom Lane 2021-07-09 14:15:41 -04:00
parent d23ac62afa
commit 31e8cfac58
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
configure vendored
View File

@ -12883,11 +12883,12 @@ if test "$with_ldap" = yes ; then
if test "$enable_thread_safety" = yes; then if test "$enable_thread_safety" = yes; then
# Use ldap_r for FE if available, else assume ldap is thread-safe. # Use ldap_r for FE if available, else assume ldap is thread-safe.
# If ldap_r does exist, assume without checking that ldap does too. # If ldap_r does exist, assume without checking that ldap does too.
# on some platforms ldap_r fails to link without PTHREAD_LIBS # On some platforms ldap_r fails to link without PTHREAD_LIBS;
# also, on AIX we must probe ldap_simple_bind not ldap_bind.
LIBS="" LIBS=""
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_bind" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_simple_bind" >&5
$as_echo_n "checking for library containing ldap_bind... " >&6; } $as_echo_n "checking for library containing ldap_simple_bind... " >&6; }
if ${ac_cv_search_ldap_bind+:} false; then : if ${ac_cv_search_ldap_simple_bind+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
ac_func_search_save_LIBS=$LIBS ac_func_search_save_LIBS=$LIBS
@ -12900,11 +12901,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
#endif #endif
char ldap_bind (); char ldap_simple_bind ();
int int
main () main ()
{ {
return ldap_bind (); return ldap_simple_bind ();
; ;
return 0; return 0;
} }
@ -12917,25 +12918,25 @@ for ac_lib in '' ldap_r ldap; do
LIBS="-l$ac_lib $PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS $ac_func_search_save_LIBS" LIBS="-l$ac_lib $PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS $ac_func_search_save_LIBS"
fi fi
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_ldap_bind=$ac_res ac_cv_search_ldap_simple_bind=$ac_res
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest$ac_exeext
if ${ac_cv_search_ldap_bind+:} false; then : if ${ac_cv_search_ldap_simple_bind+:} false; then :
break break
fi fi
done done
if ${ac_cv_search_ldap_bind+:} false; then : if ${ac_cv_search_ldap_simple_bind+:} false; then :
else else
ac_cv_search_ldap_bind=no ac_cv_search_ldap_simple_bind=no
fi fi
rm conftest.$ac_ext rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS LIBS=$ac_func_search_save_LIBS
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_bind" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_simple_bind" >&5
$as_echo "$ac_cv_search_ldap_bind" >&6; } $as_echo "$ac_cv_search_ldap_simple_bind" >&6; }
ac_res=$ac_cv_search_ldap_bind ac_res=$ac_cv_search_ldap_simple_bind
if test "$ac_res" != no; then : if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

5
configure.ac
View File

@ -1292,9 +1292,10 @@ if test "$with_ldap" = yes ; then
if test "$enable_thread_safety" = yes; then if test "$enable_thread_safety" = yes; then
# Use ldap_r for FE if available, else assume ldap is thread-safe. # Use ldap_r for FE if available, else assume ldap is thread-safe.
# If ldap_r does exist, assume without checking that ldap does too. # If ldap_r does exist, assume without checking that ldap does too.
# on some platforms ldap_r fails to link without PTHREAD_LIBS # On some platforms ldap_r fails to link without PTHREAD_LIBS;
# also, on AIX we must probe ldap_simple_bind not ldap_bind.
LIBS="" LIBS=""
AC_SEARCH_LIBS(ldap_bind, [ldap_r ldap], [], AC_SEARCH_LIBS(ldap_simple_bind, [ldap_r ldap], [],
[AC_MSG_ERROR([library 'ldap' is required for LDAP])], [AC_MSG_ERROR([library 'ldap' is required for LDAP])],
[$PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS]) [$PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS])
LDAP_LIBS_FE="$LIBS $EXTRA_LDAP_LIBS" LDAP_LIBS_FE="$LIBS $EXTRA_LDAP_LIBS"