Révision 5bce82b4
Ajouté par Ermal il y a plus de 9 ans
| etc/inc/vpn.inc | ||
|---|---|---|
| 173 | 173 |
if (isset($ph1ent['disabled'])) |
| 174 | 174 |
continue; |
| 175 | 175 |
|
| 176 |
$ikeid = $ph1ent['ikeid']; |
|
| 176 | 177 |
$listeniflist = get_real_interface($a_phase1['interface']); |
| 177 | 178 |
|
| 178 | 179 |
$ep = ipsec_get_phase1_src($ph1ent); |
| ... | ... | |
| 207 | 208 |
if (is_array($a_phase2)) {
|
| 208 | 209 |
/* step through each phase2 entry */ |
| 209 | 210 |
foreach ($a_phase2 as $ph2ent) {
|
| 210 |
$ikeid = $ph2ent['ikeid']; |
|
| 211 |
|
|
| 212 | 211 |
if (isset($ph2ent['disabled'])) |
| 213 | 212 |
continue; |
| 214 | 213 |
|
| 215 |
if ($ikeid != $ph1ent['ikeid'])
|
|
| 214 |
if ($ikeid != $ph2ent['ikeid'])
|
|
| 216 | 215 |
continue; |
| 217 | 216 |
|
| 218 | 217 |
/* add an ipsec pinghosts entry */ |
| ... | ... | |
| 436 | 435 |
|
| 437 | 436 |
if (strstr($authmethod,'rsa')) {
|
| 438 | 437 |
|
| 438 |
$ikeid = $ph1ent['ikeid']; |
|
| 439 | 439 |
$cert = lookup_cert($ph1ent['certref']); |
| 440 | 440 |
|
| 441 | 441 |
if (!$cert) {
|
| ... | ... | |
| 532 | 532 |
if (!$ep) |
| 533 | 533 |
continue; |
| 534 | 534 |
|
| 535 |
$ikeid = $ph1ent['ikeid']; |
|
| 535 | 536 |
$keyexchange = "ikev1"; |
| 536 | 537 |
$passive = "route"; |
| 537 | 538 |
if (!empty($ph1ent['iketype']) && $ph1ent['iketype'] != "ikev1") {
|
| ... | ... | |
| 619 | 620 |
$ealgoESPsp2arr = array(); |
| 620 | 621 |
if (is_array($a_phase2) && count($a_phase2)) {
|
| 621 | 622 |
foreach ($a_phase2 as $ph2ent) {
|
| 622 |
$ikeid = $ph2ent['ikeid']; |
|
| 623 |
if ($ikeid != $ph1ent['ikeid']) |
|
| 623 |
if ($ikeid != $ph2ent['ikeid']) |
|
| 624 | 624 |
continue; |
| 625 | 625 |
|
| 626 | 626 |
if (isset($ph2ent['disabled'])) |
Formats disponibles : Unified diff
Correct processing and assignment on ikeid variable so it does the right thing