diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-03-25 08:49:04 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-03-25 08:49:04 -0300 |
| commit | 54bdff758f68e2e1b1ebd42b8b0b629b68ed1a3d (patch) | |
| tree | 27b7d45e582e3d84cdf8d0fa0f3bc93b65f3c986 /etc/inc/openvpn.inc | |
| parent | b845290619244e8cfe3bc2aa6271c6629eeb86b5 (diff) | |
| parent | 401fb0ad8fa7ad06743435808dac8e913b3c16bb (diff) | |
| download | pfsense-54bdff758f68e2e1b1ebd42b8b0b629b68ed1a3d.zip pfsense-54bdff758f68e2e1b1ebd42b8b0b629b68ed1a3d.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/auth.inc
etc/inc/config.lib.inc
etc/inc/filter.inc
etc/inc/pfsense-utils.inc
etc/inc/pkg-utils.inc
etc/inc/priv.defs.inc
etc/inc/services.inc
etc/inc/shaper.inc
etc/inc/voucher.inc
etc/inc/vpn.inc
usr/local/www/fbegin.inc
Diffstat (limited to 'etc/inc/openvpn.inc')
| -rw-r--r-- | etc/inc/openvpn.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 9101c04..1d9b9b0 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -228,9 +228,9 @@ function openvpn_add_dhcpopts(& $settings, & $conf) { $conf .= "push \"dhcp-option DNS {$settings['dns_server4']}\"\n"; if (!empty($settings['ntp_server1'])) - $conf .= "push \"dhcp-option NTP {$settings['dhcp_ntp']}\"\n"; + $conf .= "push \"dhcp-option NTP {$settings['ntp_server1']}\"\n"; if (!empty($settings['ntp_server2'])) - $conf .= "push \"dhcp-option NTP {$settings['dhcp_ntp']}\"\n"; + $conf .= "push \"dhcp-option NTP {$settings['ntp_server2']}\"\n"; if ($settings['netbios_enable']) { |
