aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2012-06-14 20:16:45 +0000
committerErmal <eri@pfsense.org>2012-06-14 20:16:45 +0000
commita941d0447a2ff516d248fa1a7e02ce65827a275a (patch)
tree5b2cf0f47749afcd85fc12c36f95813037f89f8c
parent55f994dd6272638960c4a3f703d8abaeed991b92 (diff)
downloadpfsense-packages-a941d0447a2ff516d248fa1a7e02ce65827a275a.tar.gz
pfsense-packages-a941d0447a2ff516d248fa1a7e02ce65827a275a.tar.bz2
pfsense-packages-a941d0447a2ff516d248fa1a7e02ce65827a275a.zip
Do not override previous settings when configuring barnyard2
-rw-r--r--config/snort/snort_barnyard.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/config/snort/snort_barnyard.php b/config/snort/snort_barnyard.php
index b647c007..c82e7316 100644
--- a/config/snort/snort_barnyard.php
+++ b/config/snort/snort_barnyard.php
@@ -93,9 +93,10 @@ if ($_POST) {
/* if no errors write to conf */
if (!$input_errors) {
- $natent = array();
- /* repost the options already in conf */
- $natent = $pconfig;
+ if (isset($id) && $a_nat[$id])
+ $natent = $a_nat[$id];
+ else
+ $natent = array();
$natent['barnyard_enable'] = $_POST['barnyard_enable'] ? 'on' : 'off';
$natent['barnyard_mysql'] = $_POST['barnyard_mysql'] ? $_POST['barnyard_mysql'] : $pconfig['barnyard_mysql'];