From 1f8a72fbf8f59482b4b7d471417d965b945fb361 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Wed, 3 Aug 2011 21:02:49 +0000
Subject: Correct the whitelist selection saving

---
 config/snort/snort.inc                 | 2 +-
 config/snort/snort_interfaces_edit.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'config/snort')

diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index f6c49ffd..52b61ade 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -1150,7 +1150,7 @@ function create_snort_suppress($id, $if_real) {
 		$suppress_file_name = $config['installedpackages']['snortglobal']['suppress']['item'][$whitelist_key_s]['name'];
 
 		/* Message */
-		$s_data .= '# This file is auto generated by the snort package. Please do not edit this file by hand.' . "\n\n";
+		$s_data = '# This file is auto generated by the snort package. Please do not edit this file by hand.' . "\n\n";
 
 		/* user added arguments */
 		$s_data .= str_replace("\r", "", base64_decode($config['installedpackages']['snortglobal']['suppress']['item'][$whitelist_key_s]['suppresspassthru']));
diff --git a/config/snort/snort_interfaces_edit.php b/config/snort/snort_interfaces_edit.php
index 7a2e5db4..c843a3f7 100644
--- a/config/snort/snort_interfaces_edit.php
+++ b/config/snort/snort_interfaces_edit.php
@@ -597,14 +597,14 @@ function enable_change(enable_change) {
 			<tr>
 				<td width="22%" valign="top" class="vncell2">Whitelist</td>
 				<td width="78%" class="vtable">
-					<select name="whitelist" class="formfld" id="whitelistname">
+					<select name="whitelistname" class="formfld" id="whitelistname">
 				<?php
 					/* find whitelist names and filter by type, make sure to track by uuid */
 					echo "<option value='default' >default</option>\n";
 					if (is_array($config['installedpackages']['snortglobal']['whitelist']['item'])) {
 						foreach ($config['installedpackages']['snortglobal']['whitelist']['item'] as $value) {
 							if ($value['snortlisttype'] == 'whitelist') {
-								if ($value['name'] == $pconfig['whitelist'])
+								if ($value['name'] == $pconfig['whitelistname'])
 									echo "<option value='{$value['name']}' selected>";
 								else
 									echo "<option value='{$value['name']}'>";
-- 
cgit v1.2.3