You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

40 lines
1.4 KiB

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