From c513d330835388bf647f5589bfb281f09e1574dd Mon Sep 17 00:00:00 2001
From: Ian Kent <iankent@fedoraproject.org>
Date: Oct 16 2009 06:46:42 +0000
Subject: - fix stale initialization for file map instance (bz510025).


---

diff --git a/autofs-5.0.5-fix-stale-init-for-file-map-instance.patch b/autofs-5.0.5-fix-stale-init-for-file-map-instance.patch
new file mode 100644
index 0000000..702f395
--- /dev/null
+++ b/autofs-5.0.5-fix-stale-init-for-file-map-instance.patch
@@ -0,0 +1,24 @@
+autofs-5.0.5 - fix stale initialization for file map instance
+
+From: Ian Kent <raven@themaw.net>
+
+Somehow, during the changes to minimize reading of file maps, an error
+of not initializing a field of the map source instance structure got
+through undetected. This has the effect of preventing all file map
+lookups, following the first one, to fail.
+---
+
+ daemon/lookup.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+
+--- autofs-5.0.4.orig/daemon/lookup.c
++++ autofs-5.0.4/daemon/lookup.c
+@@ -398,6 +398,7 @@ static enum nsswitch_status read_map_sou
+ 	tmap.instance = map->instance;
+ 	tmap.recurse = map->recurse;
+ 	tmap.depth = map->depth;
++	tmap.stale = map->stale;
+ 	tmap.argc = 0;
+ 	tmap.argv = NULL;
+ 
diff --git a/autofs.spec b/autofs.spec
index 1b25a80..3e6d006 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.4
-Release: 40
+Release: 42
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -76,6 +76,7 @@ Patch63: autofs-5.0.4-fix-libxml2-non-thread-safe-calls.patch
 Patch64: autofs-5.0.4-fix-direct-map-cache-locking.patch
 Patch65: autofs-5.0.4-fix-dont-umount-existing-direct-mount-on-reread.patch
 Patch66: autofs-5.0.4-special-case-cifs-escapes.patch
+Patch67: autofs-5.0.5-fix-stale-init-for-file-map-instance.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel module-init-tools util-linux nfs-utils e2fsprogs libtirpc-devel
 Requires: kernel >= 2.6.17
@@ -183,6 +184,7 @@ echo %{version}-%{release} > .version
 %patch64 -p1
 %patch65 -p1
 %patch66 -p1
+%patch67 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -235,6 +237,9 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Fri Oct 16 2009 Ian Kent <ikent@redhat.com> - 1:5.0.4-42
+- fix stale initialization for file map instance (bz510025).
+
 * Wed Sep 10 2009 Ian Kent <ikent@redhat.com> - 1:5.0.4-40
 - special case cifs mount location escaping (bz522109).