From 4abfeac61826a30445a8c7443df8e6aa3e37b6fc Mon Sep 17 00:00:00 2001 From: John Southworth Date: Mon, 19 Sep 2011 16:58:57 -0500 Subject: Switched POSIX character classes to standard character classes representing the same data; removed unneeded '.' from regex; add similar regex to match remote-id --- .../vpn/ipsec/site-to-site/peer/node.tag/authentication/id/node.def | 2 +- .../ipsec/site-to-site/peer/node.tag/authentication/remote-id/node.def | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'templates/vpn/ipsec/site-to-site') diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/id/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/id/node.def index 1ae62d5..a16cd3a 100644 --- a/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/id/node.def +++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/id/node.def @@ -1,5 +1,5 @@ help: ID for peer authentication type: txt -syntax:expression: pattern $VAR(@) "^@[[:alpha:]_]+(\.[[:alnum:]][-_[:alnum:]]*)*$" +syntax:expression: pattern $VAR(@) "^@[[A-Za-z_]+([A-Za-z0-9][-_A-Za-z0-9]*)*$" ; "invalid ID \"$VAR(@)\"" val_help: @; ID used for peer authentication diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/remote-id/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/remote-id/node.def index 17f2d41..7cc4f87 100644 --- a/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/remote-id/node.def +++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/remote-id/node.def @@ -1,2 +1,5 @@ help: ID for remote authentication type: txt +syntax:expression: pattern $VAR(@) "^@[[A-Za-z_]+([A-Za-z0-9][-_A-Za-z0-9]*)*$" + ; "invalid ID \"$VAR(@)\"" +val_help: @; ID used for peer authentication -- cgit v1.2.3