From 48d4f75261a48635bf2f4c7a727ed6397a4759e6 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 21 Apr 2017 18:25:16 +0200 Subject: [PATCH] openvpn: more reneg-sec spots to adjust --- src/www/vpn_openvpn_export.php | 2 +- src/www/vpn_openvpn_server.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/www/vpn_openvpn_export.php b/src/www/vpn_openvpn_export.php index e962ace63..7e1bde232 100644 --- a/src/www/vpn_openvpn_export.php +++ b/src/www/vpn_openvpn_export.php @@ -629,7 +629,7 @@ function openvpn_client_export_sharedkey_config($srvid, $useaddr, $proxy, $zipco $conf .= "auth {$digest}\n"; $conf .= "pull\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 .= "remote {$server_host} {$server_port}\n"; diff --git a/src/www/vpn_openvpn_server.php b/src/www/vpn_openvpn_server.php index 80f0daf26..571b56de3 100644 --- a/src/www/vpn_openvpn_server.php +++ b/src/www/vpn_openvpn_server.php @@ -318,7 +318,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $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."); } do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);