diff options
| author | sullrich <sullrich@pfsense.org> | 2009-09-21 11:28:51 -0400 |
|---|---|---|
| committer | sullrich <sullrich@pfsense.org> | 2009-09-21 11:28:51 -0400 |
| commit | b6db8ea3978e2c6b0bd39f59e20a742a8b596003 (patch) | |
| tree | 6c38aa646c49a817b0a94e07bcaf091ce78b7495 /usr/local/www/diag_backup.php | |
| parent | f94cf5f869b763ebbc71e5e72f6894aa51975489 (diff) | |
| download | pfsense-b6db8ea3978e2c6b0bd39f59e20a742a8b596003.zip pfsense-b6db8ea3978e2c6b0bd39f59e20a742a8b596003.tar.gz | |
Check for interfaces with same name as alias. Ticket #92
Diffstat (limited to 'usr/local/www/diag_backup.php')
| -rwxr-xr-x | usr/local/www/diag_backup.php | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index c66af08..bb8a533 100755 --- a/usr/local/www/diag_backup.php +++ b/usr/local/www/diag_backup.php @@ -318,6 +318,24 @@ if ($_POST) { if(is_array($ifdescrs)) foreach($ifdescrs as $iface) $config['interfaces'][$iface]['descr'] = remove_bad_chars($config['interfaces'][$iface]['descr']); + /* check for interface names with an alias */ + if(is_array($ifdescrs)) { + foreach($ifdescrs as $iface) { + if(is_alias($config['interfaces'][$iface]['descr'])) { + // 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); + // 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); + // Alias in an alias + update_alias_names_upon_change('aliases', 'alias', 'address', '', $newname); + } + } + } unlink_if_exists("{$g['tmp_path']}/config.cache"); // Reset configuration version to something low // in order to force the config upgrade code to |
