]>
Commit | Line | Data |
---|---|---|
3d551623 PG |
1 | diff --git a/CHANGELOG b/CHANGELOG |
2 | index ca290f9..5e3a9ec 100644 | |
3 | --- a/CHANGELOG | |
4 | +++ b/CHANGELOG | |
5 | @@ -38,6 +38,7 @@ | |
6 | - add dynamic logging (adapted from v4 patch from Jeff Moyer). | |
7 | - fix recursive loopback mounts (Matthias Koenig). | |
8 | - add map re-load to verbose logging. | |
9 | +- fix handling of LDAP base dns with spaces. | |
10 | ||
11 | 18/06/2007 autofs-5.0.2 | |
12 | ----------------------- | |
13 | diff --git a/lib/master_tok.l b/lib/master_tok.l | |
14 | index 00cd223..48bc233 100644 | |
15 | --- a/lib/master_tok.l | |
16 | +++ b/lib/master_tok.l | |
17 | @@ -109,6 +109,7 @@ AT_O ([oO]) | |
18 | AT_C ([cC]) | |
19 | DNATTRSTR {AT_CN}|{AT_NMN}|{AT_AMN}|{AT_OU}|{AT_DC}|{AT_O}|{AT_C} | |
20 | DNNAMESTR ([[:alnum:]_.\-]+) | |
21 | +DNNAMETRM (,|{WS}{NL}|{WS}#.*|\x00) | |
22 | ||
23 | INTMAP (-hosts|-null) | |
24 | MULTI ((multi)(,(sun|hesiod))?(:{OPTWS}|{WS})) | |
25 | @@ -281,7 +282,7 @@ OPTTOUT (-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS}) | |
26 | return EQUAL; | |
27 | } | |
28 | ||
29 | - {DNNAMESTR} { | |
30 | + {DNNAMESTR}/{DNNAMETRM} { | |
31 | strcpy(master_lval.strtype, master_text); | |
32 | return DNNAME; | |
33 | } |