rpms/autofs
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix lexer ambiguity in match when map type name is included in map name.

Browse Source
This commit is contained in:
Ian Kent 2008-03-26 03:43:46 +00:00
parent 1d72a09cf5
commit 4244e9bb1d
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
autofs-5.0.3-map-type-in-map-name.patch
View File

@ -11,7 +11,7 @@ index af5a1b0..76f2477 100644
14/01/2008 autofs-5.0.3 14/01/2008 autofs-5.0.3
----------------------- -----------------------
diff --git a/lib/master_tok.l b/lib/master_tok.l 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 --- a/lib/master_tok.l
+++ b/lib/master_tok.l +++ b/lib/master_tok.l
@@ -77,6 +77,7 @@ int my_yyinput(char *, int); @@ -77,6 +77,7 @@ int my_yyinput(char *, int);
@ -22,7 +22,23 @@ index b379940..9f4aaab 100644
%} %}
@@ -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>{ <MAPSTR>{
{OPTWS}\\\n{OPTWS} {} {OPTWS}\\\n{OPTWS} {}
@ -53,3 +69,12 @@ index b379940..9f4aaab 100644
":" { return(COLON); } ":" { 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);
}

5
autofs.spec
View File

@ -4,7 +4,7 @@
Summary: A tool for automatically mounting and unmounting filesystems Summary: A tool for automatically mounting and unmounting filesystems
Name: autofs Name: autofs
Version: 5.0.3 Version: 5.0.3
Release: 8 Release: 9
Epoch: 1 Epoch: 1
License: GPL License: GPL
Group: System Environment/Daemons Group: System Environment/Daemons
@ -125,6 +125,9 @@ fi
%{_libdir}/autofs/ %{_libdir}/autofs/
%changelog %changelog
* Wed Mar 26 2008 Ian Kent <ikent@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@redhat.com> - 5.0.3-8 * Mon Mar 24 2008 Ian Kent <ikent@redhat.com> - 5.0.3-8
- revert miscellaneous device node related patches. - revert miscellaneous device node related patches.
- add missing check for zero length NIS key. - add missing check for zero length NIS key.