diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-01-20 19:31:02 -0600 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-01-20 19:31:02 -0600 |
| commit | 99083911dd340dcbcfa6215420ff4913696a9043 (patch) | |
| tree | 8ca9e50d672a8b096844c0835428206a65a4b628 /scripts | |
| parent | 4f63c768e5061279e9ebd80d2e5a0a748b46d347 (diff) | |
| download | vyatta-cfg-vpn-99083911dd340dcbcfa6215420ff4913696a9043.tar.gz vyatta-cfg-vpn-99083911dd340dcbcfa6215420ff4913696a9043.zip | |
fix conflict while merging
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/vpn-config.pl | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/scripts/vpn-config.pl b/scripts/vpn-config.pl index b693b92..c6ab840 100755 --- a/scripts/vpn-config.pl +++ b/scripts/vpn-config.pl @@ -893,10 +893,17 @@ if ( $vcVPN->exists('ipsec') ) { } # when local-ip is dynamic then only the following generic form works $genout_secrets .= ": PSK \"$psk\"\n"; - } else { - $genout_secrets .= "$index1 $index2 : PSK \"$psk\"\n"; - } - $genout .= "\tauthby=secret\n"; + } else { + $genout_secrets .= "$lip $right "; + if ( defined ($authid) ){ + $genout_secrets .= "$authid "; + } + if ( defined ($authremoteid) ) { + $genout_secrets .= "$authremoteid "; + } + $genout_secrets .= ": PSK \"$psk\"\n"; + } + $genout .= "\tauthby=secret\n"; } elsif ( defined($auth_mode) && $auth_mode eq 'rsa' ) { unless ( -r $local_key_file ) { |