1d72a09cf5
- add missing check for zero length NIS key. - fix incorrect match of map type name when included in map name. - update rev 7 sasl callbacks patch.
56 lines
1.3 KiB
Diff
56 lines
1.3 KiB
Diff
diff --git a/CHANGELOG b/CHANGELOG
|
|
index af5a1b0..76f2477 100644
|
|
--- a/CHANGELOG
|
|
+++ b/CHANGELOG
|
|
@@ -12,6 +12,7 @@
|
|
- update fix expire working harder than needed.
|
|
- add missing check for zero length NIS key (Wengang Wang).
|
|
- init SASL callbacks on every ldap lookup library load.
|
|
+- fix incorrect match of map type name when included in map name.
|
|
|
|
14/01/2008 autofs-5.0.3
|
|
-----------------------
|
|
diff --git a/lib/master_tok.l b/lib/master_tok.l
|
|
index b379940..9f4aaab 100644
|
|
--- a/lib/master_tok.l
|
|
+++ b/lib/master_tok.l
|
|
@@ -77,6 +77,7 @@ int my_yyinput(char *, int);
|
|
char buff[1024];
|
|
char *bptr;
|
|
char *optr = buff;
|
|
+char *tptr;
|
|
|
|
%}
|
|
|
|
@@ -189,17 +190,25 @@ OPTNTOUT (-n{OPTWS}|-n{OPTWS}={OPTWS}|--negative-timeout{OPTWS}|--negative-timeo
|
|
<MAPSTR>{
|
|
{OPTWS}\\\n{OPTWS} {}
|
|
|
|
- {MULTI} {
|
|
- strcpy(master_lval.strtype, master_text);
|
|
+ {WS}{MULTI} {
|
|
+ tptr = master_text;
|
|
+ while (*tptr && isblank(*tptr)) {
|
|
+ tptr++;
|
|
+ }
|
|
+ strcpy(master_lval.strtype, tptr);
|
|
return(MULTITYPE);
|
|
}
|
|
|
|
- {MTYPE} {
|
|
- strcpy(master_lval.strtype, master_text);
|
|
+ {WS}{MTYPE} {
|
|
+ tptr = master_text;
|
|
+ while (*tptr && isblank(*tptr)) {
|
|
+ tptr++;
|
|
+ }
|
|
+ strcpy(master_lval.strtype, tptr);
|
|
return(MAPTYPE);
|
|
}
|
|
|
|
- {MULTISEP} { return(DDASH); }
|
|
+ {WS}{MULTISEP} { return(DDASH); }
|
|
|
|
":" { return(COLON); }
|
|
|