|
 |
304803 |
autofs-5.0.7 - fix master map mount options matching
|
|
|
304803 |
|
|
|
304803 |
From: Ian Kent <raven@themaw.net>
|
|
|
304803 |
|
|
|
304803 |
The master map options pattern matching is fairly primitive since it
|
|
|
304803 |
doesn't need to be very sophisticated. The current mount option pattern
|
|
|
304803 |
matching can't match mount options with quotes or embedded colons and so
|
|
|
304803 |
it can't pass these options through as a global options string.
|
|
|
304803 |
|
|
|
304803 |
But it must be able to match a fairly large class of strings, including
|
|
|
304803 |
the above case, so they can be passed through as global options. Of
|
|
|
304803 |
course it can't try and validate them since it can't know what mount type
|
|
|
304803 |
they may be used with.
|
|
|
304803 |
---
|
|
|
304803 |
CHANGELOG | 1 +
|
|
|
304803 |
lib/master_tok.l | 2 +-
|
|
|
304803 |
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
304803 |
|
|
|
304803 |
diff --git a/CHANGELOG b/CHANGELOG
|
|
|
304803 |
index 1156cc9..00eaff2 100644
|
|
|
304803 |
--- a/CHANGELOG
|
|
|
304803 |
+++ b/CHANGELOG
|
|
|
304803 |
@@ -45,6 +45,7 @@
|
|
|
304803 |
- add enable sloppy mount option to configure.
|
|
|
304803 |
- fix interface address null check.
|
|
|
304803 |
- dont probe rdma mounts.
|
|
|
304803 |
+- fix master map mount options matching.
|
|
|
304803 |
|
|
|
304803 |
25/07/2012 autofs-5.0.7
|
|
|
304803 |
=======================
|
|
|
304803 |
diff --git a/lib/master_tok.l b/lib/master_tok.l
|
|
|
304803 |
index f9b4e55..8d1f1a2 100644
|
|
|
304803 |
--- a/lib/master_tok.l
|
|
|
304803 |
+++ b/lib/master_tok.l
|
|
|
304803 |
@@ -91,7 +91,7 @@ OPTWS [[:blank:]]*
|
|
|
304803 |
NL \r?\n
|
|
|
304803 |
CONT \\\n{OPTWS}
|
|
|
304803 |
|
|
|
304803 |
-OPTIONSTR ([\-]?([[:alpha:]_]([[:alnum:]_\-])*(=([[:alnum:]_\-])+)*)+)
|
|
|
304803 |
+OPTIONSTR ([\-]?([[:alpha:]_]([[:alnum:]_\-])*(=(\"?([[:alnum:]_\-\:])+\"?))?)+)
|
|
|
304803 |
MACROSTR (-D{OPTWS}([[:alpha:]_]([[:alnum:]_\-\.])*)=([[:alnum:]_\-\.])+)
|
|
|
304803 |
SLASHIFYSTR (--(no-)?slashify-colons)
|
|
|
304803 |
NUMBER [0-9]+
|