summaryrefslogtreecommitdiffstats
path: root/etc/inc/system.inc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-09-30 20:55:18 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-09-30 20:55:18 +0000
commit75eb801d190950e7ab998094b197639be0a23f12 (patch)
treec91473ab3f48bf207eca5c8cf3f7780724ade9c4 /etc/inc/system.inc
parentac3f8318b8351d5ae1b226b51344319ab24caadb (diff)
downloadpfsense-75eb801d190950e7ab998094b197639be0a23f12.zip
pfsense-75eb801d190950e7ab998094b197639be0a23f12.tar.gz
Sync with m0n0wall 1.2b10
Diffstat (limited to 'etc/inc/system.inc')
-rw-r--r--etc/inc/system.inc18
1 files changed, 2 insertions, 16 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 88bf7e3..2796354 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -60,29 +60,15 @@ 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) {
- if ($ns) {
-
+ if ($ns)
$resolvconf .= "nameserver $ns\n";
- $havedns = true;
- }
+ $havedns = true;
}
}
- $ns = str_replace("nameserver nameserver ", "nameserver ", $resolvconf);
-
fwrite($fd, $resolvconf);
fclose($fd);
OpenPOWER on IntegriCloud