From 13ccebe78f2c9eafc148382559a79ced32354b50 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Fri, 13 Dec 2013 23:40:51 +0000
Subject: [PATCH] BF: fix actioncheck in firewallcmd

---
 ChangeLog                            | 1 +
 THANKS                               | 1 +
 config/action.d/firewallcmd-new.conf | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a0624630..0eca4e37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@ ver. 0.8.12 (2013/12/XX) - things-can-only-get-better
     settings. Closes gh-458, Debian bug #697333, Redhat bug #891798.
   - complain action - ensure where not matching other IPs in log sample.
     Closes gh-467
+  - Fix firewall-cmd actioncheck - patch from Adam Tkac. Redhat Bug #979622
 
 - Enhancements:
   - long names on jails documented based on iptables limit of 30 less
diff --git a/THANKS b/THANKS
index 6d4845bb..e448e09e 100644
--- a/THANKS
+++ b/THANKS
@@ -6,6 +6,7 @@ the project.  If you have been left off, please let us know
 (preferably send a pull request on github with the "fix") and you will
 be added
 
+Adam Tkac
 Adrien Clerc
 ache
 ag4ve (Shawn)
diff --git a/config/action.d/firewallcmd-new.conf b/config/action.d/firewallcmd-new.conf
index 55b6762d..d3443e4e 100644
--- a/config/action.d/firewallcmd-new.conf
+++ b/config/action.d/firewallcmd-new.conf
@@ -20,7 +20,7 @@ actionstop = firewall-cmd --direct --remove-rule ipv4 filter <chain> 0 -m state
              firewall-cmd --direct --remove-rules ipv4 filter fail2ban-<name>
              firewall-cmd --direct --remove-chain ipv4 filter fail2ban-<name>
 
-actioncheck = firewall-cmd --direct --get-chains ipv4 filter | grep -q 'fail2ban-<name>[ \t]'
+actioncheck = firewall-cmd --direct --get-chains ipv4 filter | grep -Eq 'fail2ban-<name>$|fail2ban-<name> '
 
 actionban = firewall-cmd --direct --add-rule ipv4 filter fail2ban-<name> 0 -s <ip> -j <blocktype>