rpms/autofs/F-7 autofs-5.0.2-quoted-slash-alone.patch, NONE, 1.1 autofs.spec, 1.209, 1.210

[Ian Kent (iankent)]

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1318

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.2-quoted-slash-alone.patch 
Log Message:
* Fri Jul 20 2007 Ian Kent <ikent at redhat.com> - 5.0.1-20
- fix handling of quoted slash alone (bz 248943).


autofs-5.0.2-quoted-slash-alone.patch:

--- NEW FILE autofs-5.0.2-quoted-slash-alone.patch ---
diff --git a/lib/parse_subs.c b/lib/parse_subs.c
index ad19f34..3627f44 100644
--- a/lib/parse_subs.c
+++ b/lib/parse_subs.c
@@ -297,7 +297,8 @@ char *sanitize_path(const char *path, int origlen, unsigned int type, unsigned i
 		return NULL;
 	}
 
-	if (origlen > 1 && *(cp - 1) == '/')
+	/* Remove trailing / but watch out for a quoted / alone */
+	if (strlen(cp) > 1 && origlen > 1 && *(cp - 1) == '/')
 		*(cp - 1) = '\0';
 
 	return s_path;


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-7/autofs.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- autofs.spec	18 Jul 2007 11:54:23 -0000	1.209
+++ autofs.spec	20 Jul 2007 15:32:22 -0000	1.210
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.1
-Release: 19
+Release: 20
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -33,6 +33,7 @@
 Patch21: autofs-5.0.1-fix-offset-dir-create.patch
 Patch22: autofs-5.0.2-quote-exports.patch
 Patch23: autofs-5.0.1-hi-res-time.patch
+Patch24: autofs-5.0.2-quoted-slash-alone.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
 Conflicts: kernel < 2.6.17
@@ -97,6 +98,7 @@
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -149,6 +151,9 @@
 %{_libdir}/autofs/
 
 %changelog
+* Fri Jul 20 2007 Ian Kent <ikent at redhat.com> - 5.0.1-20
+- fix handling of quoted slash alone (bz 248943).
+
 * Wed Jul 18 2007 Ian Kent <ikent at redhat.com> - 5.0.1-19
 - fix wait time resolution in alarm and state queue handlers (bz 247711).