Commit fc81da17 authored by Ad Schellevis's avatar Ad Schellevis

(legacy) some additional fixes for openvpn.inc

parent 0cf7517a
...@@ -296,7 +296,7 @@ function openvpn_add_dhcpopts(& $settings, & $conf) { ...@@ -296,7 +296,7 @@ function openvpn_add_dhcpopts(& $settings, & $conf) {
if (!empty($settings['ntp_server2'])) if (!empty($settings['ntp_server2']))
$conf .= "push \"dhcp-option NTP {$settings['ntp_server2']}\"\n"; $conf .= "push \"dhcp-option NTP {$settings['ntp_server2']}\"\n";
if ($settings['netbios_enable']) { if (!empty($settings['netbios_enable'])) {
if (!empty($settings['dhcp_nbttype']) && ($settings['dhcp_nbttype'] != 0)) if (!empty($settings['dhcp_nbttype']) && ($settings['dhcp_nbttype'] != 0))
$conf .= "push \"dhcp-option NBT {$settings['dhcp_nbttype']}\"\n"; $conf .= "push \"dhcp-option NBT {$settings['dhcp_nbttype']}\"\n";
if (!empty($settings['dhcp_nbtscope'])) if (!empty($settings['dhcp_nbtscope']))
...@@ -308,7 +308,7 @@ function openvpn_add_dhcpopts(& $settings, & $conf) { ...@@ -308,7 +308,7 @@ function openvpn_add_dhcpopts(& $settings, & $conf) {
$conf .= "push \"dhcp-option WINS {$settings['wins_server2']}\"\n"; $conf .= "push \"dhcp-option WINS {$settings['wins_server2']}\"\n";
} }
if ($settings['gwredir']) if (!empty($settings['gwredir']))
$conf .= "push \"redirect-gateway def1\"\n"; $conf .= "push \"redirect-gateway def1\"\n";
} }
...@@ -845,10 +845,10 @@ function openvpn_resync_csc(&$settings) ...@@ -845,10 +845,10 @@ function openvpn_resync_csc(&$settings)
openvpn_create_dirs(); openvpn_create_dirs();
$conf = ''; $conf = '';
if ($settings['block']) if (!empty($settings['block']))
$conf .= "disable\n"; $conf .= "disable\n";
if ($settings['push_reset']) if (!empty($settings['push_reset']))
$conf .= "push-reset\n"; $conf .= "push-reset\n";
if (!empty($settings['tunnel_network'])) { if (!empty($settings['tunnel_network'])) {
...@@ -881,7 +881,7 @@ function openvpn_resync_csc(&$settings) ...@@ -881,7 +881,7 @@ function openvpn_resync_csc(&$settings)
openvpn_add_dhcpopts($settings, $conf); openvpn_add_dhcpopts($settings, $conf);
if ($settings['gwredir']) if (!empty($settings['gwredir']))
$conf .= "push \"redirect-gateway def1\"\n"; $conf .= "push \"redirect-gateway def1\"\n";
openvpn_add_custom($settings, $conf); openvpn_add_custom($settings, $conf);
......
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