diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2009-09-21 19:13:41 -0400 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2009-09-21 19:13:41 -0400 |
commit | 581905c8aab38acdff8e364e4a138ae21e3ce1f5 (patch) | |
tree | 0c227980604bbe6a2bbcd24e5795bbce46057328 | |
parent | bca2d8ad649027f80aa5fb6e3d4b06b2f9e93f08 (diff) | |
download | pfsense-581905c8aab38acdff8e364e4a138ae21e3ce1f5.zip pfsense-581905c8aab38acdff8e364e4a138ae21e3ce1f5.tar.gz |
Pass origname instead of relying on a global
-rw-r--r-- | etc/inc/pfsense-utils.inc | 4 | ||||
-rwxr-xr-x | usr/local/www/diag_backup.php | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 889575c..a379906 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -3870,8 +3870,8 @@ function is_fqdn($fqdn) { return($hostname); } -function update_alias_names_upon_change($section, $subsection, $fielda, $fieldb, $new_alias_name) { - global $g, $config, $pconfig, $origname, $debug; +function update_alias_names_upon_change($section, $subsection, $fielda, $fieldb, $new_alias_name, $origname) { + global $g, $config, $pconfig, $debug; if(!$origname) return; diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index 88fdeea..bc30597 100755 --- a/usr/local/www/diag_backup.php +++ b/usr/local/www/diag_backup.php @@ -211,14 +211,14 @@ if ($_POST) { // Firewall rules $origname = $config['interfaces'][$iface]['descr']; $newname = $config['interfaces'][$iface]['descr'] . "Alias"; - update_alias_names_upon_change('filter', 'rule', 'source', 'address', $newname); - update_alias_names_upon_change('filter', 'rule', 'destination', 'address', $newname); + update_alias_names_upon_change('filter', 'rule', 'source', 'address', $newname, $origname); + update_alias_names_upon_change('filter', 'rule', 'destination', 'address', $newname, $origname); // NAT Rules - update_alias_names_upon_change('nat', 'rule', 'target', '', $newname); - update_alias_names_upon_change('nat', 'rule', 'external-port', '', $newname); - update_alias_names_upon_change('nat', 'rule', 'local-port', '', $newname); + update_alias_names_upon_change('nat', 'rule', 'target', '', $newname, $origname); + update_alias_names_upon_change('nat', 'rule', 'external-port', '', $newname, $origname); + update_alias_names_upon_change('nat', 'rule', 'local-port', '', $newname, $origname); // Alias in an alias - update_alias_names_upon_change('aliases', 'alias', 'address', '', $newname); + update_alias_names_upon_change('aliases', 'alias', 'address', '', $newname, $origname); } } } |