Partially revert "Update default settings for RHEL 5.3"

On reflecting about this further I don't think it's a good idea to
change either the defaults in the script nor the example lines in the
config because some users may be depending on those details.

This partially reverts commit 706b12b. I've left in some minor comment
changes and whitespace fixes from the original commit.

Signed-off-by: Wincent Colaiuta <win@wincent.com>

diff --git a/bansshee b/bansshee
index 7a0b85ebb1b7083d226cf2923bce0a9340461bc1..a90051e5cb60c9d18ca209e14dfba14c83a16acd 100755 (executable)
--- a/bansshee
+++ b/bansshee
@@ -23,10 +23,10 @@ our $unban_wait               = 3600;   # minimum number of seconds an IP must w
 our $grace_period             = 3600;   # number of seconds that must pass before prior invalid/incorrect attempt counts are reset (1 hour)
 our $unblocking_interval      = 300;    # number of seconds between checks of the blocklist for removing old IPs (5 minutes)
 
-# Platform specific settings, based on Red Hat Enterprise Linux 5.3
+# Platform specific settings, based on Red Hat Enterprise Linux ES release 3 (Taroon Update 7)
 
 our $logpath                  = '/var/log/secure';                         # logfile to watch
-our $illegal_user_regex       = 'sshd\[\d+\]: Failed password for invalid user (\S+) from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) port \d+ ssh';
+our $illegal_user_regex       = 'sshd\[\d+\]: Failed password for illegal user (\S+) from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) port \d+ ssh';
 our $incorrect_pass_regex     = 'sshd\[\d+\]: Failed password for (\S+) from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) port \d+ ssh';
 our $iptables                 = '/sbin/iptables';                          # for manipulating the firewall
 our $iptables_create          = '-N BANSSHEE';                             # iptables parameters for creating the BANSSHEE chain

diff --git a/bansshee.conf b/bansshee.conf
index c051570073bfdcb715621b0667e4511e79fb0652..ff3fee73ec2b04875085d63a91b51bb04b439d05 100644 (file)
--- a/bansshee.conf
+++ b/bansshee.conf
@@ -12,11 +12,11 @@
 #our $unblocking_interval       = 300;    # number of seconds between checks of the blocklist for removing old IPs (5 minutes)
 
 #
-# Platform specific settings: based on Red Hat Enterprise Linux 5.3
+# Platform specific settings: based on Red Hat Enterprise Linux ES release 3 (Taroon Update 7)
 #
 
 #our $logpath                   = '/var/log/secure';                        # logfile to watch
-#our $illegal_user_regex        = 'sshd\[\d+\]: Failed password for invalid user (\S+) from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) port \d+ ssh';
+#our $illegal_user_regex        = 'sshd\[\d+\]: Failed password for illegal user (\S+) from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) port \d+ ssh';
 #our $incorrect_pass_regex      = 'sshd\[\d+\]: Failed password for (\S+) from (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) port \d+ ssh';
 #our $iptables                  = '/sbin/iptables';                         # for manipulating the firewall
 #our $iptables_create          = '-N BANSSHEE';                             # iptables parameters for creating the BANSSHEE chain