rpms/autofs/devel autofs-5.0.3-map-type-in-map-name.patch, 1.3, 1.4 autofs.spec, 1.238, 1.239

[Ian Kent (iankent)]

Author: iankent

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

Modified Files:
	autofs-5.0.3-map-type-in-map-name.patch autofs.spec 
Log Message:
* Sun Apr 1 2008 Ian Kent <ikent at redhat.com> - 5.0.3-11
- and another try at fixing lexer matching map type 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autofs-5.0.3-map-type-in-map-name.patch	30 Mar 2008 03:58:30 -0000	1.3
+++ autofs-5.0.3-map-type-in-map-name.patch	1 Apr 2008 03:57:45 -0000	1.4
@@ -1,19 +1,6 @@
-diff --git a/CHANGELOG b/CHANGELOG
-index af5a1b0..76f2477 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -12,6 +12,7 @@
- - update fix expire working harder than needed.
- - add missing check for zero length NIS key (Wengang Wang).
- - init SASL callbacks on every ldap lookup library load.
-+- fix incorrect match of map type name when included in map name.
-  
- 14/01/2008 autofs-5.0.3
- -----------------------
-diff --git a/lib/master_tok.l b/lib/master_tok.l
-index b379940..4bbe033 100644
---- a/lib/master_tok.l
-+++ b/lib/master_tok.l
+diff -up autofs-5.0.3/lib/master_tok.l.map-type-in-map-name autofs-5.0.3/lib/master_tok.l
+--- autofs-5.0.3/lib/master_tok.l.map-type-in-map-name	2008-04-01 11:14:00.000000000 +0800
++++ autofs-5.0.3/lib/master_tok.l	2008-04-01 11:14:00.000000000 +0800
 @@ -77,6 +77,7 @@ int my_yyinput(char *, int);
  char buff[1024];
  char *bptr;
@@ -22,7 +9,7 @@
  
  %}
  
-@@ -190,13 +191,27 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
+@@ -190,13 +191,27 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--
  	{OPTWS}\\\n{OPTWS} {}
  
  	{MULTI} {
@@ -39,9 +26,10 @@
 +		}
  	}
  
- 	{MTYPE} {
+-	{MTYPE} {
 -		strcpy(master_lval.strtype, master_text);
 -		return(MAPTYPE);
++	{MTYPE}/({DNSERVERSTR}|{DNATTRSTR}=)? {
 +		tlen = master_leng - 1;
 +		if (bptr != buff && isblank(master_text[tlen])) {
 +			strncat(buff, master_text, tlen);
@@ -54,7 +42,7 @@
  	}
  
  	{MULTISEP} { return(DDASH); }
-@@ -226,7 +241,7 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
+@@ -226,7 +241,7 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--
  		yyless(0);
  	}
  
@@ -63,3 +51,15 @@
  		BEGIN(DNSTR);
  		yyless(0);
  	}
+diff -up autofs-5.0.3/lib/master_parse.y.map-type-in-map-name autofs-5.0.3/lib/master_parse.y
+diff -up autofs-5.0.3/CHANGELOG.map-type-in-map-name autofs-5.0.3/CHANGELOG
+--- autofs-5.0.3/CHANGELOG.map-type-in-map-name	2008-04-01 11:14:00.000000000 +0800
++++ autofs-5.0.3/CHANGELOG	2008-04-01 11:14:00.000000000 +0800
+@@ -10,6 +10,7 @@
+ - fix unlink of mount tree incorrectly causing autofs mount fail.
+ - add missing check for zero length NIS key (Wengang Wang).
+ - init SASL callbacks on every ldap lookup library load.
++- fix incorrect match of map type name when included in map name.
+  
+ 14/01/2008 autofs-5.0.3
+ -----------------------


Index: autofs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -r1.238 -r1.239
--- autofs.spec	30 Mar 2008 03:58:30 -0000	1.238
+++ autofs.spec	1 Apr 2008 03:57:45 -0000	1.239
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.3
-Release: 10
+Release: 11
 Epoch: 1
 License: GPL
 Group: System Environment/Daemons
@@ -125,6 +125,9 @@
 %{_libdir}/autofs/
 
 %changelog
+* Sun Apr 1 2008 Ian Kent <ikent at redhat.com> - 5.0.3-11
+- and another try at fixing lexer matching map type in map name.
+
 * Sun Mar 30 2008 Ian Kent <ikent at redhat.com> - 5.0.3-10
 - another try a fixing lexer matching map type in map name.