Commit 42a52bed authored by Franco Fichtner's avatar Franco Fichtner

openvpn: more reneg-sec spots to adjust

(cherry picked from commit 48d4f752)
parent e0e58408
...@@ -629,7 +629,7 @@ function openvpn_client_export_sharedkey_config($srvid, $useaddr, $proxy, $zipco ...@@ -629,7 +629,7 @@ function openvpn_client_export_sharedkey_config($srvid, $useaddr, $proxy, $zipco
$conf .= "auth {$digest}\n"; $conf .= "auth {$digest}\n";
$conf .= "pull\n"; $conf .= "pull\n";
$conf .= "resolv-retry infinite\n"; $conf .= "resolv-retry infinite\n";
if (!empty($settings['reneg-sec'])) { if (isset($settings['reneg-sec']) && $settings['reneg-sec'] != "") {
$conf .= "reneg-sec {$settings['reneg-sec']}\n"; $conf .= "reneg-sec {$settings['reneg-sec']}\n";
} }
$conf .= "remote {$server_host} {$server_port}\n"; $conf .= "remote {$server_host} {$server_port}\n";
......
...@@ -318,7 +318,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -318,7 +318,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$input_errors[] = gettext("The Server Bridge DHCP range is invalid (start higher than end)."); $input_errors[] = gettext("The Server Bridge DHCP range is invalid (start higher than end).");
} }
} }
if (!empty($pconfig['reneg-sec']) && (string)((int)$pconfig['reneg-sec']) != $pconfig['reneg-sec']) { if (isset($pconfig['reneg-sec']) && (string)((int)$pconfig['reneg-sec']) != $pconfig['reneg-sec']) {
$input_errors[] = gettext("Renegotiate time should contain a valid number of seconds."); $input_errors[] = gettext("Renegotiate time should contain a valid number of seconds.");
} }
do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors); do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment