Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit31e8cfa

Browse files
committed
Un-break AIX build.
In commitd0a02bd, I'd supposed that uniformly probing forldap_bind would make the intent clearer. However, that seemsnot to work on AIX, for obscure reasons (maybe it's a macrothere?). Revert to the former behavior of probingldap_simple_bind for thread-safe cases and ldap_bind otherwise.Per buildfarm member hoverfly.Discussion:https://postgr.es/m/17083-a19190d9591946a7@postgresql.org
1 parentd23ac62 commit31e8cfa

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

‎configure

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12883,11 +12883,12 @@ if test "$with_ldap" = yes ; then
1288312883
if test "$enable_thread_safety" = yes; then
1288412884
# Use ldap_r for FE if available, else assume ldap is thread-safe.
1288512885
# If ldap_r does exist, assume without checking that ldap does too.
12886-
# on some platforms ldap_r fails to link without PTHREAD_LIBS
12886+
# On some platforms ldap_r fails to link without PTHREAD_LIBS;
12887+
# also, on AIX we must probe ldap_simple_bind not ldap_bind.
1288712888
LIBS=""
12888-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containingldap_bind" >&5
12889-
$as_echo_n "checking for library containingldap_bind... " >&6; }
12890-
if ${ac_cv_search_ldap_bind+:} false; then :
12889+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containingldap_simple_bind" >&5
12890+
$as_echo_n "checking for library containingldap_simple_bind... " >&6; }
12891+
if ${ac_cv_search_ldap_simple_bind+:} false; then :
1289112892
$as_echo_n "(cached) " >&6
1289212893
else
1289312894
ac_func_search_save_LIBS=$LIBS
@@ -12900,11 +12901,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1290012901
#ifdef __cplusplus
1290112902
extern "C"
1290212903
#endif
12903-
charldap_bind ();
12904+
charldap_simple_bind ();
1290412905
int
1290512906
main ()
1290612907
{
12907-
returnldap_bind ();
12908+
returnldap_simple_bind ();
1290812909
;
1290912910
return 0;
1291012911
}
@@ -12917,25 +12918,25 @@ for ac_lib in '' ldap_r ldap; do
1291712918
LIBS="-l$ac_lib $PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS $ac_func_search_save_LIBS"
1291812919
fi
1291912920
if ac_fn_c_try_link "$LINENO"; then :
12920-
ac_cv_search_ldap_bind=$ac_res
12921+
ac_cv_search_ldap_simple_bind=$ac_res
1292112922
fi
1292212923
rm -f core conftest.err conftest.$ac_objext \
1292312924
conftest$ac_exeext
12924-
if ${ac_cv_search_ldap_bind+:} false; then :
12925+
if ${ac_cv_search_ldap_simple_bind+:} false; then :
1292512926
break
1292612927
fi
1292712928
done
12928-
if ${ac_cv_search_ldap_bind+:} false; then :
12929+
if ${ac_cv_search_ldap_simple_bind+:} false; then :
1292912930

1293012931
else
12931-
ac_cv_search_ldap_bind=no
12932+
ac_cv_search_ldap_simple_bind=no
1293212933
fi
1293312934
rm conftest.$ac_ext
1293412935
LIBS=$ac_func_search_save_LIBS
1293512936
fi
12936-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_bind" >&5
12937-
$as_echo "$ac_cv_search_ldap_bind" >&6; }
12938-
ac_res=$ac_cv_search_ldap_bind
12937+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ldap_simple_bind" >&5
12938+
$as_echo "$ac_cv_search_ldap_simple_bind" >&6; }
12939+
ac_res=$ac_cv_search_ldap_simple_bind
1293912940
if test "$ac_res" != no; then :
1294012941
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
1294112942

‎configure.ac

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,9 +1292,10 @@ if test "$with_ldap" = yes ; then
12921292
if test "$enable_thread_safety" = yes; then
12931293
# Use ldap_r for FE if available, else assume ldap is thread-safe.
12941294
# If ldap_r does exist, assume without checking that ldap does too.
1295-
# on some platforms ldap_r fails to link without PTHREAD_LIBS
1295+
# On some platforms ldap_r fails to link without PTHREAD_LIBS;
1296+
# also, on AIX we must probe ldap_simple_bind not ldap_bind.
12961297
LIBS=""
1297-
AC_SEARCH_LIBS(ldap_bind,[ldap_r ldap],[],
1298+
AC_SEARCH_LIBS(ldap_simple_bind,[ldap_r ldap],[],
12981299
[AC_MSG_ERROR([library 'ldap' is required for LDAP])],
12991300
[$PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS])
13001301
LDAP_LIBS_FE="$LIBS $EXTRA_LDAP_LIBS"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp