diff options
author | Scott Ullrich <sullrich@sullrich-MacBookPro.local> | 2009-03-08 15:27:34 -0400 |
---|---|---|
committer | Scott Ullrich <sullrich@sullrich-MacBookPro.local> | 2009-03-08 15:27:34 -0400 |
commit | 60951398f2ccd39fa6fda7f55c8fcb0f39dac437 (patch) | |
tree | 25cdc3cced348b95a5564433e690541524c73bd4 | |
parent | e6a5a0669c1cabdae53b2b9024b2de4af87c8a5b (diff) | |
download | pfsense-60951398f2ccd39fa6fda7f55c8fcb0f39dac437.zip pfsense-60951398f2ccd39fa6fda7f55c8fcb0f39dac437.tar.gz |
* Make sure that $dns_lists is populated before operating on the item
* Make sure that $dns is populated before operating on the item
-rw-r--r-- | etc/inc/system.inc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index afbc275..ab5bed7 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -119,11 +119,15 @@ function get_nameservers() { global $config, $g; $master_list = array(); $dns_lists = split("\n", `ls /var/etc/nameserver_* 2>/dev/null`); - foreach($dns_lists as $dns) { - $items = split("\n", file_get_contents($dns)); - foreach($items as $item) - if($item <> "") - $master_list[] = $item; + if($dns_lists) { + foreach($dns_lists as $dns) { + if(!$dns) + continue; + $items = split("\n", file_get_contents($dns)); + foreach($items as $item) + if($item <> "") + $master_list[] = $item; + } } if(!file_exists("/var/etc/nameservers.conf")) return $master_list; |