aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2012-06-14 20:24:43 +0000
committerErmal <eri@pfsense.org>2012-06-14 20:24:43 +0000
commit16b98ddca1d3129bbf6f327399c517fa0991a7cd (patch)
tree3b72f886dafbd76f6cf36a9f3302d0cba9db5376 /config
parentb389449104dc6b6a83902d83b3448bfa217215ee (diff)
downloadpfsense-packages-16b98ddca1d3129bbf6f327399c517fa0991a7cd.tar.gz
pfsense-packages-16b98ddca1d3129bbf6f327399c517fa0991a7cd.tar.bz2
pfsense-packages-16b98ddca1d3129bbf6f327399c517fa0991a7cd.zip
Revert "Preserve already configured settings for the instance"
This reverts commit 79822b6a62e78d29c6edd100fb0f784759174a25.
Diffstat (limited to 'config')
-rw-r--r--config/snort/snort_interfaces_edit.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/snort/snort_interfaces_edit.php b/config/snort/snort_interfaces_edit.php
index 23409bda..182d0e76 100644
--- a/config/snort/snort_interfaces_edit.php
+++ b/config/snort/snort_interfaces_edit.php
@@ -285,7 +285,7 @@ if (isset($_GET['dup']))
if (isset($id) && $a_nat[$id]) {
if ($natent['interface'] != $a_nat[$id]['interface'])
Running_Stop($snort_uuid, $if_real, $id);
- $a_nat[$id] = array_merge($a_nat[$id], $natent);
+ $a_nat[$id] = $natent;
} else {
if (is_numeric($after))
array_splice($a_nat, $after+1, 0, array($natent));