mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

The logic for resolv-retry infinite was always setting it in client mode no matter what the GUI option wanted. Remove the GUI option and clean up the logic so it isn't duplicated. Fixes #7572

Browse Source
This commit is contained in:
jim-p 2017-05-22 13:35:29 -04:00
parent 473f7ec48f
commit 919a0f4a4b
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/etc/inc/openvpn.inc
View File

@ -1163,9 +1163,7 @@ function openvpn_reconfigure($mode, $settings) {
$conf .= "passtos\n";
}
if ($settings['resolve_retry']) {
$conf .= "resolv-retry infinite\n";
} else if ($mode == 'client') {
if ($mode == 'client') {
$conf .= "resolv-retry infinite\n";
}

10
src/usr/local/www/vpn_openvpn_client.php
View File

@ -119,7 +119,6 @@ if ($act == "edit") {
$pconfig['local_port'] = $a_client[$id]['local_port'];
$pconfig['server_addr'] = $a_client[$id]['server_addr'];
$pconfig['server_port'] = $a_client[$id]['server_port'];
$pconfig['resolve_retry'] = $a_client[$id]['resolve_retry'];
$pconfig['proxy_addr'] = $a_client[$id]['proxy_addr'];
$pconfig['proxy_port'] = $a_client[$id]['proxy_port'];
$pconfig['proxy_user'] = $a_client[$id]['proxy_user'];
@ -401,7 +400,6 @@ if ($_POST['save']) {
$client['local_port'] = $pconfig['local_port'];
$client['server_addr'] = $pconfig['server_addr'];
$client['server_port'] = $pconfig['server_port'];
$client['resolve_retry'] = $pconfig['resolve_retry'];
$client['proxy_addr'] = $pconfig['proxy_addr'];
$client['proxy_port'] = $pconfig['proxy_port'];
$client['proxy_authtype'] = $pconfig['proxy_authtype'];
@ -558,14 +556,6 @@ if ($act=="new" || $act=="edit"):
$pconfig['server_addr']
))->setHelp("The IP address or hostname of the OpenVPN server.");
$section->addInput(new Form_Checkbox(
'resolve_retry',
'Server hostname resolution',
'Infinitely resolve server ',
$pconfig['resolve_retry']
))->setHelp('Continuously attempt to resolve the server host name. ' .
'Useful when communicating with a server that is not permanently connected to the Internet.');
$section->addInput(new Form_Input(
'server_port',
'*Server port',