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

Unbreak dns server colletion. Pointyhat: myself

Browse Source
This commit is contained in:
Ermal 2011-01-04 18:32:52 +00:00
parent abe7607f69
commit 807fd6cd35
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
etc/inc/system.inc
View File

@ -160,9 +160,14 @@ function get_searchdomains() {
// Read in dhclient nameservers
$search_list = glob("/var/etc/searchdomain_*");
if (is_array($search_lists)) {
foreach($search_lists as $dns) {
if(is_hostname($dns))
$master_list[] = $dns;
foreach($search_lists as $fdns) {
$contents = file($fdns, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
if (!is_array($contents))
continue;
foreach ($contents as $dns) {
if(is_hostname($dns))
$master_list[] = $dns;
}
}
}
@ -176,9 +181,14 @@ function get_nameservers() {
// Read in dhclient nameservers
$dns_lists = glob("/var/etc/nameserver_*");
if (is_array($dns_lists)) {
foreach($dns_lists as $dns) {
if(is_ipaddr($dns))
$master_list[] = $dns;
foreach($dns_lists as $fdns) {
$contents = file($fdns, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
if (!is_array($contents))
continue;
foreach ($contents as $dns) {
if(is_ipaddr($dns))
$master_list[] = $dns;
}
}
}