diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2009-04-08 17:58:11 -0700 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2009-04-08 17:58:11 -0700 |
| commit | 4d6de3aca5ea7ccc5325e58f5aa278b862423f2e (patch) | |
| tree | 2a398a13d60e13082e9734b8efe61553b789389f | |
| parent | da5a728eb210f10ed22ad194a72e8c385ec72586 (diff) | |
| download | vyatta-cfg-vpn-4d6de3aca5ea7ccc5325e58f5aa278b862423f2e.tar.gz vyatta-cfg-vpn-4d6de3aca5ea7ccc5325e58f5aa278b862423f2e.zip | |
Bugfix 3284: Allow commit to succeed if local-ip is not configured.
Previously, the ipsec setup script would fail the commit if the IPv4
address given in the local-ip parameter was not configured on
one of the ipsec-interfaces at the time that the commit took place.
This causes problems for PPP interfaces that may be configured, but
down for operational reasons. This change makes the setup script more
liberal. It will allow the commit to complete, but issue a warning
the address, they can restart ipsec. PPP has logic to restart
ipsec when a link comes up.
| -rwxr-xr-x | scripts/vpn-config.pl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/vpn-config.pl b/scripts/vpn-config.pl index b6cecaa..0f40210 100755 --- a/scripts/vpn-config.pl +++ b/scripts/vpn-config.pl @@ -389,8 +389,11 @@ if ($vcVPN->exists('ipsec')) { # Verified that dealing with a cluster IP. $clustering_ip = 1; } else { - $error = 1; - print STDERR "VPN configuration error. Local IP $lip specified for peer \"$peer\" has not been configured in any of the ipsec-interfaces or clustering.\n"; + print "Warning: Local IPv4 address $lip specified for peer \"$peer\"\n"; + print "is not configured on any of the ipsec-interfaces and is not the\n"; + print "clustering address. IPsec must be re-started after address\n"; + print "has been configured.\n"; + print "\n"; } } } |