Drop Mozilla LDAP SDK detection, update --with-ldap code (#1710)

Mozilla has not maintained their LDAP SDK since 2017:
https://wiki.mozilla.org/LDAP_C_SDK#Latest_News_-_10.2F13.2F2017

Admin needing to use that SDK can ./configure Squid with:

    --with-ldap=/path/to/sdk CPPFLAGS=-I/path/to/sdk/mozldap

Author: yadij

acinclude/ldap.m4

@@ -12,11 +12,9 @@ AC_DEFUN([SQUID_LDAP_TEST],[
     LIBS="$LIBLDAP_PATH $LIBLDAP_LIBS $LIBPTHREADS"
     CPPFLAGS="-DLDAP_DEPRECATED=1 -DLDAP_REFERRALS $CPPFLAGS"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#       if HAVE_LDAP_H
-#       include <ldap.h>
-#       elif HAVE_MOZLDAP_LDAP_H
-#       include <mozldap/ldap.h>
-#       endif
+#if HAVE_LDAP_H
+#include <ldap.h>
+#endif
       ]],[[$2]])
     ],[
       squid_cv_$1=1
@@ -37,12 +35,12 @@ AC_DEFUN([SQUID_LDAP_TEST_RUN],[
     LIBS="$LIBLDAP_PATH $LIBLDAP_LIBS $LIBPTHREADS"
     CPPFLAGS="-DLDAP_DEPRECATED=1 -DLDAP_REFERRALS $CPPFLAGS"
     AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-#       if HAVE_LDAP_H
-#       include <ldap.h>
-#       elif HAVE_MOZLDAP_LDAP_H
-#       include <mozldap/ldap.h>
-#       endif
-#       include <string.h>
+#if HAVE_LDAP_H
+#include <ldap.h>
+#endif
+#if HAVE_STRING_H
+#include <string.h>
+#endif
       ]],[[$2]])
     ],[
       m4_translit([squid_cv_$1],[-+. ],[____])=1
@@ -61,7 +59,6 @@ dnl find the LDAP library vendor and define relevant HAVE_(vendor name) macro
 AC_DEFUN([SQUID_LDAP_CHECK_VENDOR],[
   SQUID_LDAP_TEST_RUN([OpenLDAP],[return strcmp(LDAP_VENDOR_NAME,"OpenLDAP")])
   SQUID_LDAP_TEST_RUN([Sun LDAP SDK],[return strcmp(LDAP_VENDOR_NAME,"Sun Microsystems Inc.")])
-  SQUID_LDAP_TEST_RUN([Mozilla LDAP SDK],[return strcmp(LDAP_VENDOR_NAME,"mozilla.org")])
 ])
 
 dnl check whether the LDAP library(s) provide the needed API and types
@@ -99,5 +96,4 @@ AC_DEFUN([SQUID_CHECK_LDAP_API],[
   AC_SEARCH_LIBS([ldap_start_tls_s],[$LIBLDAP_NAMES],[
     AC_DEFINE(HAVE_LDAP_START_TLS_S,1,[Define to 1 if you have ldap_start_tls_s])
   ])
-  SQUID_STATE_ROLLBACK(squid_ldap_state)
 ])

configure.ac

@@ -1237,24 +1237,11 @@ SQUID_CHECK_LIB_WORKS(ldap,[
   ],[
     SQUID_STATE_SAVE(squid_ldap_state)
     LIBS="$LIBLDAP_PATH $LIBPTHREADS $LIBS"
-    PKG_CHECK_MODULES([LIBLDAP],[ldap],[],[
-      AC_CHECK_LIB(lber, ber_init, [LIBLBER="-llber"])
-      AC_CHECK_LIB(ldap, ldap_init, [LIBLDAP_LIBS="-lldap $LIBLBER"])
-      dnl if no ldap lib found check for mozilla version
-      AS_IF([test "x$ac_cv_lib_ldap_ldap_init" != "xyes"],[
-        SQUID_STATE_SAVE(squid_ldap_mozilla)
-        LIBS="$LIBLDAP_PATH $LIBPTHREADS"
-        AC_CHECK_LIB(ldap60, ldap_init, [LIBLDAP_LIBS="-lldap60 $LIBLBER"])
-        LIBS="$LIBLDAP_PATH $LIBLDAP_LIBS $LIBPTHREADS"
-        AC_CHECK_LIB(prldap60, prldap_init, [LIBLDAP_LIBS="-lprldap60 $LIBLDAP_LIBS"])
-        LIBS="$LIBLDAP_PATH $LIBLDAP_LIBS $LIBPTHREADS"
-        AC_CHECK_LIB(ssldap60, ldapssl_init, [LIBLDAP_LIBS="-lssldap60 $LIBLDAP_LIBS"])
-        SQUID_STATE_ROLLBACK(squid_ldap_mozilla)
-      ])
-    ])
-    AC_CHECK_HEADERS(ldap.h lber.h)
-    AC_CHECK_HEADERS(mozldap/ldap.h)
-    SQUID_CHECK_LDAP_API
+    PKG_CHECK_MODULES([LIBLDAP],[ldap],[
+      AC_CHECK_HEADERS(ldap.h lber.h)
+      SQUID_CHECK_LDAP_API
+    ],[:])
+    SQUID_STATE_ROLLBACK(squid_ldap_state)
   ])
 ])
 

doc/manuals/manuals.pot

@@ -772,7 +772,7 @@ msgstr ""
 #: src/acl/external/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:80
 msgid ""
 "The SSL certificate database can be set via the environment variable "
-"SSL_CERTDBPATH (default /etc/certs) (Sun and Mozilla LDAP SDK)."
+"SSL_CERTDBPATH (default /etc/certs) (Sun LDAP SDK)."
 msgstr ""
 
 #. type: Plain text

doc/release-notes/release-7.sgml.in

@@ -205,7 +205,10 @@ This section gives an account of those changes in three categories:
 <sect1>Changes to existing options<label id="modifiedoptions">
 <p>
 <descrip>
-	<p>No changed options in this version.
+	<tag>--with-ldap</tag>
+	<p>Removed special support for outdated Mozilla LDAP SDK.
+	   <em>--with-ldap=/path/to/sdk CPPFLAGS="-I/path/to/sdk/mozldap"</em>
+	   can be used if needed.
 
 </descrip>
 </p>

src/acl/external/LDAP_group/required.m4

@@ -5,4 +5,6 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_CHECK_HEADERS([ldap.h winldap.h],[BUILD_HELPER="LDAP_group"])
+AS_IF([test "x$squid_cv_LDAP" != "x"],[
+    AC_CHECK_HEADERS([ldap.h winldap.h],[BUILD_HELPER="LDAP_group"])
+])

src/acl/external/eDirectory_userip/required.m4

@@ -5,4 +5,6 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_CHECK_HEADERS([ldap.h winldap.h],[BUILD_HELPER="eDirectory_userip"])
+AS_IF([test "x$squid_cv_LDAP" != "x"],[
+    AC_CHECK_HEADERS([ldap.h winldap.h],[BUILD_HELPER="eDirectory_userip"])
+])

src/acl/external/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8

@@ -76,7 +76,7 @@ Use SSL for the LDAP connection.
 .IP
 The CA certificate file can be set via the environment variable TLS_CACERTFILE (default /etc/ssl/certs/cert.pem) (OpenLDAP).
 .IP
-The SSL certificate database can be set via the environment variable SSL_CERTDBPATH (default /etc/certs) (Sun and Mozilla LDAP SDK).
+The SSL certificate database can be set via the environment variable SSL_CERTDBPATH (default /etc/certs) (Sun LDAP SDK).
 .if !'po4a'hide' .TP 12
 .if !'po4a'hide' .B \-a
 Allow SSL without certificate verification.

src/acl/external/kerberos_ldap_group/required.m4

@@ -6,6 +6,15 @@
 ##
 
 AS_IF([test "x$LIBMIT_KRB5_LIBS" != "x" -o "x$LIBHEIMDAL_KRB5_LIBS" != "x" -o "x$LIBGSS_LIBS" != "x"],[
-  BUILD_HELPER="kerberos_ldap_group"
+  if test "x$with_apple_krb5" = "xyes" ; then
+    AC_CHECK_LIB(resolv, [main], [XTRA_LIBS="$XTRA_LIBS -lresolv"],[
+      AC_MSG_ERROR([library 'resolv' is required for Apple Kerberos])
+    ])
+  fi
   SQUID_CHECK_SASL
+  AC_CHECK_HEADERS([ldap.h winldap.h],[
+    AS_IF([test "x$squid_cv_check_sasl" = "xyes" -a "x$squid_cv_LDAP" != "x" ],[
+      BUILD_HELPER="kerberos_ldap_group"
+    ])
+  ])
 ])

src/acl/external/kerberos_ldap_group/support.h

@@ -51,9 +51,6 @@
 #if HAVE_LDAP_H
 #include <ldap.h>
 #endif
-#if HAVE_MOZLDAP_LDAP_H
-#include <mozldap/ldap.h>
-#endif
 
 struct gdstruct {
     char *group;

src/acl/external/kerberos_ldap_group/support_ldap.cc

@@ -82,7 +82,8 @@ size_t get_bin_attributes(LDAP * ld, LDAPMessage * res,
 int search_group_tree(struct main_args *margs, LDAP * ld, char *bindp,
                       char *ldap_group, char *group, int depth);
 
-#if HAVE_SUN_LDAP_SDK || HAVE_MOZILLA_LDAP_SDK
+#if HAVE_SUN_LDAP_SDK
+
 #if HAVE_LDAP_REBINDPROC_CALLBACK
 
 #if HAVE_SASL_H || HAVE_SASL_SASL_H || HAVE_SASL_DARWIN