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

- and another try at fixing lexer matching map type in map name.

Browse Source
This commit is contained in:
Ian Kent 2008-04-01 03:57:45 +00:00
parent 510e885d21
commit 5a9bd97979
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,6 @@
diff --git a/CHANGELOG b/CHANGELOG diff -up autofs-5.0.3/lib/master_tok.l.map-type-in-map-name autofs-5.0.3/lib/master_tok.l
index af5a1b0..76f2477 100644 --- autofs-5.0.3/lib/master_tok.l.map-type-in-map-name 2008-04-01 11:14:00.000000000 +0800
--- a/CHANGELOG +++ autofs-5.0.3/lib/master_tok.l 2008-04-01 11:14:00.000000000 +0800
+++ 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
@@ -77,6 +77,7 @@ int my_yyinput(char *, int); @@ -77,6 +77,7 @@ int my_yyinput(char *, int);
char buff[1024]; char buff[1024];
char *bptr; char *bptr;
@ -22,7 +9,7 @@ index b379940..4bbe033 100644
%} %}
@@ -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} {} {OPTWS}\\\n{OPTWS} {}
{MULTI} { {MULTI} {
@ -39,9 +26,10 @@ index b379940..4bbe033 100644
+ } + }
} }
{MTYPE} { - {MTYPE} {
- strcpy(master_lval.strtype, master_text); - strcpy(master_lval.strtype, master_text);
- return(MAPTYPE); - return(MAPTYPE);
+ {MTYPE}/({DNSERVERSTR}|{DNATTRSTR}=)? {
+ tlen = master_leng - 1; + tlen = master_leng - 1;
+ if (bptr != buff && isblank(master_text[tlen])) { + if (bptr != buff && isblank(master_text[tlen])) {
+ strncat(buff, master_text, tlen); + strncat(buff, master_text, tlen);
@ -54,7 +42,7 @@ index b379940..4bbe033 100644
} }
{MULTISEP} { return(DDASH); } {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); yyless(0);
} }
@ -63,3 +51,15 @@ index b379940..4bbe033 100644
BEGIN(DNSTR); BEGIN(DNSTR);
yyless(0); 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
-----------------------

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: 10 Release: 11
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
* Sun Apr 1 2008 Ian Kent <ikent@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@redhat.com> - 5.0.3-10 * Sun Mar 30 2008 Ian Kent <ikent@redhat.com> - 5.0.3-10
- another try a fixing lexer matching map type in map name. - another try a fixing lexer matching map type in map name.