| 1 |
stefaan 08/04/28 19:53:32 |
| 2 |
|
| 3 |
Added: autofs-5.0.3-map-patch-fix.patch |
| 4 |
Log: |
| 5 |
Fix error introduced by autofs-5.0.3-map-type-in-map-name.patch (patch taken from redhat rawhide autofs-5.0.3-11), also fix bug #219607 |
| 6 |
(Portage version: 2.1.5_rc6) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-fs/autofs/files/autofs-5.0.3-map-patch-fix.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/autofs/files/autofs-5.0.3-map-patch-fix.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/autofs/files/autofs-5.0.3-map-patch-fix.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: autofs-5.0.3-map-patch-fix.patch |
| 15 |
=================================================================== |
| 16 |
--- autofs-5.0.3-map-type-in-map-name.patch.old 2008-04-28 17:47:07.000000000 +0200 |
| 17 |
+++ autofs-5.0.3-map-type-in-map-name.patch 2008-04-01 05:57:45.000000000 +0200 |
| 18 |
@@ -1,19 +1,6 @@ |
| 19 |
-diff --git a/CHANGELOG b/CHANGELOG |
| 20 |
-index af5a1b0..76f2477 100644 |
| 21 |
---- a/CHANGELOG |
| 22 |
-+++ b/CHANGELOG |
| 23 |
-@@ -12,6 +12,7 @@ |
| 24 |
- - update fix expire working harder than needed. |
| 25 |
- - add missing check for zero length NIS key (Wengang Wang). |
| 26 |
- - init SASL callbacks on every ldap lookup library load. |
| 27 |
-+- fix incorrect match of map type name when included in map name. |
| 28 |
- |
| 29 |
- 14/01/2008 autofs-5.0.3 |
| 30 |
- ----------------------- |
| 31 |
-diff --git a/lib/master_tok.l b/lib/master_tok.l |
| 32 |
-index b379940..4bbe033 100644 |
| 33 |
---- a/lib/master_tok.l |
| 34 |
-+++ b/lib/master_tok.l |
| 35 |
+diff -up autofs-5.0.3/lib/master_tok.l.map-type-in-map-name autofs-5.0.3/lib/master_tok.l |
| 36 |
+--- autofs-5.0.3/lib/master_tok.l.map-type-in-map-name 2008-04-01 11:14:00.000000000 +0800 |
| 37 |
++++ autofs-5.0.3/lib/master_tok.l 2008-04-01 11:14:00.000000000 +0800 |
| 38 |
@@ -77,6 +77,7 @@ int my_yyinput(char *, int); |
| 39 |
char buff[1024]; |
| 40 |
char *bptr; |
| 41 |
@@ -22,7 +9,7 @@ |
| 42 |
|
| 43 |
%} |
| 44 |
|
| 45 |
-@@ -190,13 +191,27 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo |
| 46 |
+@@ -190,13 +191,27 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|-- |
| 47 |
{OPTWS}\\\n{OPTWS} {} |
| 48 |
|
| 49 |
{MULTI} { |
| 50 |
@@ -39,9 +26,10 @@ |
| 51 |
+ } |
| 52 |
} |
| 53 |
|
| 54 |
- {MTYPE} { |
| 55 |
+- {MTYPE} { |
| 56 |
- strcpy(master_lval.strtype, master_text); |
| 57 |
- return(MAPTYPE); |
| 58 |
++ {MTYPE}/({DNSERVERSTR}|{DNATTRSTR}=)? { |
| 59 |
+ tlen = master_leng - 1; |
| 60 |
+ if (bptr != buff && isblank(master_text[tlen])) { |
| 61 |
+ strncat(buff, master_text, tlen); |
| 62 |
@@ -54,7 +42,7 @@ |
| 63 |
} |
| 64 |
|
| 65 |
{MULTISEP} { return(DDASH); } |
| 66 |
-@@ -226,7 +241,7 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo |
| 67 |
+@@ -226,7 +241,7 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|-- |
| 68 |
yyless(0); |
| 69 |
} |
| 70 |
|
| 71 |
@@ -63,3 +51,15 @@ |
| 72 |
BEGIN(DNSTR); |
| 73 |
yyless(0); |
| 74 |
} |
| 75 |
+diff -up autofs-5.0.3/lib/master_parse.y.map-type-in-map-name autofs-5.0.3/lib/master_parse.y |
| 76 |
+diff -up autofs-5.0.3/CHANGELOG.map-type-in-map-name autofs-5.0.3/CHANGELOG |
| 77 |
+--- autofs-5.0.3/CHANGELOG.map-type-in-map-name 2008-04-01 11:14:00.000000000 +0800 |
| 78 |
++++ autofs-5.0.3/CHANGELOG 2008-04-01 11:14:00.000000000 +0800 |
| 79 |
+@@ -10,6 +10,7 @@ |
| 80 |
+ - fix unlink of mount tree incorrectly causing autofs mount fail. |
| 81 |
+ - add missing check for zero length NIS key (Wengang Wang). |
| 82 |
+ - init SASL callbacks on every ldap lookup library load. |
| 83 |
++- fix incorrect match of map type name when included in map name. |
| 84 |
+ |
| 85 |
+ 14/01/2008 autofs-5.0.3 |
| 86 |
+ ----------------------- |
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
-- |
| 91 |
gentoo-commits@l.g.o mailing list |
Archives