autofs-5.1.3 - allow dot in OPTIONSTR value lexer pattern From: Frank Sorenson The options string in master map entries doesn't allow dot in the string value side of an option assignment. This prevents using an option like vers=4.1 to apply to all entries of the map. Add . to the options value portion of the regular expression used for this field. Signed-off-by: Frank Sorenson Signed-off-by: Ian Kent --- CHANGELOG | 1 + lib/master_tok.l | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 9815da29..1b61bb32 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,7 @@ xx/xx/2017 autofs-5.1.4 - also check flag file exe name. - fix possible map instance memory leak. - check map instances for staleness on map update. +- allow dot in OPTIONSTR value lexer pattern. 24/05/2017 autofs-5.1.3 ======================= diff --git a/lib/master_tok.l b/lib/master_tok.l index 63dab50d..41ac4995 100644 --- a/lib/master_tok.l +++ b/lib/master_tok.l @@ -91,7 +91,7 @@ OPTWS [[:blank:]]* NL \r?\n CONT \\\n{OPTWS} -OPTIONSTR ([\-]?([[:alpha:]_]([[:alnum:]_\-])*(=(\"?([[:alnum:]_\-\:])+\"?))?)+) +OPTIONSTR ([\-]?([[:alpha:]_]([[:alnum:]_\-])*(=(\"?([[:alnum:]_\-\:\.])+\"?))?)+) MACROSTR (-D{OPTWS}([[:alpha:]_]([[:alnum:]_\-\.])*)=([[:alnum:]_\-\.])+) SLASHIFYSTR (--(no-)?slashify-colons) NUMBER [0-9]+