From 22658a4d99a5f8f4b6b767a6ca068fbf7c7b13e0 Mon Sep 17 00:00:00 2001 From: Renaud Holcombe Date: Sat, 29 Jul 2017 08:28:04 -0400 Subject: [PATCH] Fix styling and bump PORTVERSION. --- security/pfSense-pkg-snort/Makefile | 2 +- .../files/usr/local/www/snort/snort_barnyard.php | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/security/pfSense-pkg-snort/Makefile b/security/pfSense-pkg-snort/Makefile index ce06e2135fba..33fa1d11969b 100644 --- a/security/pfSense-pkg-snort/Makefile +++ b/security/pfSense-pkg-snort/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pfSense-pkg-snort -PORTVERSION= 3.2.9.3 +PORTVERSION= 3.2.9.4 CATEGORIES= security MASTER_SITES= # empty DISTFILES= # empty diff --git a/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_barnyard.php b/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_barnyard.php index cd2e5a5b457a..4f9a060ad252 100644 --- a/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_barnyard.php +++ b/security/pfSense-pkg-snort/files/usr/local/www/snort/snort_barnyard.php @@ -180,11 +180,9 @@ if ($_POST['barnyard_dbuser']) $natent['barnyard_dbuser'] = $_POST['barnyard_dbuser']; else unset($natent['barnyard_dbuser']); // The password field will return '********' if no changes are made and needs to be escaped. - if ($_POST['barnyard_dbpwd'] && ($_POST['barnyard_dbpwd'] != DMYPWD)) $natent['barnyard_dbpwd'] = base64_encode($_POST['barnyard_dbpwd']); - else - // Because of the base64 encoding/decoding, in the case of a valid value that hasn't changed, it needs to be re-encoded to base64. - if ($_POST['barnyard_dbpwd'] != DMYPWD) unset($natent['barnyard_dbpwd']); - else $natent['barnyard_dbpwd'] = base64_encode($natent['barnyard_dbpwd']); + // Because of the base64 encoding/decoding, in the case of a valid value that hasn't changed, it will need to be re-encoded to base64. + if ($_POST['barnyard_dbpwd'] && ($_POST['barnyard_dbpwd'] != DMYPWD)) $natent['barnyard_dbpwd'] = base64_encode($_POST['barnyard_dbpwd']); else + if ($_POST['barnyard_dbpwd'] != DMYPWD) unset($natent['barnyard_dbpwd']); else $natent['barnyard_dbpwd'] = base64_encode($natent['barnyard_dbpwd']); if ($_POST['barnyard_syslog_rhost']) $natent['barnyard_syslog_rhost'] = $_POST['barnyard_syslog_rhost']; else unset($natent['barnyard_syslog_rhost']); if ($_POST['barnyard_syslog_dport']) $natent['barnyard_syslog_dport'] = $_POST['barnyard_syslog_dport']; else $natent['barnyard_syslog_dport'] = '514';