|
 |
4d476f |
autofs-5.1.0-beta1 - add plus to path match pattern
|
|
|
4d476f |
|
|
|
4d476f |
From: Ian Kent <raven@themaw.net>
|
|
|
4d476f |
|
|
|
4d476f |
The pattern matching in the tokenizer is very strict and quite
|
|
|
4d476f |
limited. That's been done (initially) to ensure that the parsing
|
|
|
4d476f |
of other parts of map entries is accurate and to ensure that
|
|
|
4d476f |
error cases are handled cleanly since the strict matching will
|
|
|
4d476f |
cause errors.
|
|
|
4d476f |
|
|
|
4d476f |
I don't want to open up patterns that probably need it to accept
|
|
|
4d476f |
a wide range of characters just yet but adding "+" to the match
|
|
|
4d476f |
is obviously needed.
|
|
|
4d476f |
---
|
|
|
4d476f |
CHANGELOG | 1 +
|
|
|
4d476f |
modules/amd_tok.l | 2 +-
|
|
|
4d476f |
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
4d476f |
|
|
|
4d476f |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
4d476f |
+++ autofs-5.0.7/CHANGELOG
|
|
|
4d476f |
@@ -121,6 +121,7 @@
|
|
|
4d476f |
- fix ldap_uri config update.
|
|
|
4d476f |
- fix typo in conf_load_autofs_defaults().
|
|
|
4d476f |
- fix hash on confg option add and delete.
|
|
|
4d476f |
+- add plus to path match pattern.
|
|
|
4d476f |
|
|
|
4d476f |
25/07/2012 autofs-5.0.7
|
|
|
4d476f |
=======================
|
|
|
4d476f |
--- autofs-5.0.7.orig/modules/amd_tok.l
|
|
|
4d476f |
+++ autofs-5.0.7/modules/amd_tok.l
|
|
|
4d476f |
@@ -81,7 +81,7 @@ V4NUM ([01]?[0-9][0-9]?|2[0-4][0-9]|25[
|
|
|
4d476f |
MACRO (\$\{([[:alpha:]_/]([[:alnum:]_\-])([[:alnum:]_\-/])*)\})
|
|
|
4d476f |
QSTR (\"([^"\\]|\\.)*\")
|
|
|
4d476f |
OSTR ([[:alpha:]]([[:alnum:]_\-])+)
|
|
|
4d476f |
-FSTR ([[:alnum:]_/\.]([[:alnum:]_\-/\.]|(\\.))*)
|
|
|
4d476f |
+FSTR ([[:alnum:]_/\.]([[:alnum:]_\-/\+\.]|(\\.))*)
|
|
|
4d476f |
VSTR (([[:alnum:]_\-\:/\.])+)
|
|
|
4d476f |
SSTR ([[:alpha:]]([[:alnum:]\-\.])+)
|
|
|
4d476f |
IP4ADDR ({V4NUM}\.((({V4NUM}\.){0,2}){V4NUM}?))
|