aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorbmeeks8 <bmeeks8@bellsouth.net>2014-04-18 09:50:09 -0400
committerErmal <eri@pfsense.org>2014-04-28 08:03:39 +0000
commitf3ce218cf26f0b4780bfa139eef5460c961d0f5b (patch)
tree48258a76ef4e485dd2aa50b1502d315005c1f246 /config
parent72b92fc14c0a5718a4b54afbde2121af6309db6a (diff)
downloadpfsense-packages-f3ce218cf26f0b4780bfa139eef5460c961d0f5b.tar.gz
pfsense-packages-f3ce218cf26f0b4780bfa139eef5460c961d0f5b.tar.bz2
pfsense-packages-f3ce218cf26f0b4780bfa139eef5460c961d0f5b.zip
Change order of DB login info and other MySQL output parameters.
Diffstat (limited to 'config')
-rwxr-xr-xconfig/snort/snort.inc9
1 files changed, 5 insertions, 4 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index 210f42f8..f4fd93b9 100755
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -1986,12 +1986,13 @@ function snort_generate_barnyard2_conf($snortcfg, $if_real) {
if ($snortcfg['barnyard_mysql_enable'] == 'on') {
$by2_dbpwd = base64_decode($snortcfg['barnyard_dbpwd']);
$snortbarnyardlog_output_plugins .= "# database: log to a MySQL DB\noutput database: log, mysql, ";
+ $snortbarnyardlog_output_plugins .= "user={$snortcfg['barnyard_dbuser']} password={$by2_dbpwd} ";
+ $snortbarnyardlog_output_plugins .= "dbname={$snortcfg['barnyard_dbname']} host={$snortcfg['barnyard_dbhost']}";
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";
+ $snortbarnyardlog_output_plugins .= " disable_signature_reference_table";
+ $snortbarnyardlog_output_plugins .= "\n\n";
}
if ($snortcfg['barnyard_syslog_enable'] == 'on') {
$snortbarnyardlog_output_plugins .= "# syslog_full: log to a syslog receiver\noutput alert_syslog_full: ";