Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e565ff7

Browse files
committed
Move PGAC_LDAP_SAFE to config/programs.m4.
This restores the style of keeping configure.in free of AC_DEFUN. Per gripe from Tom Lane.
1 parent 1144ea3 commit e565ff7

File tree

3 files changed

+28
-39
lines changed

3 files changed

+28
-39
lines changed

config/programs.m4

+28
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,34 @@ AC_SUBST(FLEXFLAGS)
116116

117117

118118

119+
# PGAC_LDAP_SAFE
120+
# --------------
121+
# PostgreSQL sometimes loads libldap_r and plain libldap into the same
122+
# process. Check for OpenLDAP versions known not to tolerate doing so; assume
123+
# non-OpenLDAP implementations are safe. The dblink test suite exercises the
124+
# hazardous interaction directly.
125+
126+
AC_DEFUN([PGAC_LDAP_SAFE],
127+
[AC_CACHE_CHECK([for compatible LDAP implementation], [pgac_cv_ldap_safe],
128+
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
129+
[#include <ldap.h>
130+
#if !defined(LDAP_VENDOR_VERSION) || \
131+
(defined(LDAP_API_FEATURE_X_OPENLDAP) && \
132+
LDAP_VENDOR_VERSION >= 20424 && LDAP_VENDOR_VERSION <= 20431)
133+
choke me
134+
#endif], [])],
135+
[pgac_cv_ldap_safe=yes],
136+
[pgac_cv_ldap_safe=no])])
137+
138+
if test "$pgac_cv_ldap_safe" != yes; then
139+
AC_MSG_WARN([
140+
*** With OpenLDAP versions 2.4.24 through 2.4.31, inclusive, each backend
141+
*** process that loads libpq (via WAL receiver, dblink, or postgres_fdw) and
142+
*** also uses LDAP will crash on exit.])
143+
fi])
144+
145+
146+
119147
# PGAC_CHECK_READLINE
120148
# -------------------
121149
# Check for the readline library and dependent libraries, either

configure

-11
Original file line numberDiff line numberDiff line change
@@ -9475,17 +9475,6 @@ fi
94759475

94769476
fi
94779477

9478-
# PGAC_LDAP_SAFE
9479-
# --------------
9480-
# PostgreSQL sometimes loads libldap_r and plain libldap into the same
9481-
# process. Check for OpenLDAP versions known not to tolerate doing so; assume
9482-
# non-OpenLDAP implementations are safe. The dblink test suite exercises the
9483-
# hazardous interaction directly.
9484-
9485-
9486-
9487-
9488-
94899478
if test "$with_ldap" = yes ; then
94909479
if test "$PORTNAME" != "win32"; then
94919480
for ac_header in ldap.h

configure.in

-28
Original file line numberDiff line numberDiff line change
@@ -1097,34 +1097,6 @@ if test "$with_libxslt" = yes ; then
10971097
AC_CHECK_HEADER(libxslt/xslt.h, [], [AC_MSG_ERROR([header file <libxslt/xslt.h> is required for XSLT support])])
10981098
fi
10991099

1100-
# PGAC_LDAP_SAFE
1101-
# --------------
1102-
# PostgreSQL sometimes loads libldap_r and plain libldap into the same
1103-
# process. Check for OpenLDAP versions known not to tolerate doing so; assume
1104-
# non-OpenLDAP implementations are safe. The dblink test suite exercises the
1105-
# hazardous interaction directly.
1106-
1107-
AC_DEFUN([PGAC_LDAP_SAFE],
1108-
[AC_CACHE_CHECK([for compatible LDAP implementation], [pgac_cv_ldap_safe],
1109-
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
1110-
[#include <ldap.h>
1111-
#if !defined(LDAP_VENDOR_VERSION) || \
1112-
(defined(LDAP_API_FEATURE_X_OPENLDAP) && \
1113-
LDAP_VENDOR_VERSION >= 20424 && LDAP_VENDOR_VERSION <= 20431)
1114-
choke me
1115-
#endif], [])],
1116-
[pgac_cv_ldap_safe=yes],
1117-
[pgac_cv_ldap_safe=no])])
1118-
1119-
if test "$pgac_cv_ldap_safe" != yes; then
1120-
AC_MSG_WARN([
1121-
*** With OpenLDAP versions 2.4.24 through 2.4.31, inclusive, each backend
1122-
*** process that loads libpq (via WAL receiver, dblink, or postgres_fdw) and
1123-
*** also uses LDAP will crash on exit.])
1124-
fi])
1125-
1126-
1127-
11281100
if test "$with_ldap" = yes ; then
11291101
if test "$PORTNAME" != "win32"; then
11301102
AC_CHECK_HEADERS(ldap.h, [],

0 commit comments

Comments
 (0)