Project

General

Profile

« Previous | Next » 

Revision bb4b80c8

Added by Jim Pingle almost 7 years ago

Prevent disabling IPsec P1 with assigned VTI P2. Fixes #8674

View differences:

src/usr/local/www/vpn_ipsec.php
186 186 
		if (isset($a_phase1[$togglebtn]['disabled'])) {
187 187 
			unset($a_phase1[$togglebtn]['disabled']);
188 188 
		} else {
189 
			$a_phase1[$togglebtn]['disabled'] = true;
189 
			if (ipsec_vti($a_phase1[$togglebtn])) {
190 
				$input_errors[] = gettext("Cannot disable a Phase 1 with a child Phase 2 while the interface is assigned. Remove the interface assignment before disabling this P2.");
191 
			} else {
192 
				$a_phase1[$togglebtn]['disabled'] = true;
193 
			}
190 194 
		}
191 195 
	} else if (isset($togglebtnp2)) {
192 196 
		if (isset($a_phase2[$togglebtnp2]['disabled'])) {
src/usr/local/www/vpn_ipsec_phase1.php
442 442 
			}
443 443 
		}
444 444 
	}
445 
	if (is_array($old_ph1ent) && ipsec_vti($old_ph1ent) && $pconfig['disabled']) {
446 
		$input_errors[] = gettext("Cannot disable a Phase 1 with a child Phase 2 while the interface is assigned. Remove the interface assignment before disabling this P2.");
447 
	}
445 448 

  		




  446
  449
  
    
	if (!$input_errors) {


  		




  447
  450
  
    
		$ph1ent['ikeid'] = $pconfig['ikeid'];


  		












Also available in:  Unified diff