rpms/autofs/F-12 autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute-fix.patch, NONE, 1.1 autofs.spec, 1.298, 1.299

[Ian Kent]

Author: iankent

Update of /cvs/pkgs/rpms/autofs/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv893

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute-fix.patch 
Log Message:
* Tue Mar 23 2010 Ian Kent <kpnt at redhat.com> - 1:5.0.5-23
- add locality as valid ldap master map attribute fix.


autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute-fix.patch:
 CHANGELOG        |    1 +
 lib/master_tok.l |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute-fix.patch ---
autofs-5.0.5 - add locality as valid ldap master map attribute fix

From: Ian Kent <raven at themaw.net>

A recent change enabled the use of the locality ("l") attribute in map name
dns used in the master map.

When using an entry like:
/mp yp:lnxhome

the l following the ":" would match a dn patern in the tokenizer leading
to a syntax error. This has exposed a bug present for some time as, for
the map entry syntax above, this could also happen if the map name started
with another attribute, such as "cn" or "o".
---

 CHANGELOG        |    1 +
 lib/master_tok.l |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


--- autofs-5.0.5.orig/CHANGELOG
+++ autofs-5.0.5/CHANGELOG
@@ -26,6 +26,7 @@
 - fix get query dn failure.
 - fix ampersand escape in auto.smb.
 - add locality as valid ldap master map attribute.
+- add locality as valid ldap master map attribute fix.
 
 03/09/2009 autofs-5.0.5
 -----------------------
--- autofs-5.0.5.orig/lib/master_tok.l
+++ autofs-5.0.5/lib/master_tok.l
@@ -210,7 +210,7 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--
 	}
 
 	{MTYPE} |
-	{MTYPE}/{DNSERVERSTR}{DNATTRSTR} |
+	{MTYPE}/{DNSERVERSTR}{DNATTRSTR}= |
 	{MTYPE}/{DNATTRSTR}= {
 		tlen = master_leng - 1;
 		if (bptr != buff && isblank(master_text[tlen])) {
@@ -250,7 +250,7 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--
 		yyless(0);
 	}
 
-	{DNSERVERSTR}{DNATTRSTR} {
+	{DNSERVERSTR}{DNATTRSTR}= {
 		BEGIN(DNSTR);
 		yyless(0);
 	}


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/F-12/autofs.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- autofs.spec	17 Mar 2010 05:52:39 -0000	1.298
+++ autofs.spec	23 Mar 2010 03:30:38 -0000	1.299
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.5
-Release: 22%{?dist}
+Release: 23%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -36,6 +36,7 @@ Patch23: autofs-5.0.5-add-sasl-mutex-cal
 Patch24: autofs-5.0.5-fix-get-qdn-fail.patch
 Patch25: autofs-5.0.5-fix-ampersand-escape-in-auto-smb.patch
 Patch26: autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute.patch
+Patch27: autofs-5.0.5-add-locality-as-valid-ldap-master-map-attribute-fix.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
 Conflicts: cyrus-sasl-lib < 2.1.23-6
@@ -104,6 +105,7 @@ echo %{version}-%{release} > .version
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -156,6 +158,9 @@ fi
 %{_libdir}/autofs/
 
 %changelog
+* Tue Mar 23 2010 Ian Kent <kpnt at redhat.com> - 1:5.0.5-23
+- add locality as valid ldap master map attribute fix.
+
 * Wed Mar 17 2010 Ian Kent <kpnt at redhat.com> - 1:5.0.5-22
 - add missing sasl mutex callbacks.
 - add Conflicts to ensure we get fixed cyrus-sasl-lib for sasl callbacks change.