From e71592e0f8e6139ce6aebac005c1426c87bd1149 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 26 Dec 2019 19:30:46 +0100 Subject: xml: remove leading carrot (^) from regex syntax ... as the carrot is applied automatically when reading in the XML definition. Auto replaced by: $ find interface-definitions -type f | xargs sed -i 's/regex>^/regex>/' --- interface-definitions/dns-domain-name.xml.in | 6 ++--- interface-definitions/flow-accounting-conf.xml.in | 4 ++-- interface-definitions/https.xml.in | 2 +- .../include/interface-description.xml.i | 2 +- interface-definitions/interfaces-wireguard.xml.in | 4 ++-- interface-definitions/ipoe-server.xml.in | 6 ++--- interface-definitions/l2tp-server.xml.in | 8 +++---- interface-definitions/lldp.xml.in | 10 ++++---- interface-definitions/pptp-server.xml.in | 4 ++-- interface-definitions/service-pppoe.xml.in | 12 +++++----- interface-definitions/snmp.xml.in | 28 +++++++++++----------- interface-definitions/ssh.xml.in | 8 +++---- interface-definitions/sstp.xml.in | 4 ++-- interface-definitions/system-syslog.xml.in | 12 +++++----- 14 files changed, 55 insertions(+), 55 deletions(-) (limited to 'interface-definitions') diff --git a/interface-definitions/dns-domain-name.xml.in b/interface-definitions/dns-domain-name.xml.in index c16f0b02a..eeaa5b2c1 100644 --- a/interface-definitions/dns-domain-name.xml.in +++ b/interface-definitions/dns-domain-name.xml.in @@ -48,7 +48,7 @@ DNS domain completion order - ^[-a-zA-Z0-9.]+$ + [-a-zA-Z0-9.]+$ Invalid domain name @@ -74,7 +74,7 @@ Host name for static address mapping - ^[A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]$ + [A-Za-z0-9][-.A-Za-z0-9]*[A-Za-z0-9]$ invalid hostname @@ -83,7 +83,7 @@ Alias for this address - ^.{1,63}$ + .{1,63}$ invalid alias hostname, needs to be between 1 and 63 charactes diff --git a/interface-definitions/flow-accounting-conf.xml.in b/interface-definitions/flow-accounting-conf.xml.in index b0a087796..5cf866b8e 100644 --- a/interface-definitions/flow-accounting-conf.xml.in +++ b/interface-definitions/flow-accounting-conf.xml.in @@ -156,7 +156,7 @@ NetFlow engine-id for v9 / IPFIX - ^(\d|[1-9]\d{1,8}|[1-3]\d{9}|4[01]\d{8}|42[0-8]\d{7}|429[0-3]\d{6}|4294[0-8]\d{5}|42949[0-5]\d{4}|429496[0-6]\d{3}|4294967[01]\d{2}|42949672[0-8]\d|429496729[0-5])$|^(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]):(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])$ + (\d|[1-9]\d{1,8}|[1-3]\d{9}|4[01]\d{8}|42[0-8]\d{7}|429[0-3]\d{6}|4294[0-8]\d{5}|42949[0-5]\d{4}|429496[0-6]\d{3}|4294967[01]\d{2}|42949672[0-8]\d|429496729[0-5])$|^(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]):(\d|[1-9]\d|1\d{2}|2[0-4]\d|25[0-5])$ @@ -375,7 +375,7 @@ - ^auto$ + auto$ diff --git a/interface-definitions/https.xml.in b/interface-definitions/https.xml.in index 923aac811..4c91bbd94 100644 --- a/interface-definitions/https.xml.in +++ b/interface-definitions/https.xml.in @@ -27,7 +27,7 @@ - ^\*$ + \*$ diff --git a/interface-definitions/include/interface-description.xml.i b/interface-definitions/include/interface-description.xml.i index 6356888da..7a7a37871 100644 --- a/interface-definitions/include/interface-description.xml.i +++ b/interface-definitions/include/interface-description.xml.i @@ -2,7 +2,7 @@ Interface description - ^.{1,256}$ + .{1,256}$ Interface description too long (limit 256 characters) diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in index bbe9a5d03..74319f705 100644 --- a/interface-definitions/interfaces-wireguard.xml.in +++ b/interface-definitions/interfaces-wireguard.xml.in @@ -75,7 +75,7 @@ base64 encoded public key - ^[0-9a-zA-Z\+/]{43}=$ + [0-9a-zA-Z\+/]{43}=$ Key is not valid 44-character (32-bytes) base64 @@ -84,7 +84,7 @@ base64 encoded preshared key - ^[0-9a-zA-Z\+/]{43}=$ + [0-9a-zA-Z\+/]{43}=$ Key is not valid 44-character (32-bytes) base64 diff --git a/interface-definitions/ipoe-server.xml.in b/interface-definitions/ipoe-server.xml.in index 5fee02614..f683ac5f4 100644 --- a/interface-definitions/ipoe-server.xml.in +++ b/interface-definitions/ipoe-server.xml.in @@ -23,7 +23,7 @@ L2 L3 - ^(L2|L3) + (L2|L3) L2 @@ -42,7 +42,7 @@ shared vlan - ^(shared|vlan) + (shared|vlan) shared @@ -196,7 +196,7 @@ local radius noauth - ^(local|radius|noauth) + (local|radius|noauth) local diff --git a/interface-definitions/l2tp-server.xml.in b/interface-definitions/l2tp-server.xml.in index 4e3a49b24..98c17b8b2 100644 --- a/interface-definitions/l2tp-server.xml.in +++ b/interface-definitions/l2tp-server.xml.in @@ -120,7 +120,7 @@ Use X.509 certificate for IPsec authentication - ^(pre-shared-secret|x509) + (pre-shared-secret|x509) pre-shared-secret x509 @@ -342,7 +342,7 @@ Require the peer to authenticate itself using MS-CHAPv2 [Microsoft Challenge Handshake Authentication Protocol, Version 2]. - ^(pap|chap|mschap|mschap-v2) + (pap|chap|mschap|mschap-v2) pap chap mschap mschap-v2 @@ -366,7 +366,7 @@ ask client for mppe, if it rejects drop connection - ^(deny|prefer|require) + (deny|prefer|require) deny prefer require @@ -385,7 +385,7 @@ Use a RADIUS server to autenticate users - ^(local|radius) + (local|radius) local radius diff --git a/interface-definitions/lldp.xml.in b/interface-definitions/lldp.xml.in index 774c15116..f95ffb4df 100644 --- a/interface-definitions/lldp.xml.in +++ b/interface-definitions/lldp.xml.in @@ -142,7 +142,7 @@ Civic address value for ca-type [REQUIRED] ca-value must be less than 256 characters - ^[A-Za-z0-9\ \-\_\.\,]{0,255}$ + [A-Za-z0-9\ \-\_\.\,]{0,255}$ @@ -157,7 +157,7 @@ country-code must be 2 characters - ^[a-zA-Z]{2}$ + [a-zA-Z]{2}$ @@ -201,7 +201,7 @@ Datum should be WGS84, NAD83, or MLLW - ^(WGS84|NAD83|MLLW)$ + (WGS84|NAD83|MLLW)$ @@ -214,7 +214,7 @@ Latitude should be a number followed by S or N - ^(\d+)(\.\d+)?[nNsS]$ + (\d+)(\.\d+)?[nNsS]$ @@ -227,7 +227,7 @@ Longiture should be a number followed by E or W - ^(\d+)(\.\d+)?[eEwW]$ + (\d+)(\.\d+)?[eEwW]$ diff --git a/interface-definitions/pptp-server.xml.in b/interface-definitions/pptp-server.xml.in index 3b4ea4f17..cbcdc8e28 100644 --- a/interface-definitions/pptp-server.xml.in +++ b/interface-definitions/pptp-server.xml.in @@ -155,7 +155,7 @@ ask client for mppe, if it rejects drop connection - ^(deny|prefer|require) + (deny|prefer|require) deny prefer require @@ -174,7 +174,7 @@ Use a RADIUS server to autenticate users - ^(local|radius) + (local|radius) local radius diff --git a/interface-definitions/service-pppoe.xml.in b/interface-definitions/service-pppoe.xml.in index 4951f656b..20c206d21 100644 --- a/interface-definitions/service-pppoe.xml.in +++ b/interface-definitions/service-pppoe.xml.in @@ -25,7 +25,7 @@ Access concentrator name - ^[a-zA-Z0-9]{1,100} + [a-zA-Z0-9]{1,100} access-concentrator name limited to alphanumerical characters only (max. 100) @@ -119,7 +119,7 @@ Use a RADIUS server to autenticate users - ^(local|radius) + (local|radius) local radius @@ -412,7 +412,7 @@ Acceptable rate of connections (e.g. 1/min, 60/sec) - ^[0-9]+\/(min|sec)$ + [0-9]+\/(min|sec)$ illegal value @@ -433,7 +433,7 @@ Service name - ^[a-zA-Z0-9\-]{1,100} + [a-zA-Z0-9\-]{1,100} servicename can contain aplhanumerical characters and dashes only (max. 100) @@ -541,7 +541,7 @@ IPv4 (IPCP) negotiation algorithm - ^(deny|allow|prefer|require) + (deny|allow|prefer|require) invalid value @@ -566,7 +566,7 @@ IPv6 (IPCP6) negotiation algorithm - ^(deny|allow|prefer|require) + (deny|allow|prefer|require) invalid value diff --git a/interface-definitions/snmp.xml.in b/interface-definitions/snmp.xml.in index bdfbd4ab6..91f1b8d71 100644 --- a/interface-definitions/snmp.xml.in +++ b/interface-definitions/snmp.xml.in @@ -13,7 +13,7 @@ Community name [REQUIRED] - ^[a-zA-Z0-9\-_]{1,100} + [a-zA-Z0-9\-_]{1,100} Community string is limited to alphanumerical characters only with a total lenght of 100 @@ -183,7 +183,7 @@ Specifies the EngineID that uniquely identify an agent (e.g. 0xff42) - ^(0x){0,1}([0-9a-f][0-9a-f]){1,18}$ + (0x){0,1}([0-9a-f][0-9a-f]){1,18}$ ID must contain an even number (from 2 to 36) of hex digits @@ -272,7 +272,7 @@ Defines the encrypted key for authentication - ^0x[0-9a-f]*$ + 0x[0-9a-f]*$ Key must start from '0x' and contain hex digits @@ -281,7 +281,7 @@ Defines the clear text key for authentication - ^.{8,}$ + .{8,}$ Key must contain 8 or more characters @@ -329,7 +329,7 @@ Defines the encrypted key for privacy protocol - ^0x[0-9a-f]*$ + 0x[0-9a-f]*$ Key must start from '0x' and contain hex digits @@ -338,7 +338,7 @@ Defines the clear text key for privacy protocol - ^.{8,}$ + .{8,}$ Key must contain 8 or more characters @@ -416,7 +416,7 @@ Specifies the user with name username - ^[^\(\)\|\-]+$ + [^\(\)\|\-]+$ Illegal characters in name @@ -430,7 +430,7 @@ Defines the encrypted key for authentication - ^0x[0-9a-f]*$ + 0x[0-9a-f]*$ Key must start from '0x' and contain hex digits @@ -439,7 +439,7 @@ Defines the clear text key for authentication - ^.{8,}$ + .{8,}$ Key must contain 8 or more characters @@ -502,7 +502,7 @@ Defines the encrypted key for privacy protocol - ^0x[0-9a-f]*$ + 0x[0-9a-f]*$ Key must start from '0x' and contain hex digits @@ -511,7 +511,7 @@ Defines the clear text key for privacy protocol - ^.{8,}$ + .{8,}$ Key must contain 8 or more characters @@ -543,7 +543,7 @@ Specifies the view with name viewname - ^[^\(\)\|\-]+$ + [^\(\)\|\-]+$ Illegal characters in name @@ -552,7 +552,7 @@ Specifies the oid - ^[0-9]+(\.[0-9]+)*$ + [0-9]+(\.[0-9]+)*$ OID must start from a number @@ -566,7 +566,7 @@ Defines a bit-mask that is indicating which subidentifiers of the associated subtree OID should be regarded as significant - ^[0-9a-f]{2}([\.:][0-9a-f]{2})*$ + [0-9a-f]{2}([\.:][0-9a-f]{2})*$ MASK is a list of hex octets, separated by '.' or ':' diff --git a/interface-definitions/ssh.xml.in b/interface-definitions/ssh.xml.in index 8dea94d05..ea4202195 100644 --- a/interface-definitions/ssh.xml.in +++ b/interface-definitions/ssh.xml.in @@ -25,7 +25,7 @@ Allow members of a group to login - ^[a-z_][a-z0-9_-]{1,31}[$]? + [a-z_][a-z0-9_-]{1,31}[$]? illegal characters or more than 32 characters @@ -35,7 +35,7 @@ Allow specific users to login - ^[a-z_][a-z0-9_-]{1,31}[$]? + [a-z_][a-z0-9_-]{1,31}[$]? illegal characters or more than 32 characters @@ -52,7 +52,7 @@ Disallow members of a group to login - ^[a-z_][a-z0-9_-]{1,31}[$]? + [a-z_][a-z0-9_-]{1,31}[$]? illegal characters or more than 32 characters @@ -62,7 +62,7 @@ Disallow specific users to login - ^[a-z_][a-z0-9_-]{1,31}[$]? + [a-z_][a-z0-9_-]{1,31}[$]? illegal characters or more than 32 characters diff --git a/interface-definitions/sstp.xml.in b/interface-definitions/sstp.xml.in index 290b45a98..9316db6fe 100644 --- a/interface-definitions/sstp.xml.in +++ b/interface-definitions/sstp.xml.in @@ -78,7 +78,7 @@ Use a RADIUS server to autenticate users - ^(local|radius) + (local|radius) local radius @@ -105,7 +105,7 @@ Require the peer to authenticate itself using MS-CHAPv2 [Microsoft Challenge Handshake Authentication Protocol, Version 2]. - ^(pap|chap|mschap|mschap-v2) + (pap|chap|mschap|mschap-v2) pap chap mschap mschap-v2 diff --git a/interface-definitions/system-syslog.xml.in b/interface-definitions/system-syslog.xml.in index cce79a4c2..2079ec0ea 100644 --- a/interface-definitions/system-syslog.xml.in +++ b/interface-definitions/system-syslog.xml.in @@ -12,7 +12,7 @@ Logging to specific terminal of given user - ^[a-z_][a-z0-9_-]{1,31}[$]? + [a-z_][a-z0-9_-]{1,31}[$]? illegal characters in user @@ -394,7 +394,7 @@ Number of saved files (default is 5) - ^[0-9]+ + [0-9]+ illegal characters in number of files @@ -403,7 +403,7 @@ Size of log files (in kbytes, default is 256) - ^[0-9]+ + [0-9]+ illegal characters in size @@ -591,7 +591,7 @@ Logging to a file - ^[a-zA-Z0-9\-_.]{1,255} + [a-zA-Z0-9\-_.]{1,255} illegal characters in filename or filename longer than 255 characters @@ -605,7 +605,7 @@ Number of saved files (default is 5) - ^[0-9]+ + [0-9]+ illegal characters in number of files @@ -614,7 +614,7 @@ Size of log files (in kbytes, default is 256) - ^[0-9]+ + [0-9]+ illegal characters in size -- cgit v1.2.3