net/frr: sync with master

lncsence · Jul 23, 2019 · be9028c · be9028c
1 parent 6256786
commit be9028c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/net/frr/Makefile b/net/frr/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		frr
 PLUGIN_VERSION=		1.11
-PLUGIN_REVISION=        2
+PLUGIN_REVISION=        3
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr6 ruby
 PLUGIN_MAINTAINER=	[email protected]

diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr
@@ -14,6 +14,7 @@ Plugin Changelog
 1.11
 
 * Add route-map support to redistribution in OSPF
+* Only allow custom set of characters in BGP prefix-lists and route-maps
 
 1.10
 

diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
@@ -155,6 +155,8 @@
                         <name type="TextField">
                                 <default></default>
                                 <Required>Y</Required>
+                                <mask>/^[a-zA-Z0-9._-]{1,64}$/</mask>
+                                <ValidationMessage>The name should only contain alphanumeric characters, dashes, underscores or a dot.</ValidationMessage>
                         </name>
                         <version type="OptionField">
                                 <default>IPv4</default>
@@ -193,6 +195,8 @@
                         <name type="TextField">
                                 <default></default>
                                 <Required>Y</Required>
+                                <mask>/^[a-zA-Z0-9._-]{1,64}$/</mask>
+                                <ValidationMessage>The name should only contain alphanumeric characters, dashes, underscores or a dot.</ValidationMessage>
                         </name>
                         <action type="OptionField">
                                 <default></default>
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ Plugin Changelog @@
 .11
     * Add route-map support to redistribution in OSPF
+    * Only allow custom set of characters in BGP prefix-lists and route-maps
 .10
@@ Expand Down @@