From 4dc51e5defdc8ce56db4b71b9b6b53d654908d56 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Wed, 4 Dec 2013 22:43:06 +1100
Subject: [PATCH] BF: put notice in email if whois program could not provide
 more information. Closes gh-471

---
 config/action.d/mail-whois-lines.conf     | 2 +-
 config/action.d/mail-whois.conf           | 2 +-
 config/action.d/sendmail-whois-lines.conf | 2 +-
 config/action.d/sendmail-whois.conf       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/action.d/mail-whois-lines.conf b/config/action.d/mail-whois-lines.conf
index bbf66a59..067c5819 100644
--- a/config/action.d/mail-whois-lines.conf
+++ b/config/action.d/mail-whois-lines.conf
@@ -40,7 +40,7 @@ actionban = printf %%b "Hi,\n
             The IP <ip> has just been banned by Fail2Ban after
             <failures> attempts against <name>.\n\n
             Here is more information about <ip>:\n
-            `whois <ip>`\n\n
+            `whois <ip> || echo missing whois program`\n\n
             Lines containing IP:<ip> in <logpath>\n
             `grep '\<<ip>\>' <logpath>`\n\n
             Regards,\n
diff --git a/config/action.d/mail-whois.conf b/config/action.d/mail-whois.conf
index c132b086..e4c8450e 100644
--- a/config/action.d/mail-whois.conf
+++ b/config/action.d/mail-whois.conf
@@ -40,7 +40,7 @@ actionban = printf %%b "Hi,\n
             The IP <ip> has just been banned by Fail2Ban after
             <failures> attempts against <name>.\n\n
             Here is more information about <ip>:\n
-            `whois <ip>`\n
+            `whois <ip> || echo missing whois program`\n
             Regards,\n
             Fail2Ban"|mail -s "[Fail2Ban] <name>: banned <ip> from `uname -n`" <dest>
 
diff --git a/config/action.d/sendmail-whois-lines.conf b/config/action.d/sendmail-whois-lines.conf
index b40b1084..8cdafc0b 100644
--- a/config/action.d/sendmail-whois-lines.conf
+++ b/config/action.d/sendmail-whois-lines.conf
@@ -56,7 +56,7 @@ actionban = printf %%b "Subject: [Fail2Ban] <name>: banned <ip> from `uname -n`
             The IP <ip> has just been banned by Fail2Ban after
             <failures> attempts against <name>.\n\n
             Here is more information about <ip>:\n
-            `/usr/bin/whois <ip>`\n\n
+            `/usr/bin/whois <ip> || echo missing whois program`\n\n
             Lines containing IP:<ip> in <logpath>\n
             `grep '\<<ip>\>' <logpath>`\n\n
             Regards,\n
diff --git a/config/action.d/sendmail-whois.conf b/config/action.d/sendmail-whois.conf
index f2b07d9e..e428c44d 100644
--- a/config/action.d/sendmail-whois.conf
+++ b/config/action.d/sendmail-whois.conf
@@ -56,7 +56,7 @@ actionban = printf %%b "Subject: [Fail2Ban] <name>: banned <ip> from `uname -n`
             The IP <ip> has just been banned by Fail2Ban after
             <failures> attempts against <name>.\n\n
             Here is more information about <ip>:\n
-            `/usr/bin/whois <ip>`\n
+            `/usr/bin/whois <ip> || echo missing whois program`\n
             Regards,\n
             Fail2Ban" | /usr/sbin/sendmail -f <sender> <dest>