BF: fixed silly typo in sshd filter patch and extended vsftpd filter patch

debian-releases/etch.security
Yaroslav Halchenko 2008-01-04 11:47:29 -05:00
parent 7efdc417d6
commit dce14c59d7
1 changed files with 6 additions and 6 deletions

View File

@ -6,26 +6,26 @@
@DPATCH@
diff -urNad fail2ban~/config/filter.d/sshd.conf fail2ban/config/filter.d/sshd.conf
--- fail2ban~/config/filter.d/sshd.conf 2007-11-06 17:57:04.000000000 -0500
+++ fail2ban/config/filter.d/sshd.conf 2007-11-07 01:04:17.000000000 -0500
--- fail2ban~/config/filter.d/sshd.conf 2008-01-04 11:42:10.000000000 -0500
+++ fail2ban/config/filter.d/sshd.conf 2008-01-04 11:44:39.000000000 -0500
@@ -13,7 +13,7 @@
# be used for standard IP/hostname matching.
# Values: TEXT
#
-failregex = (?:(?:Authentication failure|Failed [-/\w+]+) for(?: [iI](?:llegal|nvalid) user)?|[Ii](?:llegal|nvalid) user|ROOT LOGIN REFUSED) .*(?: from|FROM) <HOST>
+failregex = (?:(?:Authentication failure|Failed [-/\w+]+) for(?: [iI](?:llegal|nvalid) user)?|[Ii](?:llegal|nvalid) user|ROOT LOGIN REFUSED) .*(?: from|FROM) <HOST>(?: port \d*)?(?: ssh\d*)\s*$
+failregex = (?:(?:Authentication failure|Failed [-/\w+]+) for(?: [iI](?:llegal|nvalid) user)?|[Ii](?:llegal|nvalid) user|ROOT LOGIN REFUSED) .*(?: from|FROM) <HOST>(?: port \d*)?(?: ssh\d*)?\s*$
# Option: ignoreregex
# Notes.: regex to ignore. If this regex matches, the line is ignored.
diff -urNad fail2ban~/config/filter.d/vsftpd.conf fail2ban/config/filter.d/vsftpd.conf
--- fail2ban~/config/filter.d/vsftpd.conf 2007-11-06 17:57:04.000000000 -0500
+++ fail2ban/config/filter.d/vsftpd.conf 2007-11-07 01:06:31.000000000 -0500
--- fail2ban~/config/filter.d/vsftpd.conf 2008-01-04 11:42:10.000000000 -0500
+++ fail2ban/config/filter.d/vsftpd.conf 2008-01-04 11:46:48.000000000 -0500
@@ -13,7 +13,7 @@
# be used for standard IP/hostname matching.
# Values: TEXT
#
-failregex = vsftpd: \(pam_unix\) authentication failure; .* rhost=<HOST>
+failregex = vsftpd: \(pam_unix\) authentication failure; .* rhost=<HOST>\s*$
+failregex = vsftpd: \(pam_unix\) authentication failure; .* rhost=<HOST>(?: user=\w*)?\s*$
# Option: ignoreregex
# Notes.: regex to ignore. If this regex matches, the line is ignored.