diff options
| author | jim-p <jimp@pfsense.org> | 2017-05-22 13:35:29 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2017-05-22 13:35:29 -0400 |
| commit | 919a0f4a4b8ec00693811d3bfb8cdbc05802da30 (patch) | |
| tree | 9a0f2d5bd5f2db4f64d88f91737d5d54a74702c9 /src | |
| parent | 473f7ec48f7510a60ade574ef32b09f4abaa6b9a (diff) | |
| download | pfsense-919a0f4a4b8ec00693811d3bfb8cdbc05802da30.zip pfsense-919a0f4a4b8ec00693811d3bfb8cdbc05802da30.tar.gz | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/openvpn.inc | 4 | ||||
| -rw-r--r-- | src/usr/local/www/vpn_openvpn_client.php | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc index ee56e49..cce84bd 100644 --- a/src/etc/inc/openvpn.inc +++ b/src/etc/inc/openvpn.inc @@ -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"; } diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php index d543ece..a02517f 100644 --- a/src/usr/local/www/vpn_openvpn_client.php +++ b/src/usr/local/www/vpn_openvpn_client.php @@ -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', |
