Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package autofs for openSUSE:Factory checked
in at 2022-01-21 01:25:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autofs (Old)
and /work/SRC/openSUSE:Factory/.autofs.new.1938 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autofs"
Fri Jan 21 01:25:12 2022 rev:126 rq:947439 version:5.1.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/autofs/autofs.changes 2021-09-17
23:25:42.401223078 +0200
+++ /work/SRC/openSUSE:Factory/.autofs.new.1938/autofs.changes 2022-01-21
01:25:32.270538790 +0100
@@ -1,0 +2,99 @@
+Tue Jan 4 22:03:02 UTC 2022 - Dirk M??ller <dmuel...@suse.com>
+
+- update to 5.1.8:
+ * add xdr_exports().
+ * remove mount.x and rpcgen dependencies.
+ * dont use realloc in host exports list processing.
+ * use sprintf() when constructing hosts mapent.
+ * fix mnts_remove_amdmount() uses wrong list.
+ * Fix option for master read wait.
+ * eliminate cache_lookup_offset() usage.
+ * fix is mounted check on non existent path.
+ * simplify cache_get_parent().
+ * set offset parent in update_offset_entry().
+ * remove redundant variables from mount_autofs_offset().
+ * remove unused parameter form do_mount_autofs_offset().
+ * refactor umount_multi_triggers().
+ * eliminate clean_stale_multi_triggers().
+ * simplify mount_subtree() mount check.
+ * fix mnts_get_expire_list() expire list construction.
+ * fix inconsistent locking in umount_subtree_mounts().
+ * fix return from umount_subtree_mounts() on offset list delete.
+ * pass mapent_cache to update_offset_entry().
+ * fix inconsistent locking in parse_mount().
+ * remove unused mount offset list lock functions.
+ * eliminate count_mounts() from expire_proc_indirect().
+ * eliminate some strlen calls in offset handling.
+ * don't add offset mounts to mounted mounts table.
+ * reduce umount EBUSY check delay.
+ * cleanup cache_delete() a little.
+ * rename path to m_offset in update_offset_entry().
+ * don't pass root to do_mount_autofs_offset().
+ * rename tree implementation functions.
+ * add some multi-mount macros.
+ * remove unused functions cache_dump_multi() and cache_dump_cache().
+ * add a len field to struct autofs_point.
+ * make tree implementation data independent.
+ * add mapent tree implementation.
+ * add tree_mapent_add_node().
+ * add tree_mapent_delete_offsets().
+ * add tree_mapent_traverse_subtree().
+ * fix mount_fullpath().
+ * add tree_mapent_cleanup_offsets().
+ * add set_offset_tree_catatonic().
+ * add mount and umount offsets functions.
+ * switch to use tree implementation for offsets.
+ * remove obsolete functions.
+ * remove redundant local var from sun_mount().
+ * use mount_fullpath() in one spot in parse_mount().
+ * pass root length to mount_fullpath().
+ * remove unused function master_submount_list_empty().
+ * move amd mounts removal into lib/mounts.c.
+ * check for offset with no mount location.
+ * remove mounts_mutex.
+ * remove unused variable from get_exports().
+ * add missing free in handle_mounts().
+ * remove redundant if check.
+ * fix possible memory leak in master_parse().
+ * fix possible memory leak in mnts_add_amdmount().
+ * fix double unlock in parse_mount().
+ * add length check in umount_subtree_mounts().
+ * fix flags check in umount_multi().
+ * dont try umount after stat() ENOENT fail.
+ * remove redundant assignment in master_add_amd_mount_section_mounts().
+ * fix dead code in mnts_add_mount().
+ * fix arg not used in error print.
+ * fix missing lock release in mount_subtree().
+ * fix double free in parse_mapent().
+ * refactor lookup_prune_one_cache() a bit.
+ * cater for empty mounts list in mnts_get_expire_list().
+ * add ext_mount_hash_mutex lock helpers.
+ * fix amd section mounts map reload.
+ * fix dandling symlink creation if nis support is not available.
+ * dont use AUTOFS_DEV_IOCTL_CLOSEMOUNT.
+ * fix lookup_prune_one_cache() refactoring change.
+ * fix amd hosts mount expire.
+ * fix offset entries order.
+ * use mapent tree root for tree_mapent_add_node().
+ * eliminate redundant cache lookup in tree_mapent_add_node().
+ * fix hosts map offset order.
+ * fix direct mount deadlock.
+ * add missing description of null map option.
+ * fix nonstrict offset mount fail handling.
+ * fix concat_options() error handling.
+ * eliminate some more alloca usage.
+ * use default stack size for threads.
+ * fix use of possibly NULL var in lookup_program.c:match_key().
+ * fix incorrect print format specifiers in get_pkt().
+ * add mapent path length check in handle_packet_expire_direct().
+ * add copy length check in umount_autofs_indirect().
+ * add some buffer length checks to master map parser.
+ * add buffer length check to rmdir_path().
+ * eliminate buffer usage from handle_mounts_cleanup().
+ * add buffer length checks to autofs mount_mount().
+ * make NFS version check flags consistent.
+ * refactor get_nfs_info().
+- drop autofs-5.1.7-Fix-option-for-master_read_wait.patch,
+ autofs-5.1.7-use-default-stack-size-for-threads.patch: upstream
+
+-------------------------------------------------------------------
Old:
----
autofs-5.1.7-Fix-option-for-master_read_wait.patch
autofs-5.1.7-use-default-stack-size-for-threads.patch
autofs-5.1.7.tar.sign
autofs-5.1.7.tar.xz
New:
----
autofs-5.1.8.tar.sign
autofs-5.1.8.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autofs.spec ++++++
--- /var/tmp/diff_new_pack.rTJxEv/_old 2022-01-21 01:25:33.034533552 +0100
+++ /var/tmp/diff_new_pack.rTJxEv/_new 2022-01-21 01:25:33.038533525 +0100
@@ -1,7 +1,7 @@
#
# spec file for package autofs
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,55 +18,25 @@
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
- %define _fillupdir /var/adm/fillup-templates
+ %define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
-
%if 0%{?suse_version} >= 1230
%define with_udisks 1
%else
%define with_udisks 0
%endif
-
%if 0%{?suse_version} >= 1230
%define with_sssd 1
%else
%define with_sssd 0
%endif
-
Name: autofs
-URL: http://www.kernel.org/pub/linux/daemons/autofs/v5/
-BuildRequires: autoconf
-BuildRequires: bison
-BuildRequires: cyrus-sasl-devel
-BuildRequires: dbus-1-devel
-BuildRequires: e2fsprogs
-BuildRequires: flex
-BuildRequires: krb5-devel
-BuildRequires: libnsl-devel
-BuildRequires: libopenssl-devel
-BuildRequires: libtirpc-devel
-BuildRequires: libxml2-devel
-BuildRequires: module-init-tools
-BuildRequires: nfs-client
-BuildRequires: openldap2-devel
-BuildRequires: pkg-config
-%if 0%{?suse_version} >= 1330
-BuildRequires: rpcgen
-%endif
-BuildRequires: xz
-%if %{with_sssd}
-BuildRequires: sssd
-%endif
-%if %{with_udisks}
-BuildRequires: pkgconfig(udisks2)
-%endif
-BuildRequires: pkgconfig(libsystemd)
-Version: 5.1.7
+Version: 5.1.8
Release: 0
Summary: A Kernel-Based Automounter
License: GPL-2.0-or-later
Group: System/Daemons
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+URL: https://www.kernel.org/pub/linux/daemons/autofs/v5/
Source:
https://www.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.xz
Source1: sysconfig.autofs
Source3: autofs.schema
@@ -89,13 +59,37 @@
Patch105: autofs-5-1-3-fix-unset-tsd-group-name-handling.patch
# bsc#1175238 - Use /usr/etc/nsswitch.conf if /etc/nsswitch.conf is not
available
Patch106: autofs-nsswitch-usr-etc.patch
-Patch107: autofs-5.1.7-Fix-option-for-master_read_wait.patch
-Patch108: autofs-5.1.7-use-default-stack-size-for-threads.patch
+BuildRequires: autoconf
+BuildRequires: bison
+BuildRequires: cyrus-sasl-devel
+BuildRequires: dbus-1-devel
+BuildRequires: e2fsprogs
+BuildRequires: flex
+BuildRequires: krb5-devel
+BuildRequires: libnsl-devel
+BuildRequires: libopenssl-devel
+BuildRequires: libtirpc-devel
+BuildRequires: libxml2-devel
+BuildRequires: module-init-tools
+BuildRequires: nfs-client
+BuildRequires: openldap2-devel
+BuildRequires: pkgconfig
+BuildRequires: systemd-rpm-macros
+BuildRequires: xz
+BuildRequires: pkgconfig(libsystemd)
Requires(pre): %fillup_prereq
Requires(pre): aaa_base
-BuildRequires: systemd-rpm-macros
-%{?systemd_ordering}
Recommends: nfs-client
+%{?systemd_ordering}
+%if 0%{?suse_version} >= 1330
+BuildRequires: rpcgen
+%endif
+%if %{with_sssd}
+BuildRequires: sssd
+%endif
+%if %{with_udisks}
+BuildRequires: pkgconfig(udisks2)
+%endif
%description
AutoFS is a kernel-based automounter for Linux. It automatically
@@ -115,8 +109,6 @@
%patch104 -p1
%patch105 -p1
%patch106 -p1
-%patch107 -p1
-%patch108 -p1
%build
autoreconf -fiv
@@ -124,7 +116,7 @@
SUSE_ASNEEDED=0
%configure %{_target_cpu}-suse-linux \
--libdir=%{_libdir} --mandir=%{_mandir} \
- --with-confdir=/etc/sysconfig \
+ --with-confdir=%{_sysconfdir}/sysconfig \
--disable-mount-locking \
--enable-forced-shutdown \
--enable-ignore-busy \
@@ -132,7 +124,7 @@
--with-libtirpc \
--with-hesiod=no \
--with-sasl
-make all DONTSTRIP=1 LOCAL_CFLAGS="%{optflags} %(getconf LFS_CFLAGS)" \
+%make_build all DONTSTRIP=1 LOCAL_CFLAGS="%{optflags} %(getconf LFS_CFLAGS)" \
%{?_smp_mflags}
%install
@@ -141,7 +133,7 @@
install -D -m 644 %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.autofs
install -D -m 755 %{SOURCE7}
%{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/autofs
ln -s %{_mandir}/man8/autofs.8.gz %{buildroot}/%{_mandir}/man8/rcautofs.8.gz
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcautofs
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcautofs
%if %{with_udisks}
install -D -m 644 %{SOURCE42}
%{buildroot}%{_sysconfdir}/dbus-1/system.d/org.freedesktop.AutoMount.conf
%endif
@@ -153,18 +145,17 @@
%post
%service_add_post %{name}.service
-%{fillup_only}
+%fillup_only
%preun
%{stop_on_removal autofs}
%service_del_preun %{name}.service
-%{fillup_only}
+%fillup_only
%postun
%service_del_postun %{name}.service
%files
-%defattr (-, root, root)
%license COPYRIGHT
%{_fillupdir}/sysconfig.autofs
%config(noreplace) %{_sysconfdir}/autofs.conf
++++++ autofs-5-1-3-fix-unset-tsd-group-name-handling.patch ++++++
--- /var/tmp/diff_new_pack.rTJxEv/_old 2022-01-21 01:25:33.094533141 +0100
+++ /var/tmp/diff_new_pack.rTJxEv/_new 2022-01-21 01:25:33.098533113 +0100
@@ -21,8 +21,10 @@
lib/mounts.c | 1 +
2 files changed, 6 insertions(+), 3 deletions(-)
---- a/lib/macros.c
-+++ b/lib/macros.c
+Index: autofs-5.1.8/lib/macros.c
+===================================================================
+--- autofs-5.1.8.orig/lib/macros.c
++++ autofs-5.1.8/lib/macros.c
@@ -186,15 +186,17 @@ int macro_global_addvar(const char *str,
}
@@ -52,9 +54,11 @@
if (!val) {
free(def);
goto done;
---- a/lib/mounts.c
-+++ b/lib/mounts.c
-@@ -1475,6 +1475,7 @@ void set_tsd_user_vars(unsigned int logo
+Index: autofs-5.1.8/lib/mounts.c
+===================================================================
+--- autofs-5.1.8.orig/lib/mounts.c
++++ autofs-5.1.8/lib/mounts.c
+@@ -2384,6 +2384,7 @@ void set_tsd_user_vars(unsigned int logo
error(logopt, "failed to get buffer size for getpwuid_r");
goto free_tsv;
}
++++++ autofs-5.1.1-dbus-udisks-monitor.patch ++++++
--- /var/tmp/diff_new_pack.rTJxEv/_old 2022-01-21 01:25:33.110533031 +0100
+++ /var/tmp/diff_new_pack.rTJxEv/_new 2022-01-21 01:25:33.110533031 +0100
@@ -12,9 +12,11 @@
samples/autofs.udisks | 28
11 files changed, 3004 insertions(+), 1 deletion(-)
---- a/Makefile.conf.in
-+++ b/Makefile.conf.in
-@@ -46,6 +46,9 @@
+Index: autofs-5.1.8/Makefile.conf.in
+===================================================================
+--- autofs-5.1.8.orig/Makefile.conf.in
++++ autofs-5.1.8/Makefile.conf.in
+@@ -46,6 +46,9 @@ KRB5_FLAGS=@KRB5_FLAGS@
# NIS+ support: yes (1) no (0)
NISPLUS = @HAVE_NISPLUS@
@@ -24,9 +26,11 @@
# SMBFS support: yes (1) no (0)
SMBFS = @HAVE_SMBMOUNT@
---- a/daemon/lookup.c
-+++ b/daemon/lookup.c
-@@ -198,6 +198,10 @@
+Index: autofs-5.1.8/daemon/lookup.c
+===================================================================
+--- autofs-5.1.8.orig/daemon/lookup.c
++++ autofs-5.1.8/daemon/lookup.c
+@@ -198,6 +198,10 @@ int lookup_nss_read_master(struct master
(name[3] == ',' || name[3] == ':')) ||
(!strncmp(name, "nisplus", 7) &&
(name[7] == ',' || name[7] == ':')) ||
@@ -37,9 +41,11 @@
(!strncmp(name, "ldap", 4) &&
(name[4] == ',' || name[4] == ':')) ||
(!strncmp(name, "ldaps", 5) &&
---- a/daemon/master_tok.l
-+++ b/daemon/master_tok.l
-@@ -120,7 +120,7 @@
+Index: autofs-5.1.8/daemon/master_tok.l
+===================================================================
+--- autofs-5.1.8.orig/daemon/master_tok.l
++++ autofs-5.1.8/daemon/master_tok.l
+@@ -123,7 +123,7 @@ DNNAMESTR2 ([[:alnum:]_.\-]+)
INTMAP (-hosts|-null)
MULTI ((multi)(,(sun|hesiod))?(:{OPTWS}|{WS}))
MULTISEP ([\-]{2}[[:blank:]]+)
@@ -48,8 +54,10 @@
OPTTOUT
(-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS})
+Index: autofs-5.1.8/include/lookup_udisks.h
+===================================================================
--- /dev/null
-+++ b/include/lookup_udisks.h
++++ autofs-5.1.8/include/lookup_udisks.h
@@ -0,0 +1,381 @@
+/*
+ * loopup_udisks.h - Header file for lookup_udisks automount module
@@ -432,9 +440,11 @@
+} cnfxml_t;
+
+#endif
---- a/lib/parse_subs.c
-+++ b/lib/parse_subs.c
-@@ -98,6 +98,8 @@
+Index: autofs-5.1.8/lib/parse_subs.c
+===================================================================
+--- autofs-5.1.8.orig/lib/parse_subs.c
++++ autofs-5.1.8/lib/parse_subs.c
+@@ -98,6 +98,8 @@ static struct types map_type[] = {
{ "yp", 2 },
{ "nis", 3 },
{ "nisplus", 7 },
@@ -443,8 +453,10 @@
{ "ldap", 4 },
{ "ldaps", 5 },
{ "hesiod", 6 },
+Index: autofs-5.1.8/man/autofs.udisks.5.in
+===================================================================
--- /dev/null
-+++ b/man/autofs.udisks.5.in
++++ autofs-5.1.8/man/autofs.udisks.5.in
@@ -0,0 +1,121 @@
+.\" t
+.TH AUTOFS.UDISKS 5 "22 Aug 2012"
@@ -567,9 +579,11 @@
+.BR udisks\-daemon (8)
+.SH AUTHOR
+This manual page was written by Werner Fink <wer...@suse.com>.
---- a/modules/Makefile
-+++ b/modules/Makefile
-@@ -62,6 +62,14 @@
+Index: autofs-5.1.8/modules/Makefile
+===================================================================
+--- autofs-5.1.8.orig/modules/Makefile
++++ autofs-5.1.8/modules/Makefile
+@@ -62,6 +62,14 @@ ifeq ($(SSSD), 1)
MODS += lookup_sss.so
endif
@@ -584,7 +598,7 @@
CFLAGS += -I../include -I../lib -fPIC -D_GNU_SOURCE
CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\"
CFLAGS += -DAUTOFS_MAP_DIR=\"$(autofsmapdir)\"
-@@ -143,6 +151,10 @@
+@@ -145,6 +153,10 @@ lookup_ldap.so: lookup_ldap.c dclist.o b
$(LDFLAGS) $(LIBLDAP) $(LIBRESOLV) $(LIBS) $(AUTOFS_LIB_LINK)
$(STRIP) lookup_ldap.so
@@ -595,9 +609,11 @@
mount_nfs.so: mount_nfs.c replicated.o
$(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
mount_nfs.c replicated.o $(LDFLAGS) $(LIBS) $(AUTOFS_LIB_LINK)
---- a/modules/lookup_multi.c
-+++ b/modules/lookup_multi.c
-@@ -189,6 +189,8 @@
+Index: autofs-5.1.8/modules/lookup_multi.c
+===================================================================
+--- autofs-5.1.8.orig/modules/lookup_multi.c
++++ autofs-5.1.8/modules/lookup_multi.c
+@@ -189,6 +189,8 @@ static struct lookup_mod *nss_open_looku
if (!strncmp(argv[0], "file", 4) ||
!strncmp(argv[0], "yp", 2) ||
!strncmp(argv[0], "nisplus", 7) ||
@@ -606,9 +622,11 @@
!strncmp(argv[0], "nis", 3) ||
!strncmp(argv[0], "ldaps", 5) ||
!strncmp(argv[0], "ldap", 4) ||
+Index: autofs-5.1.8/modules/lookup_udisks.c
+===================================================================
--- /dev/null
-+++ b/modules/lookup_udisks.c
-@@ -0,0 +1,2449 @@
++++ autofs-5.1.8/modules/lookup_udisks.c
+@@ -0,0 +1,2446 @@
+/*
+ * lookup_udisks.c - Module for Linux automount to access removable devices
+ * listed by the dbus based udisks-daemon
@@ -2976,10 +2994,7 @@
+
+ cache_readlock(mc);
+ me = cache_lookup_distinct(mc, key);
-+ if (me && me->multi)
-+ lkp_key = strdup(me->multi->key);
-+ else
-+ lkp_key = strdup(key);
++ lkp_key = strdup(key);
+ cache_unlock(mc);
+
+ if (!lkp_key)
@@ -3058,9 +3073,11 @@
+out:
+ return ret;
+}
---- a/modules/parse_sun.c
-+++ b/modules/parse_sun.c
-@@ -901,6 +901,7 @@
+Index: autofs-5.1.8/modules/parse_sun.c
+===================================================================
+--- autofs-5.1.8.orig/modules/parse_sun.c
++++ autofs-5.1.8/modules/parse_sun.c
+@@ -947,6 +947,7 @@ static int validate_location(unsigned in
((esc = strchr(ptr, '\\')) && *(esc + 1) == ':') ||
!strncmp(ptr, "file:", 5) || !strncmp(ptr, "yp:", 3) ||
!strncmp(ptr, "nis:", 4) || !strncmp(ptr, "nisplus:", 8) ||
@@ -3068,8 +3085,10 @@
!strncmp(ptr, "ldap:", 5) || !strncmp(ptr, "ldaps:", 6) ||
!strncmp(ptr, "sss:", 4) || !strncmp(ptr, "dir:", 4))
return 1;
+Index: autofs-5.1.8/samples/autofs.udisks
+===================================================================
--- /dev/null
-+++ b/samples/autofs.udisks
++++ autofs-5.1.8/samples/autofs.udisks
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<!--
++++++ autofs-5.1.1-debuginfo-fix.patch ++++++
--- /var/tmp/diff_new_pack.rTJxEv/_old 2022-01-21 01:25:33.122532949 +0100
+++ /var/tmp/diff_new_pack.rTJxEv/_new 2022-01-21 01:25:33.126532921 +0100
@@ -2,11 +2,11 @@
Makefile.rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: autofs-5.1.1/Makefile.rules
+Index: autofs-5.1.8/Makefile.rules
===================================================================
---- autofs-5.1.1.orig/Makefile.rules
-+++ autofs-5.1.1/Makefile.rules
-@@ -27,7 +27,7 @@ CFLAGS ?= -g -Wall -DDEBUG
+--- autofs-5.1.8.orig/Makefile.rules
++++ autofs-5.1.8/Makefile.rules
+@@ -32,7 +32,7 @@ CFLAGS ?= -g -Wall -DDEBUG
LDFLAGS ?= -g
else
CFLAGS ?= -O2 -Wall
++++++ autofs-5.1.7.tar.xz -> autofs-5.1.8.tar.xz ++++++
++++ 6423 lines of diff (skipped)
++++++ autofs-use-libldap_r-instead-of-libldap-for-thread-safety.patch ++++++
--- /var/tmp/diff_new_pack.rTJxEv/_old 2022-01-21 01:25:33.294531770 +0100
+++ /var/tmp/diff_new_pack.rTJxEv/_new 2022-01-21 01:25:33.294531770 +0100
@@ -27,9 +27,11 @@
configure.in | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -344,11 +344,11 @@ dnl
+Index: autofs-5.1.8/aclocal.m4
+===================================================================
+--- autofs-5.1.8.orig/aclocal.m4
++++ autofs-5.1.8/aclocal.m4
+@@ -328,11 +328,11 @@ dnl
dnl Check for function ldap_create_page_control
dnl --------------------------------------------------------------------------
AC_DEFUN([AF_CHECK_FUNC_LDAP_CREATE_PAGE_CONTROL],
@@ -43,7 +45,7 @@
AC_TRY_LINK(
[ #include <ldap.h> ],
-@@ -377,11 +377,11 @@ dnl
+@@ -361,11 +361,11 @@ dnl
dnl Check for function ldap_parse_page_control
dnl --------------------------------------------------------------------------
AC_DEFUN([AF_CHECK_FUNC_LDAP_PARSE_PAGE_CONTROL],
@@ -57,9 +59,11 @@
AC_TRY_LINK(
[ #include <ldap.h> ],
---- a/configure.in
-+++ b/configure.in
-@@ -259,7 +259,7 @@ AC_ARG_WITH(openldap,
+Index: autofs-5.1.8/configure.in
+===================================================================
+--- autofs-5.1.8.orig/configure.in
++++ autofs-5.1.8/configure.in
+@@ -298,7 +298,7 @@ AC_ARG_WITH(openldap,
if test -z "$HAVE_LDAP" -o "$HAVE_LDAP" != "0"; then
HAVE_LDAP=0
LDAP_FLAGS="$LDAP_FLAGS -DLDAP_DEPRECATED=1"
@@ -69,4 +73,3 @@
if test "$HAVE_LDAP" = "1"; then
AC_DEFINE(WITH_LDAP,1,
-
