aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbmeeks8 <bmeeks8@bellsouth.net>2014-04-17 17:19:16 -0400
committerErmal <eri@pfsense.org>2014-04-28 08:03:39 +0000
commit20249fe233afa9b42193a9249ecf4cac21ead9f4 (patch)
treed7d9e55e7275cc8caaad962bd7be5a576d4ae525
parentf514922afc4281dc71515e7d81b175cb88a6abed (diff)
downloadpfsense-packages-20249fe233afa9b42193a9249ecf4cac21ead9f4.tar.gz
pfsense-packages-20249fe233afa9b42193a9249ecf4cac21ead9f4.tar.bz2
pfsense-packages-20249fe233afa9b42193a9249ecf4cac21ead9f4.zip
Add param to disable sig_reference table updates and fix root login bug.
-rwxr-xr-xconfig/snort/snort.inc4
-rw-r--r--config/snort/snort_barnyard.php10
2 files changed, 13 insertions, 1 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index e82a6a1c..210f42f8 100755
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -1987,7 +1987,9 @@ function snort_generate_barnyard2_conf($snortcfg, $if_real) {
$by2_dbpwd = base64_decode($snortcfg['barnyard_dbpwd']);
$snortbarnyardlog_output_plugins .= "# database: log to a MySQL DB\noutput database: log, mysql, ";
if (isset($snortcfg['barnyard_sensor_name']) && strlen($snortcfg['barnyard_sensor_name']) > 0)
- $snortbarnyardlog_output_plugins .= "sensor_name={$snortcfg['barnyard_sensor_name']}, ";
+ $snortbarnyardlog_output_plugins .= "sensor_name={$snortcfg['barnyard_sensor_name']} ";
+ if ($snortcfg['barnyard_disable_sig_ref_tbl'] == 'on')
+ $snortbarnyardlog_output_plugins .= "disable_signature_reference_table ";
$snortbarnyardlog_output_plugins .= "user={$snortcfg['barnyard_dbuser']} password={$by2_dbpwd} ";
$snortbarnyardlog_output_plugins .= "dbname={$snortcfg['barnyard_dbname']} host={$snortcfg['barnyard_dbhost']}\n\n";
}
diff --git a/config/snort/snort_barnyard.php b/config/snort/snort_barnyard.php
index 52e0a13b..a8418d7b 100644
--- a/config/snort/snort_barnyard.php
+++ b/config/snort/snort_barnyard.php
@@ -144,6 +144,7 @@ if ($_POST['save']) {
$natent['barnyard_syslog_enable'] = $_POST['barnyard_syslog_enable'] ? 'on' : 'off';
$natent['barnyard_syslog_local'] = $_POST['barnyard_syslog_local'] ? 'on' : 'off';
$natent['barnyard_bro_ids_enable'] = $_POST['barnyard_bro_ids_enable'] ? 'on' : 'off';
+ $natent['barnyard_disable_sig_ref_tbl'] = $_POST['barnyard_disable_sig_ref_tbl'] ? 'on' : 'off';
$natent['barnyard_syslog_opmode'] = $_POST['barnyard_syslog_opmode'];
$natent['barnyard_syslog_proto'] = $_POST['barnyard_syslog_proto'];
@@ -378,6 +379,14 @@ include_once("head.inc");
&nbsp;<?php echo gettext("Password for the MySQL database user"); ?>
</td>
</tr>
+ <tr>
+ <td width="22%" valign="top" class="vncell"><?php echo gettext("Disable Signature Reference Table"); ?></td>
+ <td width="78%" class="vtable">
+ <input name="barnyard_disable_sig_ref_tbl" type="checkbox" value="on" <?php if ($pconfig['barnyard_disable_sig_ref_tbl'] == "on") echo "checked"; ?>/>
+ <?php echo gettext("Disable synchronization of sig_reference table in schema. Default value is ") . "<strong>" . gettext("Not Checked") . "</strong>"; ?><br/>
+ <br/><?php echo gettext("This option will speedup the process when checked, plus it can help work around a 'duplicate entry' error when running multiple Snort instances."); ?>
+ </td>
+ </tr>
</tbody>
<tr>
<td colspan="2" valign="top" class="listtopic"><?php echo gettext("Syslog Output Settings"); ?></td>
@@ -608,6 +617,7 @@ function enable_change(enable_change) {
document.iform.barnyard_dbname.disabled = endis;
document.iform.barnyard_dbuser.disabled = endis;
document.iform.barnyard_dbpwd.disabled = endis;
+ document.iform.barnyard_disable_sig_ref_tbl.disabled = endis;
document.iform.barnyard_syslog_enable.disabled = endis;
document.iform.barnyard_syslog_local.disabled = endis;
document.iform.barnyard_syslog_opmode_default.disabled = endis;