---
CHANGELOG | 5 +++++
configure.in | 1 +
samples/Makefile | 2 +-
3 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 467e90a..9dd8185 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+17/6/2010 autofs-4.1.4 - bryder p38
+---------------------------
+Added LDAP patch to stop the autofs-ldap-auto-master and lookup_ldap.so from
crashing on modern ldap libraries.
+It sets the LDAP_DEPRECATED macro to 1. Obviously the ldap stuff needs some
updating.
+
16/6/2010 autofs-4.1.4 - bryder p37
-------------------------
Moved the autofs-4.1.3 version of the dump map patch to 4.1.4 (without the
lookup_files hack)
diff --git a/configure.in b/configure.in
index eb56ac7..623e92b 100644
--- a/configure.in
+++ b/configure.in
@@ -118,6 +118,7 @@ AC_ARG_WITH(openldap,
)
if test -z "$HAVE_LDAP"; then
HAVE_LDAP=0
+ LDAP_FLAGS="$LDAP_FLAGS -DLDAP_DEPRECATED=1"
AC_CHECK_LIB(ldap, ldap_init, HAVE_LDAP=1 LIBLDAP="$LIBLDAP -lldap
-llber -lresolv", ,
-llber -lresolv $LIBS)
fi
diff --git a/samples/Makefile b/samples/Makefile
index d69d6e7..f5aa2ba 100644
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -16,7 +16,7 @@ LIBS = -lldap -llber
all: $(BINS) rc.autofs
autofs-ldap-auto-master: $(OBJS)
- $(CC) $(LDFLAGS) -o autofs-ldap-auto-master $(OBJS) $(LIBS)
+ $(CC) $(LDFLAGS) $(LDAP_FLAGS) -o autofs-ldap-auto-master $(OBJS)
$(LIBS)
$(STRIP) autofs-ldap-auto-master
rc.autofs: rc.autofs.in
--
1.7.3.3
_______________________________________________
autofs mailing list
autofs@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/autofs
