summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2008-05-19 21:16:09 +0000
committerScott Ullrich <sullrich@pfsense.org>2008-05-19 21:16:09 +0000
commit194d9340db9e158c9dfe2cacab96a62951e3e3b5 (patch)
treea1dcb662afc295d216727eea6c77773a171214a5
parent84aa381e61492ddc4bed24fc6f89361ace0347d7 (diff)
downloadpfsense-194d9340db9e158c9dfe2cacab96a62951e3e3b5.zip
pfsense-194d9340db9e158c9dfe2cacab96a62951e3e3b5.tar.gz
Unbreak racoon
-rw-r--r--etc/inc/vpn.inc8
1 files changed, 2 insertions, 6 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index c5b2298..17b2d5b 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -347,11 +347,7 @@ function vpn_ipsec_configure($ipchg = false) {
}
if (!($myidentt == "asn1dn" && $myident == "")) {
- $myident = " \"".$myident."\"";
- }
-
- if (!($myidentt == "asn1dn" && $myident == "")) {
- $myident = " \"".$myident."\"";
+ $myident = " \"{$myident}\"";
}
$nattline = '';
@@ -421,7 +417,7 @@ EOD;
if (!empty($myident))
$myidentifier .= ' "' . $myident . '"';
$racoonconf .=<<<EOD
-remote {$tunnel['remote-gateway']} \{
+remote {$tunnel['remote-gateway']} {
exchange_mode {$tunnel['p1']['mode']};
my_identifier {$myidentt}{$myident};
{$nattline}
OpenPOWER on IntegriCloud