diff options
| author | Ermal <eri@pfsense.org> | 2012-06-14 20:24:03 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2012-06-14 20:24:03 +0000 |
| commit | a0c8e27a82aa6ff3a9c739ef543dc3b90277c0f1 (patch) | |
| tree | ab5872617ef4f0d7575db936f66e9023a4ffe4df | |
| parent | 79822b6a62e78d29c6edd100fb0f784759174a25 (diff) | |
| download | pfsense-packages-a0c8e27a82aa6ff3a9c739ef543dc3b90277c0f1.tar.gz pfsense-packages-a0c8e27a82aa6ff3a9c739ef543dc3b90277c0f1.tar.bz2 pfsense-packages-a0c8e27a82aa6ff3a9c739ef543dc3b90277c0f1.zip | |
Revert "Do not override previous settings when configuring barnyard2"
This reverts commit a941d0447a2ff516d248fa1a7e02ce65827a275a.
| -rw-r--r-- | config/snort/snort_barnyard.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config/snort/snort_barnyard.php b/config/snort/snort_barnyard.php index c82e7316..b647c007 100644 --- a/config/snort/snort_barnyard.php +++ b/config/snort/snort_barnyard.php @@ -93,10 +93,9 @@ if ($_POST) { /* if no errors write to conf */ if (!$input_errors) { - if (isset($id) && $a_nat[$id]) - $natent = $a_nat[$id]; - else - $natent = array(); + $natent = array(); + /* repost the options already in conf */ + $natent = $pconfig; $natent['barnyard_enable'] = $_POST['barnyard_enable'] ? 'on' : 'off'; $natent['barnyard_mysql'] = $_POST['barnyard_mysql'] ? $_POST['barnyard_mysql'] : $pconfig['barnyard_mysql']; |