aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2012-06-14 20:20:32 +0000
committerErmal <eri@pfsense.org>2012-06-14 20:20:32 +0000
commit79822b6a62e78d29c6edd100fb0f784759174a25 (patch)
treec10283d1923e8a41abe7b3ac127c720d7bc2f94d /config
parent5e3a9fe4b075e54b2d0e5962d04eabc494f514fa (diff)
downloadpfsense-packages-79822b6a62e78d29c6edd100fb0f784759174a25.tar.gz
pfsense-packages-79822b6a62e78d29c6edd100fb0f784759174a25.tar.bz2
pfsense-packages-79822b6a62e78d29c6edd100fb0f784759174a25.zip
Preserve already configured settings for the instance
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 182d0e76..23409bda 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] = $natent;
+ $a_nat[$id] = array_merge($a_nat[$id], $natent);
} else {
if (is_numeric($after))
array_splice($a_nat, $after+1, 0, array($natent));