From a76cb5c9b1c05ba21c805e65ae2fd8069334881f Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Tue, 24 Jul 2007 14:47:41 +0000 Subject: [PATCH] - fix parse confusion between attribute and attribute value. --- autofs-5.0.2-fix-dnattr-parse.patch | 13 +++++++++++++ autofs.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 autofs-5.0.2-fix-dnattr-parse.patch diff --git a/autofs-5.0.2-fix-dnattr-parse.patch b/autofs-5.0.2-fix-dnattr-parse.patch new file mode 100644 index 0000000..e7c70aa --- /dev/null +++ b/autofs-5.0.2-fix-dnattr-parse.patch @@ -0,0 +1,13 @@ +diff --git a/lib/master_tok.l b/lib/master_tok.l +index 9bfeefa..ff69a24 100644 +--- a/lib/master_tok.l ++++ b/lib/master_tok.l +@@ -272,7 +272,7 @@ OPTTOUT (-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS}) + return DNSERVER; + } + +- {DNATTRSTR} { ++ {DNATTRSTR}/"=" { + strcpy(master_lval.strtype, master_text); + return DNATTR; + } diff --git a/autofs.spec b/autofs.spec index ad7bd20..2b7f455 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.2 -Release: 7 +Release: 8 Epoch: 1 License: GPL Group: System Environment/Daemons @@ -18,6 +18,7 @@ Patch4: autofs-5.0.2-fix-offset-dir-create.patch Patch5: autofs-5.0.2-quote-exports.patch Patch6: autofs-5.0.2-hi-res-time.patch Patch7: autofs-5.0.2-quoted-slash-alone.patch +Patch8: autofs-5.0.2-fix-dnattr-parse.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 @@ -67,6 +68,7 @@ echo %{version}-%{release} > .version %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -119,6 +121,9 @@ fi %{_libdir}/autofs/ %changelog +* Tue Jul 24 2007 Ian Kent - 5.0.2-8 +- fix parse confusion between attribute and attribute value. + * Fri Jul 20 2007 Ian Kent - 5.0.2-7 - fix handling of quoted slash alone (bz 248943).