summaryrefslogtreecommitdiffstats
path: root/etc/inc/system.inc
diff options
context:
space:
mode:
authorWarren Baker <warren@decoy.co.za>2014-01-29 17:06:42 +0200
committerWarren Baker <warren@decoy.co.za>2014-01-29 17:06:42 +0200
commit3b95d9ece3fdbd15ceab1289b63fc37f17649e91 (patch)
treeede25d9800c2083133175648ba083c6a248f9963 /etc/inc/system.inc
parent7ed0e844a61f0e77cec7596429df9ac0c639a6d7 (diff)
downloadpfsense-3b95d9ece3fdbd15ceab1289b63fc37f17649e91.zip
pfsense-3b95d9ece3fdbd15ceab1289b63fc37f17649e91.tar.gz
Add EDNS support for to resolv.conf
Diffstat (limited to 'etc/inc/system.inc')
-rw-r--r--etc/inc/system.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 46b1b85..80cb89c 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -103,7 +103,7 @@ function system_resolvconf_generate($dynupdate = false) {
if($syscfg['domain'])
$resolvconf = "domain {$syscfg['domain']}\n";
- if (isset($config['dnsmasq']['enable']) && !isset($config['system']['dnslocalhost']))
+ if ((isset($config['dnsmasq']['enable']) || isset($config['unbound']['enable'])) && !isset($config['system']['dnslocalhost']))
$resolvconf .= "nameserver 127.0.0.1\n";
if (isset($syscfg['dnsallowoverride'])) {
@@ -126,6 +126,10 @@ function system_resolvconf_generate($dynupdate = false) {
}
}
+ // Add EDNS support
+ if (isset($config['unbound']['enable']) && isset($config['unbound']['edns']))
+ $resolvconf .= "options edns0\n";
+
$dnslock = lock('resolvconf', LOCK_EX);
$fd = fopen("{$g['varetc_path']}/resolv.conf", "w");
OpenPOWER on IntegriCloud