34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
autofs-5.0.3 - fix master map lexer eval order
|
|
|
|
From: Ian Kent <raven@themaw.net>
|
|
|
|
Two compound regular expressions in the master map lexical
|
|
analyser lack brackets which leads to an evaluation order
|
|
error in some versions of flex.
|
|
---
|
|
|
|
lib/master_tok.l | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
--- autofs-5.0.3.orig/lib/master_tok.l
|
|
+++ autofs-5.0.3/lib/master_tok.l
|
|
@@ -99,7 +99,7 @@ DNSERVSTR1 ([[:alpha:]][[:alnum:]\-.]*(:
|
|
DNSERVSTR2 (\/\/[[:alpha:]][[:alnum:]\-.]*(:[0-9]+)?\/)
|
|
DNSERVSTR3 (([[:digit:]]{1,3}\.){3}[[:digit:]]{1,3}(:[0-9]+)?:)
|
|
DNSERVSTR4 (\/\/([[:digit:]]{1,3}\.){3}[[:digit:]]{1,3}(:[0-9]+)?\/)
|
|
-DNSERVERSTR {DNSERVSTR1}|{DNSERVSTR2}|{DNSERVSTR3}|{DNSERVSTR4}
|
|
+DNSERVERSTR ({DNSERVSTR1}|{DNSERVSTR2}|{DNSERVSTR3}|{DNSERVSTR4})
|
|
|
|
AT_CN ([cC][[nN])
|
|
AT_NMN ([nN][iI][sS][Mm][aA][pP][Nn][aA][mM][eE])
|
|
@@ -108,7 +108,7 @@ AT_OU ([oO][[uU])
|
|
AT_DC ([dD][[cC])
|
|
AT_O ([oO])
|
|
AT_C ([cC])
|
|
-DNATTRSTR {AT_CN}|{AT_NMN}|{AT_AMN}|{AT_OU}|{AT_DC}|{AT_O}|{AT_C}
|
|
+DNATTRSTR ({AT_CN}|{AT_NMN}|{AT_AMN}|{AT_OU}|{AT_DC}|{AT_O}|{AT_C})
|
|
DNNAMESTR1 ([[:alnum:]_.\- ]+)
|
|
DNNAMESTR2 ([[:alnum:]_.\-]+)
|
|
|