rpms/autofs/FC-6 autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch, NONE, 1.1 autofs.spec, 1.160, 1.161

[fedora-cvs-commits at redhat.com]

Author: ikent

Update of /cvs/dist/rpms/autofs/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv12830

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch 
Log Message:
* Wed Dec 6 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.31
- remove ability to use multiple indirect mount entries in master
  map (bz 218616).
- Resolves: rhbz#218616


autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch:
 CHANGELOG          |    1 +
 lib/master_parse.y |    7 +++++++
 2 files changed, 8 insertions(+)

--- NEW FILE autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index f5f9efb..1d12402 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -44,6 +44,7 @@
 - alter nfs4 host probing to not use portmap lookup and add options
   check for "port=" parameter.
 - correct semantics of "-null" map handling.
+- remove ability to use multiple indirect mount entries in master map.
 
 1/9/2006 autofs-5.0.1 rc2
 -------------------------
diff --git a/lib/master_parse.y b/lib/master_parse.y
index e0af295..0fa639c 100644
--- a/lib/master_parse.y
+++ b/lib/master_parse.y
@@ -565,6 +565,13 @@ int master_parse_entry(const char *buffe
 			return 0;
 		}
 		entry = new;
+	} else {
+		if (strcmp(path, "/-")) {
+			warn(LOGOPT_VERBOSE,
+			     "ignoring duplicate indirect mount %s", path);
+			local_free_vars();
+			return 0;
+		}
 	}
 
 	if (!entry->ap) {


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/FC-6/autofs.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- autofs.spec	6 Dec 2006 22:38:15 -0000	1.160
+++ autofs.spec	7 Dec 2006 04:31:06 -0000	1.161
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc2.28.1
+%define release 0.rc2.31
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -52,6 +52,7 @@
 Patch38: autofs-5.0.1-rc2-use-task-done.patch
 Patch39: autofs-5.0.1-rc2-nfs4-get-port.patch
 Patch40: autofs-5.0.1-rc2-fix-null-map-semantics.patch
+Patch41: autofs-5.0.1-rc2-disallow-multiple-indirect-mounts.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -132,6 +133,7 @@
 %patch38 -p1
 %patch39 -p1
 %patch40 -p1
+%patch41 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -188,6 +190,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Wed Dec 6 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.31
+- remove ability to use multiple indirect mount entries in master
+  map (bz 218616).
+
 * Wed Dec 6 2006 Jesse Keating <jkeating at redhat.com> - 5.0.1-0.rc2.28.1
 - Rebuild due to buildsystem failure