aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Kent <raven@themaw.net>2023-10-07 09:24:57 +0800
committerIan Kent <raven@themaw.net>2023-11-02 08:30:15 +0800
commit28b5700482b698fa595e7da3bfc2c75a95802dab (patch)
tree7c7f142acad49f3ece1f0f7ac1420258dd10bdef
parente3b729d88fef52c8e51a3db4a8722c9466900d77 (diff)
downloadautofs-28b5700482b698fa595e7da3bfc2c75a95802dab.tar.gz
autofs-5.1.8 - fix ldap_parse_page_control() check
The third parameter of ldap_parse_page_control() is a pointer so fix the decelaration in the configure check function source. Also regenerate configure script (under autoconf-2.69). Fixes: fd08b1c02610 ("autofs-5.1.8 - define LDAP_DEPRECATED during LDAP configure check") Signed-off-by: Ian Kent <raven@themaw.net>
-rw-r--r--CHANGELOG1
-rw-r--r--aclocal.m42
-rwxr-xr-xconfigure16
3 files changed, 4 insertions, 15 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 09e1ea43..f61d812e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -99,6 +99,7 @@
- fix multi-mount check.
- fix let OpenLDAP handle SASL binding.
- always recreate credential cache.
+- fix ldap_parse_page_control() check.
19/10/2021 autofs-5.1.8
- add xdr_exports().
diff --git a/aclocal.m4 b/aclocal.m4
index 3b495994..cfb3e391 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -422,7 +422,7 @@ AC_TRY_LINK(
[ #define LDAP_DEPRECATED 1
#include <ldap.h> ],
[ LDAP *ld;
- ber_int_t ct;
+ ber_int_t *ct;
struct berval *c;
int ret;
LDAPControl **clp;
diff --git a/configure b/configure
index bbd2586a..99cd8536 100755
--- a/configure
+++ b/configure
@@ -710,7 +710,6 @@ infodir
docdir
oldincludedir
includedir
-runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -811,7 +810,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1064,15 +1062,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
- -runstatedir | --runstatedir | --runstatedi | --runstated \
- | --runstate | --runstat | --runsta | --runst | --runs \
- | --run | --ru | --r)
- ac_prev=runstatedir ;;
- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
- | --run=* | --ru=* | --r=*)
- runstatedir=$ac_optarg ;;
-
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1210,7 +1199,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir runstatedir
+ libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1363,7 +1352,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -5528,7 +5516,7 @@ int
main ()
{
LDAP *ld;
- ber_int_t ct;
+ ber_int_t *ct;
struct berval *c;
int ret;
LDAPControl **clp;