autofs-5.0.3 - fix master map lexer eval order From: Ian Kent Two compound regular expressions in the master map lexical analyser lack brackets which leads to an evaluation order error in some versions of flex. --- CHANGELOG | 1 + lib/master_tok.l | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8cdaab2..879380e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -47,6 +47,7 @@ - fix incorrect pthreads condition handling for expire requests. - fix $mandir definition in Makefile.conf.in - fix init script stop function. +- fix master map lexer eval order. 14/01/2008 autofs-5.0.3 ----------------------- diff --git a/lib/master_tok.l b/lib/master_tok.l index d2c86bc..801aa6f 100644 --- a/lib/master_tok.l +++ b/lib/master_tok.l @@ -99,7 +99,7 @@ DNSERVSTR1 ([[:alpha:]][[:alnum:]\-.]*(:[0-9]+)?:) 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:]_.\-]+)