diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-09-19 16:58:57 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-09-19 16:58:57 -0500 |
| commit | 4abfeac61826a30445a8c7443df8e6aa3e37b6fc (patch) | |
| tree | abe71eb0fb1692c8855354d349db26d1cb24fb4e | |
| parent | 651351e12010f0160b42ca113aa64672648eecde (diff) | |
| download | vyatta-cfg-vpn-4abfeac61826a30445a8c7443df8e6aa3e37b6fc.tar.gz vyatta-cfg-vpn-4abfeac61826a30445a8c7443df8e6aa3e37b6fc.zip | |
Switched POSIX character classes to standard character classes representing the same data; removed unneeded '.' from regex; add similar regex to match remote-id
| -rw-r--r-- | templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/id/node.def | 2 | ||||
| -rw-r--r-- | templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/remote-id/node.def | 3 |
2 files changed, 4 insertions, 1 deletions
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: @<text>; 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: @<text>; ID used for peer authentication |