Skip to content

Commit 84407d5

Browse files
committed
Remove Mosilla LDAP SDK support
The Mozilla SDK has apparently not been maintained since 2017. Admin needing to use this SDK can build Squid with: --with-ldap=/path/to/sdk \ CPPFLAGS="-I/path/to/sdk/mozldap"
1 parent 44d4c0e commit 84407d5

File tree

7 files changed

+17
-20
lines changed

7 files changed

+17
-20
lines changed

acinclude/ldap.m4

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ AC_DEFUN([SQUID_LDAP_TEST],[
1212
LIBS="$LIBLDAP_PATH $LIBLDAP_LIBS $LIBPTHREADS"
1313
CPPFLAGS="-DLDAP_DEPRECATED=1 -DLDAP_REFERRALS $CPPFLAGS"
1414
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
15-
# if HAVE_LDAP_H
16-
# include <ldap.h>
17-
# elif HAVE_MOZLDAP_LDAP_H
18-
# include <mozldap/ldap.h>
19-
# endif
15+
#if HAVE_LDAP_H
16+
#include <ldap.h>
17+
#endif
2018
]],[[$2]])
2119
],[
2220
squid_cv_$1=1
@@ -37,12 +35,12 @@ AC_DEFUN([SQUID_LDAP_TEST_RUN],[
3735
LIBS="$LIBLDAP_PATH $LIBLDAP_LIBS $LIBPTHREADS"
3836
CPPFLAGS="-DLDAP_DEPRECATED=1 -DLDAP_REFERRALS $CPPFLAGS"
3937
AC_RUN_IFELSE([AC_LANG_PROGRAM([[
40-
# if HAVE_LDAP_H
41-
# include <ldap.h>
42-
# elif HAVE_MOZLDAP_LDAP_H
43-
# include <mozldap/ldap.h>
44-
# endif
45-
# include <string.h>
38+
#if HAVE_LDAP_H
39+
#include <ldap.h>
40+
#endif
41+
#if HAVE_STRING_H
42+
#include <string.h>
43+
#endif
4644
]],[[$2]])
4745
],[
4846
m4_translit([squid_cv_$1],[-+. ],[____])=1
@@ -61,7 +59,6 @@ dnl find the LDAP library vendor and define relevant HAVE_(vendor name) macro
6159
AC_DEFUN([SQUID_LDAP_CHECK_VENDOR],[
6260
SQUID_LDAP_TEST_RUN([OpenLDAP],[return strcmp(LDAP_VENDOR_NAME,"OpenLDAP")])
6361
SQUID_LDAP_TEST_RUN([Sun LDAP SDK],[return strcmp(LDAP_VENDOR_NAME,"Sun Microsystems Inc.")])
64-
SQUID_LDAP_TEST_RUN([Mozilla LDAP SDK],[return strcmp(LDAP_VENDOR_NAME,"mozilla.org")])
6562
])
6663

6764
dnl check whether the LDAP library(s) provide the needed API and types

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,6 @@ SQUID_CHECK_LIB_WORKS(ldap,[
14281428
LIBS="$LIBLDAP_PATH $LIBPTHREADS $LIBS"
14291429
PKG_CHECK_MODULES([LIBLDAP],[ldap],[
14301430
AC_CHECK_HEADERS(ldap.h lber.h)
1431-
AC_CHECK_HEADERS(mozldap/ldap.h)
14321431
SQUID_CHECK_LDAP_API
14331432
],[:])
14341433
SQUID_STATE_ROLLBACK(squid_ldap_state)

doc/manuals/manuals.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ msgstr ""
772772
#: src/acl/external/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8:80
773773
msgid ""
774774
"The SSL certificate database can be set via the environment variable "
775-
"SSL_CERTDBPATH (default /etc/certs) (Sun and Mozilla LDAP SDK)."
775+
"SSL_CERTDBPATH (default /etc/certs) (Sun LDAP SDK)."
776776
msgstr ""
777777

778778
#. type: Plain text

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,10 @@ This section gives an account of those changes in three categories:
205205
<sect1>Changes to existing options<label id="modifiedoptions">
206206
<p>
207207
<descrip>
208-
<p>No changed options in this version.
208+
<tag>--with-ldap</tag>
209+
<p>Removed special support for outdated Mozilla LDAP SDK.
210+
<em>--with-ldap=/path/to/sdk CPPFLAGS="-I/path/to/sdk/mozldap"</em>
211+
can be used if needed.
209212

210213
</descrip>
211214
</p>

src/acl/external/kerberos_ldap_group/ext_kerberos_ldap_group_acl.8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Use SSL for the LDAP connection.
7676
.IP
7777
The CA certificate file can be set via the environment variable TLS_CACERTFILE (default /etc/ssl/certs/cert.pem) (OpenLDAP).
7878
.IP
79-
The SSL certificate database can be set via the environment variable SSL_CERTDBPATH (default /etc/certs) (Sun and Mozilla LDAP SDK).
79+
The SSL certificate database can be set via the environment variable SSL_CERTDBPATH (default /etc/certs) (Sun LDAP SDK).
8080
.if !'po4a'hide' .TP 12
8181
.if !'po4a'hide' .B \-a
8282
Allow SSL without certificate verification.

src/acl/external/kerberos_ldap_group/support.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@
5151
#if HAVE_LDAP_H
5252
#include <ldap.h>
5353
#endif
54-
#if HAVE_MOZLDAP_LDAP_H
55-
#include <mozldap/ldap.h>
56-
#endif
5754

5855
struct gdstruct {
5956
char *group;

src/acl/external/kerberos_ldap_group/support_ldap.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ size_t get_bin_attributes(LDAP * ld, LDAPMessage * res,
8282
int search_group_tree(struct main_args *margs, LDAP * ld, char *bindp,
8383
char *ldap_group, char *group, int depth);
8484

85-
#if HAVE_SUN_LDAP_SDK || HAVE_MOZILLA_LDAP_SDK
85+
#if HAVE_SUN_LDAP_SDK
86+
8687
#if HAVE_LDAP_REBINDPROC_CALLBACK
8788

8889
#if HAVE_SASL_H || HAVE_SASL_SASL_H || HAVE_SASL_DARWIN

0 commit comments

Comments
 (0)