summaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorBill Marquette <billm@pfsense.org>2005-05-23 01:16:13 +0000
committerBill Marquette <billm@pfsense.org>2005-05-23 01:16:13 +0000
commit918a884d8dc141f41e8f6019c1f1d4838a5c35c5 (patch)
tree62949eeca4a4c6c104eb48ff0a770c1b72360b1e /etc/inc
parent309d4ef4b34934e09f027c7835b56053c4ed1422 (diff)
downloadpfsense-918a884d8dc141f41e8f6019c1f1d4838a5c35c5.zip
pfsense-918a884d8dc141f41e8f6019c1f1d4838a5c35c5.tar.gz
fix aliases
Diffstat (limited to 'etc/inc')
-rw-r--r--etc/inc/config.inc5
-rw-r--r--etc/inc/util.inc4
2 files changed, 5 insertions, 4 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 83688bd..811a489 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -179,6 +179,7 @@ function parse_config($parse = false) {
/* ugly hack! config.cache is really borked. don't use until its fixed. */
//$config = parse_xml_config($g['conf_path'] . '/config.xml', $g['xml_rootobj']);
+ alias_make_table($config);
config_unlock();
return $config;
}
@@ -236,7 +237,7 @@ EOD;
}
/* make alias table (for faster lookups) */
- alias_make_table();
+ alias_make_table($config);
config_unlock();
}
@@ -1080,4 +1081,4 @@ function unmute_kernel_msgs() {
exec("/sbin/conscontrol mute off");
}
-?> \ No newline at end of file
+?>
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 163645f..fcd1f98 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -298,9 +298,9 @@ function unlink_if_exists($fn) {
}
/* make a global alias table (for faster lookups) */
-function alias_make_table() {
+function alias_make_table($config) {
- global $config, $g, $aliastable;
+ global $aliastable;
$aliastable = array();
OpenPOWER on IntegriCloud