Partially revert 019ee2bc8c, this workaround is not necessary. Real fix will be committed after this

This commit is contained in:
Renato Botelho 2015-06-23 14:11:37 -03:00
parent 019ee2bc8c
commit d30038e079

View File

@ -647,14 +647,6 @@ EOD;
if (!empty($ph1ent['pre-shared-key'])) {
$pskconf .= "{$myid} {$peerid} : PSK 0s" . base64_encode(trim($ph1ent['pre-shared-key'])) . "\n";
/*
* XXX: Remove after following strongswan issue is fixed:
*https://wiki.strongswan.org/issues/1004
*/
if ($peerid_type == 'address' && is_fqdn($ph1ent['remote-gateway'])) {
$pskconf .= "{$myid} @{$ph1ent['remote-gateway']} : PSK 0s" . base64_encode(trim($ph1ent['pre-shared-key'])) . "\n";
}
}
}
}