From: Florian Weimer <fweimer@redhat.com>
To: autofs@vger.kernel.org
Cc: Arjun Shankar <ashankar@redhat.com>
Subject: autofs-5.1.8 - define LDAP_DEPRECATED during LDAP configure check
Date: Fri, 29 Sep 2023 12:00:42 +0200 [thread overview]
Message-ID: <87v8bt1eph.fsf@oldenburg.str.redhat.com> (raw)
From: Arjun Shankar <arjun@redhat.com>
This commit defines LDAP_DEPRECATED as 1 during a configure check for
ldap_parse_page_control. This is in line with how lookup_ldap.c is
compiled at build time. Also tweak the type of ct to avoid an
-Wint-conversion warning.
The configure script is regenerated with autoconf 2.69.
The regeneration of the configure script also includes changes due to
commit 69fda4f090e3. That commit intended to run checks with implicit
function declaration warnings enabled in order to recognize missing
libldap functions. However, the in-tree copy of the configure script
was not regenerated at that time.
Signed-off-by: Arjun Shankar <arjun@redhat.com>
Signed-off-by: Florian Weimer <fweimer@redhat.com>
---
Resubmitting because apparently this got never merged, also added
the -Wint-conversion fix.
aclocal.m4 | 5 +++--
configure | 11 +++++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 33561aaeb9f5eaa4..1920672d37d25a27 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -368,9 +368,10 @@ af_check_ldap_parse_page_control_save_libs="$LIBS"
LIBS="$LIBS -lldap"
AC_TRY_LINK(
- [ #include <ldap.h> ],
+ [ #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 394a8d55121c12ed..c84ef2a94d1df1b4 100755
--- a/configure
+++ b/configure
@@ -5407,6 +5407,8 @@ $as_echo_n "checking for ldap_create_page_control in -lldap... " >&6; }
# save current libs
af_check_ldap_create_page_control_save_libs="$LIBS"
LIBS="$LIBS -lldap"
+af_check_ldap_create_page_control_save_cflags="$CFLAGS"
+CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -5443,6 +5445,7 @@ fi
# restore libs
LIBS="$af_check_ldap_create_page_control_save_libs"
+CFLAGS="$af_check_ldap_create_page_control_save_cflags"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_parse_page_control in -lldap" >&5
$as_echo_n "checking for ldap_parse_page_control in -lldap... " >&6; }
@@ -5450,15 +5453,18 @@ $as_echo_n "checking for ldap_parse_page_control in -lldap... " >&6; }
# save current libs
af_check_ldap_parse_page_control_save_libs="$LIBS"
LIBS="$LIBS -lldap"
+af_check_ldap_parse_page_control_save_cflags="$CFLAGS"
+CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <ldap.h>
+ #define LDAP_DEPRECATED 1
+ #include <ldap.h>
int
main ()
{
LDAP *ld;
- ber_int_t ct;
+ ber_int_t *ct;
struct berval *c;
int ret;
LDAPControl **clp;
@@ -5486,6 +5492,7 @@ fi
# restore libs
LIBS="$af_check_ldap_parse_page_control_save_libs"
+CFLAGS="$af_check_ldap_parse_page_control_save_cflags"
fi
base-commit: ab70c4c070d8e21cd51df93f7a603788aa50dd5f
next reply other threads:[~2023-09-29 10:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-29 10:00 Florian Weimer [this message]
2023-09-30 1:33 ` autofs-5.1.8 - define LDAP_DEPRECATED during LDAP configure check Ian Kent
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87v8bt1eph.fsf@oldenburg.str.redhat.com \
--to=fweimer@redhat.com \
--cc=ashankar@redhat.com \
--cc=autofs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).