summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorBill Marquette <billm@pfsense.org>2006-09-05 02:33:31 +0000
committerBill Marquette <billm@pfsense.org>2006-09-05 02:33:31 +0000
commit9b00dc264c275fb66947a902e9ced29d191b2893 (patch)
tree509ee23546143300a6d0c81f8a999b023efab88b /etc
parentbc8c1e5616d30960db339e02a1f400b7fa39097c (diff)
downloadpfsense-9b00dc264c275fb66947a902e9ced29d191b2893.zip
pfsense-9b00dc264c275fb66947a902e9ced29d191b2893.tar.gz
MFC commit [14178]
Correctly handle multi-host aliases
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/util.inc10
1 files changed, 7 insertions, 3 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 5f64823..ebe0e3b 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -425,12 +425,16 @@ function alias_expand($name) {
/* expand a host alias, if necessary */
function alias_expand_host($name) {
-
global $aliastable;
- if (isset($aliastable[$name]) && is_ipaddr($aliastable[$name]))
+ if (isset($aliastable[$name])) {
+ $ip_arr = explode(" ", $aliastable[$name]);
+ foreach($ip_arr as $ip) {
+ if (!is_ipaddr($ip))
+ return null;
+ }
return $aliastable[$name];
- else if (is_ipaddr($name))
+ } else if (is_ipaddr($name))
return $name;
else
return null;
OpenPOWER on IntegriCloud