rpms/autofs/devel autofs-5.0.3-map-type-in-map-name.patch, 1.1, 1.2 autofs.spec, 1.236, 1.237

[Ian Kent (iankent)]

Author: iankent

Update of /cvs/pkgs/rpms/autofs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13045

Modified Files:
	autofs-5.0.3-map-type-in-map-name.patch autofs.spec 
Log Message:
* Wed Mar 26 2008 Ian Kent <ikent at redhat.com> - 5.0.3-9
- fix lexer ambiguity in match when map type name is included in map name.


autofs-5.0.3-map-type-in-map-name.patch:

Index: autofs-5.0.3-map-type-in-map-name.patch
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs-5.0.3-map-type-in-map-name.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- autofs-5.0.3-map-type-in-map-name.patch	24 Mar 2008 05:17:20 -0000	1.1
+++ autofs-5.0.3-map-type-in-map-name.patch	26 Mar 2008 03:43:46 -0000	1.2
@@ -11,7 +11,7 @@
  14/01/2008 autofs-5.0.3
  -----------------------
 diff --git a/lib/master_tok.l b/lib/master_tok.l
-index b379940..9f4aaab 100644
+index b379940..eab6bb1 100644
 --- a/lib/master_tok.l
 +++ b/lib/master_tok.l
 @@ -77,6 +77,7 @@ int my_yyinput(char *, int);
@@ -22,7 +22,23 @@
  
  %}
  
-@@ -189,17 +190,25 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
+@@ -161,6 +162,15 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
+ 		return QUOTE;
+ 	}
+ 
++	{WS}/({MULTI}|{MTYPE}) {
++		BEGIN(MAPSTR);
++		*bptr = '\0';
++		strcpy(master_lval.strtype, buff);
++		bptr = buff;
++		yyless(0);
++		return(PATH);
++	}
++
+ 	{WS} {
+ 		BEGIN(MAPSTR);
+ 		*bptr = '\0';
+@@ -189,17 +199,25 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
  <MAPSTR>{
  	{OPTWS}\\\n{OPTWS} {}
  
@@ -53,3 +69,12 @@
  
  	":"	{ return(COLON); }
  
+@@ -226,7 +244,7 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
+ 		yyless(0);
+ 	}
+ 
+-	{DNSERVERSTR} {
++	{DNSERVERSTR}{DNATTRSTR} {
+ 		BEGIN(DNSTR);
+ 		yyless(0);
+ 	}


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- autofs.spec	24 Mar 2008 05:17:20 -0000	1.236
+++ autofs.spec	26 Mar 2008 03:43:46 -0000	1.237
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.3
-Release: 8
+Release: 9
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -125,6 +125,9 @@
 %{_libdir}/autofs/
 
 %changelog
+* Wed Mar 26 2008 Ian Kent <ikent at redhat.com> - 5.0.3-9
+- fix lexer ambiguity in match when map type name is included in map name.
+
 * Mon Mar 24 2008 Ian Kent <ikent at redhat.com> - 5.0.3-8
 - revert miscellaneous device node related patches.
 - add missing check for zero length NIS key.