rpms/autofs/devel autofs-5.0.1-rc2-include-check-full-path.patch, NONE, 1.1 autofs.spec, 1.145, 1.146

[fedora-cvs-commits at redhat.com]

Author: ikent

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

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc2-include-check-full-path.patch 
Log Message:
* Sun Sep 17 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.3
- fix include check full patch for file map of same name.


autofs-5.0.1-rc2-include-check-full-path.patch:
 lookup_file.c |   13 +++++++++++++
 1 files changed, 13 insertions(+)

--- NEW FILE autofs-5.0.1-rc2-include-check-full-path.patch ---
diff --git a/modules/lookup_file.c b/modules/lookup_file.c
index 1bfdeed..c20c976 100644
--- a/modules/lookup_file.c
+++ b/modules/lookup_file.c
@@ -310,6 +310,19 @@ static int check_master_self_include(str
 {
 	char *m_path, *m_base, *i_path, *i_base;
 
+	/*
+	 * If we are including a file map then check the
+	 * full path of the map.
+	 */
+	if (*master->name == '/') {
+		if (!strcmp(master->name, ctxt->mapname))
+			return 1;
+		else
+			return 0;
+	}
+
+	/* Otherwise only check the map name itself. */
+
 	i_path = strdup(ctxt->mapname);
 	if (!i_path)
 		return 0;


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- autofs.spec	13 Sep 2006 08:25:46 -0000	1.145
+++ autofs.spec	17 Sep 2006 06:03:22 -0000	1.146
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc2.2
+%define release 0.rc2.3
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -12,6 +12,7 @@
 Group: System Environment/Daemons
 Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}-rc2.tar.bz2
 Patch0: autofs-5.0.1-rc2-handle-autofs-options.patch
+Patch1: autofs-5.0.1-rc2-include-check-full-path.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -52,6 +53,7 @@
 %setup -q
 echo %{version}-%{release} > .version
 %patch0 -p1
+%patch1 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -108,6 +110,9 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Sun Sep 17 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.3
+- fix include check full patch for file map of same name.
+
 * Wed Sep 13 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.2
 - fix handling of autofs specific mount options (bz 199777).