summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Larson <mike@vyatta.com>2011-01-17 11:07:06 -0800
committerMichael Larson <mike@vyatta.com>2011-01-17 11:07:06 -0800
commitda11c8ac722c30da3d5948210e94bf8d1b6cab40 (patch)
tree9d55e9dee3399ebd8ad5dc26ce50e079785ed0d2
parent493a308c859a1d708df3d6fd4871ad91af8d4976 (diff)
downloadvyatta-cfg-vpn-da11c8ac722c30da3d5948210e94bf8d1b6cab40.tar.gz
vyatta-cfg-vpn-da11c8ac722c30da3d5948210e94bf8d1b6cab40.zip
error location support changes to vpn (local-ip and auth missing only at this time).
-rwxr-xr-xscripts/vpn-config.pl5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/vpn-config.pl b/scripts/vpn-config.pl
index ffb43c2..4415bd7 100755
--- a/scripts/vpn-config.pl
+++ b/scripts/vpn-config.pl
@@ -415,7 +415,7 @@ if ( $vcVPN->exists('ipsec') ) {
"ipsec site-to-site peer $peer authentication remote-id");
if ( !defined($lip) || $lip eq "" ) {
$error = 1;
- print STDERR "$vpn_cfg_err No local-ip specified for peer \"$peer\"\n";
+ Vyatta::Config::outputError(["vpn","ipsec","site-to-site","peer",$peer,"local-ip"],"$vpn_cfg_err No local-ip specified for peer \"$peer\"\n");
} elsif ( $lip ne '0.0.0.0' ) {
# not '0.0.0.0' special case.
@@ -851,8 +851,7 @@ if ( $vcVPN->exists('ipsec') ) {
"ipsec site-to-site peer $peer authentication mode");
if ( !defined($auth_mode) || $auth_mode eq '' ) {
$error = 1;
- print STDERR
- "$vpn_cfg_err No authentication mode for peer \"$peer\" specified.\n";
+ Vyatta::Config::outputError(["vpn","ipsec","site-to-site","peer",$peer,"authentication"],"$vpn_cfg_err No authentication mode for peer \"$peer\" specified.\n");
} elsif ( defined($auth_mode) && ( $auth_mode eq 'pre-shared-secret' ) ) {
my $psk = $vcVPN->returnValue(
"ipsec site-to-site peer $peer authentication pre-shared-secret");