summaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorJeb Campbell <jeb-c4@pfsense.org>2005-08-30 19:12:56 +0000
committerJeb Campbell <jeb-c4@pfsense.org>2005-08-30 19:12:56 +0000
commitaad37fd2147b6994f7ded269290776982ca75290 (patch)
treeb9011895aeeb8b8eb11300c6e79adf551fb5ff8d /etc/inc
parent03af9b1a76337fb19370920705ca9629ad8c1405 (diff)
downloadpfsense-aad37fd2147b6994f7ded269290776982ca75290.zip
pfsense-aad37fd2147b6994f7ded269290776982ca75290.tar.gz
Dns from dhcp fixes for GG to test.
Diffstat (limited to 'etc/inc')
-rw-r--r--etc/inc/system.inc10
1 files changed, 10 insertions, 0 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 1283ba1..58e3794 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -60,6 +60,16 @@ function system_resolvconf_generate($dynupdate = false) {
}
fclose($nfd);
}
+ $nfd = @fopen("{$g['varetc_path']}/defaultdomain.conf", "r");
+ if ($nfd and $havedns) {
+ while (!feof($nfd)) {
+ $dnss = trim(fgets($nfd));
+ if ($dnss) {
+ $resolvconf .= "search $dnss\n";
+ }
+ }
+ fclose($nfd);
+ }
}
if (!$havedns && is_array($syscfg['dnsserver'])) {
foreach ($syscfg['dnsserver'] as $ns) {
OpenPOWER on IntegriCloud