提交 479dfbb0 编写于 作者: S Stefan Berger

Fix for nwfilter: Add filter schema for nwfilter XML, extend domain XML schema

Fixing the regular expressions for variables where the first letter must be a $.
上级 0d7d6997
...@@ -569,7 +569,7 @@ ...@@ -569,7 +569,7 @@
<choice> <choice>
<!-- variable --> <!-- variable -->
<data type="string"> <data type="string">
<param name="pattern">[\\$]{1}[a-zA-Z0-9_]+</param> <param name="pattern">$[a-zA-Z0-9_]+</param>
</data> </data>
<data type="string"> <data type="string">
...@@ -582,7 +582,7 @@ ...@@ -582,7 +582,7 @@
<choice> <choice>
<!-- variable --> <!-- variable -->
<data type="string"> <data type="string">
<param name="pattern">[\\$]{1}[a-zA-Z0-9_]+</param> <param name="pattern">$[a-zA-Z0-9_]+</param>
</data> </data>
<data type="string"> <data type="string">
...@@ -595,7 +595,7 @@ ...@@ -595,7 +595,7 @@
<choice> <choice>
<!-- variable --> <!-- variable -->
<data type="string"> <data type="string">
<param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> <param name="pattern">$[a-zA-Z0-9_]+</param>
</data> </data>
<data type="string"> <data type="string">
...@@ -608,7 +608,7 @@ ...@@ -608,7 +608,7 @@
<choice> <choice>
<!-- variable --> <!-- variable -->
<data type="string"> <data type="string">
<param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> <param name="pattern">$[a-zA-Z0-9_]+</param>
</data> </data>
<data type="int"> <data type="int">
...@@ -626,7 +626,7 @@ ...@@ -626,7 +626,7 @@
<choice> <choice>
<!-- variable --> <!-- variable -->
<data type="string"> <data type="string">
<param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> <param name="pattern">$[a-zA-Z0-9_]+</param>
</data> </data>
<data type="int"> <data type="int">
...@@ -644,7 +644,7 @@ ...@@ -644,7 +644,7 @@
<choice> <choice>
<!-- variable --> <!-- variable -->
<data type="string"> <data type="string">
<param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> <param name="pattern">$[a-zA-Z0-9_]+</param>
</data> </data>
<data type="int"> <data type="int">
...@@ -658,7 +658,7 @@ ...@@ -658,7 +658,7 @@
<choice> <choice>
<!-- variable --> <!-- variable -->
<data type="string"> <data type="string">
<param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> <param name="pattern">$[a-zA-Z0-9_]+</param>
</data> </data>
<data type="int"> <data type="int">
...@@ -678,7 +678,7 @@ ...@@ -678,7 +678,7 @@
<choice> <choice>
<!-- variable --> <!-- variable -->
<data type="string"> <data type="string">
<param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> <param name="pattern">$[a-zA-Z0-9_]+</param>
</data> </data>
<data type="int"> <data type="int">
...@@ -692,7 +692,7 @@ ...@@ -692,7 +692,7 @@
<choice> <choice>
<!-- variable --> <!-- variable -->
<data type="string"> <data type="string">
<param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> <param name="pattern">$[a-zA-Z0-9_]+</param>
</data> </data>
<data type="int"> <data type="int">
...@@ -706,7 +706,7 @@ ...@@ -706,7 +706,7 @@
<choice> <choice>
<!-- variable --> <!-- variable -->
<data type="string"> <data type="string">
<param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> <param name="pattern">$[a-zA-Z0-9_]+</param>
</data> </data>
<data type="int"> <data type="int">
...@@ -725,7 +725,7 @@ ...@@ -725,7 +725,7 @@
<choice> <choice>
<!-- variable --> <!-- variable -->
<data type="string"> <data type="string">
<param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> <param name="pattern">$[a-zA-Z0-9_]+</param>
</data> </data>
<data type="int"> <data type="int">
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册