Projet

Général

Profil

« Précédent | Suivant » 

Révision 3b9ef0ef

Ajouté par Ermal il y a plus de 9 ans

Inverse the sense of the toggles to avoid configuration upgrades

Voir les différences:

etc/inc/vpn.inc
616 616
				$left_spec = $ep;
617 617

  
618 618
				if (isset($ph1ent['reauth_enable']))
619
					$reauth = "reauth = yes";
620
				else
621 619
					$reauth = "reauth = no";
622
				if (isset($ph1ent['rekey_enable']))
623
					$rekey = "rekey = yes";
624 620
				else
621
					$reauth = "reauth = yes";
622
				if (isset($ph1ent['rekey_enable']))
625 623
					$rekey = "rekey = no";
624
				else
625
					$rekey = "rekey = yes";
626 626

  
627 627
				$ipseclifetime = 0;
628 628
				$rightsubnet_spec = array();
usr/local/www/vpn_ipsec_phase1.php
107 107
	$pconfig['descr'] = $a_phase1[$p1index]['descr'];
108 108
	$pconfig['nat_traversal'] = $a_phase1[$p1index]['nat_traversal'];
109 109

  
110
	if (isset($a_phase1[$p1index]['reauth_enable']))
110
	if (!isset($a_phase1[$p1index]['reauth_enable']))
111 111
		$pconfig['reauth_enable'] = true;
112
	if (isset($a_phase1[$p1index]['rekey_enable']))
112
	if (!isset($a_phase1[$p1index]['rekey_enable']))
113 113
		$pconfig['rekey_enable'] = true;
114 114

  
115 115
	if ($a_phase1[$p1index]['dpd_delay'] &&	$a_phase1[$p1index]['dpd_maxfail']) {
......
133 133
	$pconfig['lifetime'] = "28800";
134 134
	$pconfig['nat_traversal'] = "on";
135 135
	$pconfig['dpd_enable'] = true;
136
	$pconfig['rekey_enable'] = true;
137
	$pconfig['reauth_enable'] = true;
138 136
	$pconfig['iketype'] = "ikev1";
139 137

  
140 138
	/* mobile client */
......
845 843
						<td colspan="2" valign="top" class="listtopic"><?=gettext("Advanced Options"); ?></td>
846 844
					</tr>
847 845
					<tr>
848
						<td width="22%" valign="top" class="vncell"><?=gettext("Rekey");?></td>
846
						<td width="22%" valign="top" class="vncell"><?=gettext("Disable Rekey");?></td>
849 847
						<td width="78%" class="vtable">
850 848
							<input name="rekey_enable" type="checkbox" id="rekey_enable" value="yes" <?php if (isset($pconfig['rekey_enable'])) echo "checked=\"checked\""; ?> />
851 849
							<?=gettext("Whether a connection should be renegotiated when it is about to expire."); ?><br />
852 850
						</td>
853 851
					</tr>
854 852
					<tr>
855
						<td width="22%" valign="top" class="vncell"><?=gettext("Reauth");?></td>
853
						<td width="22%" valign="top" class="vncell"><?=gettext("Disable Reauth");?></td>
856 854
						<td width="78%" class="vtable">
857 855
							<input name="reauth_enable" type="checkbox" id="reauth_enable" value="yes" <?php if (isset($pconfig['reauth_enable'])) echo "checked=\"checked\""; ?> />
858 856
							<?=gettext("whether rekeying of an IKE_SA should also reauthenticate the peer. In IKEv1, reauthentication is always don.."); ?><br />

Formats disponibles : Unified diff