]> git.pld-linux.org Git - packages/autofs.git/blob - autofs-5.0.2-basedn-with-spaces-fix-2.patch
935010d7d9ab24cb4924c6df59910193e2613561
[packages/autofs.git] / autofs-5.0.2-basedn-with-spaces-fix-2.patch
1 diff --git a/lib/master_tok.l b/lib/master_tok.l
2 index 5450753..36aa785 100644
3 --- a/lib/master_tok.l
4 +++ b/lib/master_tok.l
5 @@ -108,8 +108,8 @@ AT_DC               ([dD][[cC])
6  AT_O           ([oO])
7  AT_C           ([cC])
8  DNATTRSTR      {AT_CN}|{AT_NMN}|{AT_AMN}|{AT_OU}|{AT_DC}|{AT_O}|{AT_C}
9 -DNNAMESTR      ([[:alnum:]_.\- ]+)
10 -DNNAMETRM      (,|{OPTWS}{NL}|{OPTWS}#.*|{OPTWS}\x00)
11 +DNNAMESTR1     ([[:alnum:]_.\- ]+)
12 +DNNAMESTR2     ([[:alnum:]_.\-]+)
13  
14  INTMAP         (-hosts|-null)
15  MULTI          ((multi)(,(sun|hesiod))?(:{OPTWS}|{WS}))
16 @@ -282,7 +282,12 @@ OPTTOUT            (-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS})
17                 return EQUAL;
18         }
19  
20 -       {DNNAMESTR}/{DNNAMETRM} {
21 +       {DNNAMESTR1}/"," {
22 +               strcpy(master_lval.strtype, master_text);
23 +               return DNNAME;
24 +       }
25 +
26 +       {DNNAMESTR2} {
27                 strcpy(master_lval.strtype, master_text);
28                 return DNNAME;
29         }
This page took 0.287653 seconds and 2 git commands to generate.