mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Add get_nameservers() which processes /var/etc/nameserver_$interface

Browse Source 
* Use get_nameservers() instead of nameserver.conf since we may be in a multi-wan situation
* Only populate $master_list when item is <> ""
This commit is contained in:
Scott Ullrich 2005-12-04 18:32:28 +00:00
parent d6ee4ccf44
commit 3d00ccaaab
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
etc/inc/system.inc
View File

@ -53,17 +53,11 @@ function system_resolvconf_generate($dynupdate = false) {
if (isset($syscfg['dnsallowoverride'])) {
/* get dynamically assigned DNS servers (if any) */
$nfd = @fopen("{$g['varetc_path']}/nameservers.conf", "r");
if ($nfd) {
while (!feof($nfd)) {
$dnss = trim(fgets($nfd));
if ($dnss) {
$resolvconf .= "nameserver $dnss\n";
$havedns = true;
}
}
fclose($nfd);
}
$ns = get_nameservers();
foreach($ns as $nameserver) {
$resolvconf .= "nameserver $nameserver\n";
$havedns = true;
}
}
if (!$havedns && is_array($syscfg['dnsserver'])) {
foreach ($syscfg['dnsserver'] as $ns) {
@ -85,6 +79,19 @@ function system_resolvconf_generate($dynupdate = false) {
return 0;
}
function get_nameservers() {
global $config, $g;
$master_list = array();
$dns_lists = split("\n", `ls /var/etc/nameserver_*`);
foreach($dns_lists as $dns) {
$items = split("\n", file_get_contents($dns));
foreach($items as $item)
if($item <> "")
$master_list[] = $item;
}
return $master_list;
}
function system_hosts_generate() {
global $config, $g;
if(isset($config['system']['developerspew'])) {