summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-08-03 23:10:26 -0500
committerChris Buechler <cmb@pfsense.org>2015-08-03 23:13:42 -0500
commit24850bca184ba103fad984da638fe7252071d1af (patch)
tree4dc8c7450c6f1e2983d3ea3fe11f9cabb069000e /etc
parent2ab104683752f515206c1be055c18b4d83318e80 (diff)
downloadpfsense-24850bca184ba103fad984da638fe7252071d1af.zip
pfsense-24850bca184ba103fad984da638fe7252071d1af.tar.gz
only read file if it exists, and only foreach if an array.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/pfsense-utils.inc21
1 files changed, 13 insertions, 8 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 49eeb01..b9e2cc9 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -126,19 +126,24 @@ function get_tmp_file() {
/****f* pfsense-utils/get_dns_servers
* NAME
- * get_dns_servres - get system dns servers
+ * get_dns_servers - get system dns servers
* INPUTS
- * $dns_servers - an array of the dns servers
+ * none
* RESULT
- * null
+ * $dns_servers - an array of the dns servers
******/
function get_dns_servers() {
$dns_servers = array();
- $dns_s = file("/etc/resolv.conf", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
- foreach($dns_s as $dns) {
- $matches = "";
- if (preg_match("/nameserver (.*)/", $dns, $matches))
- $dns_servers[] = $matches[1];
+ if (file_exists("/etc/resolv.conf")) {
+ $dns_s = file("/etc/resolv.conf", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+ }
+ if (is_array($dns_s)) {
+ foreach ($dns_s as $dns) {
+ $matches = "";
+ if (preg_match("/nameserver (.*)/", $dns, $matches)) {
+ $dns_servers[] = $matches[1];
+ }
+ }
}
return array_unique($dns_servers);
}
OpenPOWER on IntegriCloud