summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitriy K. <levantin@mail.nnov.ru>2014-08-20 16:50:56 +0400
committerDmitriy K. <levantin@mail.nnov.ru>2014-08-20 16:50:56 +0400
commitc38764dc0494463b06f70c7ef8e249629a922134 (patch)
tree1a82364de55130b3f306b704decb7975d71ba110
parent847fe304129c637753dc8cb01b86e0e1cdf2dbf6 (diff)
downloadpfsense-c38764dc0494463b06f70c7ef8e249629a922134.zip
pfsense-c38764dc0494463b06f70c7ef8e249629a922134.tar.gz
fix #3515
-rw-r--r--etc/inc/openvpn.inc3
-rw-r--r--usr/local/www/vpn_openvpn_server.php25
2 files changed, 28 insertions, 0 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index 6ac92fa..c7d918c 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -350,6 +350,9 @@ function openvpn_add_dhcpopts(& $settings, & $conf) {
if (!empty($settings['dns_server4']))
$conf .= "push \"dhcp-option DNS {$settings['dns_server4']}\"\n";
+ if (!empty($settings['push_register_dns']))
+ $conf .= "push \"register-dns\"\n";
+
if (!empty($settings['ntp_server1']))
$conf .= "push \"dhcp-option NTP {$settings['ntp_server1']}\"\n";
if (!empty($settings['ntp_server2']))
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php
index 9c74992..345a861 100644
--- a/usr/local/www/vpn_openvpn_server.php
+++ b/usr/local/www/vpn_openvpn_server.php
@@ -212,6 +212,8 @@ if($_GET['act']=="edit"){
$pconfig['verbosity_level'] = $a_server[$id]['verbosity_level'];
else
$pconfig['verbosity_level'] = 1; // Default verbosity is 1
+
+ $pconfig['push_register_dns'] = $a_server[$id]['push_register_dns'];
}
}
if ($_POST) {
@@ -427,6 +429,9 @@ if ($_POST) {
$server['dns_server4'] = $pconfig['dns_server4'];
}
+ if ($pconfig['push_register_dns'])
+ $server['push_register_dns'] = $pconfig['push_register_dns'];
+
if ($pconfig['ntp_server_enable']) {
$server['ntp_server1'] = $pconfig['ntp_server1'];
$server['ntp_server2'] = $pconfig['ntp_server2'];
@@ -1576,6 +1581,26 @@ if ($savemsg)
</table>
</td>
</tr>
+
+ <tr id="chkboxPushRegisterDNS">
+ <td width="22%" valign="top" class="vncell"><?=gettext("Force DNS cache update"); ?></td>
+ <td width="78%" class="vtable">
+ <table border="0" cellpadding="2" cellspacing="0" summary="push register dns">
+ <tr>
+ <td>
+ <?php set_checked($pconfig['push_register_dns'],$chk); ?>
+ <input name="push_register_dns" type="checkbox" value="yes" <?=$chk;?> />
+ </td>
+ <td>
+ <span class="vexpl">
+ <?=gettext("Run ''net stop dnscache'', ''net start dnscache'', ''ipconfig /flushdns'' and ''ipconfig /registerdns'' on connection initiation. This is known to kick Windows into recognizing pushed DNS servers."); ?><br />
+ </span>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
<tr>
<td width="22%" valign="top" class="vncell"><?=gettext("NTP Servers"); ?></td>
<td width="78%" class="vtable">
OpenPOWER on IntegriCloud