aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2012-07-13 05:15:07 +0000
committerErmal <eri@pfsense.org>2012-07-13 05:15:07 +0000
commit1f27866e955b1ea27a77de07e5dae9edc7896679 (patch)
tree01c22ef33aa95deda4d08d6fc001c7d5f78abbdc
parent119732ffe8f773538adc2fd5db74a004a4afe3f2 (diff)
downloadpfsense-packages-1f27866e955b1ea27a77de07e5dae9edc7896679.tar.gz
pfsense-packages-1f27866e955b1ea27a77de07e5dae9edc7896679.tar.bz2
pfsense-packages-1f27866e955b1ea27a77de07e5dae9edc7896679.zip
No need for all these output log configuration
-rw-r--r--config/snort/snort_interfaces_edit.php31
-rw-r--r--config/snort/snort_interfaces_global.php21
2 files changed, 0 insertions, 52 deletions
diff --git a/config/snort/snort_interfaces_edit.php b/config/snort/snort_interfaces_edit.php
index 06a1d6f4..dc9c4601 100644
--- a/config/snort/snort_interfaces_edit.php
+++ b/config/snort/snort_interfaces_edit.php
@@ -100,11 +100,7 @@ if ($_POST["Submit"]) {
if ($_POST['homelistname']) $natent['homelistname'] = $_POST['homelistname']; else unset($natent['homelistname']);
if ($_POST['externallistname']) $natent['externallistname'] = $_POST['externallistname']; else unset($natent['externallistname']);
if ($_POST['suppresslistname']) $natent['suppresslistname'] = $_POST['suppresslistname']; else unset($natent['suppresslistname']);
- if ($_POST['snortalertlogtype']) $natent['snortalertlogtype'] = $_POST['snortalertlogtype']; else $pconfig['snortalertlogtype'];
if ($_POST['alertsystemlog'] == "on") { $natent['alertsystemlog'] = 'on'; }else{ $natent['alertsystemlog'] = 'off'; }
- if ($_POST['enable']) { $natent['enable'] = 'on'; } else unset($natent['enable']);
- if ($_POST['tcpdumplog'] == "on") { $natent['tcpdumplog'] = 'on'; } else{ $natent['tcpdumplog'] = 'off'; }
- if ($_POST['snortunifiedlog'] == "on") { $natent['snortunifiedlog'] = 'on'; }else{ $natent['snortunifiedlog'] = 'off'; }
if ($_POST['configpassthru']) $natent['configpassthru'] = base64_encode($_POST['configpassthru']); else unset($natent['configpassthru']);
if ($_POST['cksumcheck']) $natent['cksumcheck'] = 'on'; else $natent['cksumcheck'] = 'off';
@@ -160,8 +156,6 @@ function enable_change(enable_change) {
document.iform.externallistname.disabled = endis;
document.iform.homelistname.disabled = endis;
document.iform.suppresslistname.disabled = endis;
- document.iform.tcpdumplog.disabled = endis;
- document.iform.snortunifiedlog.disabled = endis;
document.iform.configpassthru.disabled = endis;
}
//-->
@@ -404,10 +398,6 @@ function enable_change(enable_change) {
</td>
</tr>
<tr>
- <td colspan="2" valign="top" class="listtopic">Choose the types of
- logs snort should create.</td>
- </tr>
- <tr>
<td width="22%" valign="top" class="vncell">Send alerts to main
System logs</td>
<td width="78%" class="vtable"><input name="alertsystemlog"
@@ -416,27 +406,6 @@ function enable_change(enable_change) {
onClick="enable_change(false)"><br>
Snort will send Alerts to the firewall's system logs.</td>
</tr>
- <tr>
- <td width="22%" valign="top" class="vncell">Log to a Tcpdump file</td>
- <td width="78%" class="vtable"><input name="tcpdumplog"
- type="checkbox" value="on"
- <?php if ($pconfig['tcpdumplog'] == "on") echo "checked"; ?>
- onClick="enable_change(false)"><br>
- Snort will log packets to a tcpdump-formatted file. The file then
- can be analyzed by an application such as Wireshark which
- understands pcap file formats. <span class="red"><strong>WARNING:</strong></span><br/>
- File may become large.</td>
- </tr>
- <tr>
- <td width="22%" valign="top" class="vncell">Log Alerts to a snort
- unified2 file</td>
- <td width="78%" class="vtable"><input name="snortunifiedlog"
- type="checkbox" value="on"
- <?php if ($pconfig['snortunifiedlog'] == "on") echo "checked"; ?>
- onClick="enable_change(false)"><br>
- Snort will log Alerts to a file in the UNIFIED2 format. This is a
- requirement for barnyard2.</td>
-</tr>
<tr>
<td colspan="2" valign="top" class="listtopic">Arguments here will
be automatically inserted into the snort configuration.</td>
diff --git a/config/snort/snort_interfaces_global.php b/config/snort/snort_interfaces_global.php
index 7b2bc6c7..005e1fdd 100644
--- a/config/snort/snort_interfaces_global.php
+++ b/config/snort/snort_interfaces_global.php
@@ -49,7 +49,6 @@ $pconfig['rm_blocked'] = $config['installedpackages']['snortglobal']['rm_blocked
$pconfig['snortloglimit'] = $config['installedpackages']['snortglobal']['snortloglimit'];
$pconfig['snortloglimitsize'] = $config['installedpackages']['snortglobal']['snortloglimitsize'];
$pconfig['autorulesupdate7'] = $config['installedpackages']['snortglobal']['autorulesupdate7'];
-$pconfig['snortalertlogtype'] = $config['installedpackages']['snortglobal']['snortalertlogtype'];
$pconfig['forcekeepsettings'] = $config['installedpackages']['snortglobal']['forcekeepsettings'];
/* if no errors move foward */
@@ -72,7 +71,6 @@ if (!$input_errors) {
$config['installedpackages']['snortglobal']['snortloglimitsize'] = $snortloglimitDSKsize;
}
$config['installedpackages']['snortglobal']['autorulesupdate7'] = $_POST['autorulesupdate7'];
- $config['installedpackages']['snortglobal']['snortalertlogtype'] = $_POST['snortalertlogtype'];
$config['installedpackages']['snortglobal']['forcekeepsettings'] = $_POST['forcekeepsettings'] ? 'on' : 'off';
$retval = 0;
@@ -328,25 +326,6 @@ if ($input_errors)
Hint: in most cases, 1 hour is a good choice.</span></td>
</tr>
<tr>
- <td width="22%" valign="top" class="vncell">Alerts file description
- type</td>
- <td width="78%" class="vtable">
- <select name="snortalertlogtype" class="formselect" id="snortalertlogtype">
- <?php
- $logtype = array('full' => 'FULL', 'fast' => 'SHORT');
- foreach ($logtype as $logt => $logdescr): ?>
- <option value="<?=$logt;?>"
- <?php if ($logt == $pconfig['snortalertlogtype']) echo "selected"; ?>>
- <?=htmlspecialchars($logdescr);?></option>
- <?php endforeach; ?>
- </select><br>
- <span class="vexpl">Please choose the type of Alert logging you will
- like see in your alert file.<br>
- Hint: Best pratice is to chose full logging.</span>&nbsp;<span
- class="red"><strong>WARNING:</strong></span>&nbsp;<strong>On
- change, alert file will be cleared.</strong></td>
-</tr>
-<tr>
<td width="22%" valign="top" class="vncell">Keep snort settings
after deinstall</td>
<td width="78%" class="vtable"><input name="forcekeepsettings"