From c10cc20928d2679d21bdb8e9f16ab7fc58e4aeb4 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Fri, 28 Feb 2014 08:41:04 +1100
Subject: [PATCH] ENH: rename sendmail-spam to sendmail-reject

---
 ChangeLog                                                  | 2 +-
 MANIFEST                                                   | 4 +++-
 config/jail.conf                                           | 6 +++---
 config/filter.d/sendmail-spam.conf => sendmail-reject.conf | 0
 testcases/files/logs/{sendmail-spam => sendmail-reject}    | 0
 5 files changed, 7 insertions(+), 5 deletions(-)
 rename config/filter.d/sendmail-spam.conf => sendmail-reject.conf (100%)
 rename testcases/files/logs/{sendmail-spam => sendmail-reject} (100%)

diff --git a/ChangeLog b/ChangeLog
index c4a76979..eaab2247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,7 +17,7 @@ ver. 0.8.13 (2014/XX/XXX) - maintenance-only-from-now-on
 
 - New Features:
   - filter nagios - detects unauthorized access to the nrpe daemon (Ivo Truxa)
-  - filter sendmail-{auth,spam} (jserrachinha and cepheid666).
+  - filter sendmail-{auth,reject} (jserrachinha and cepheid666 and fab23).
 
 - Enhancements:
   - filter pureftpd - added all translations of "Authentication failed for
diff --git a/MANIFEST b/MANIFEST
index 5d569e69..af3f564c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -103,6 +103,8 @@ testcases/files/logs/qmail
 testcases/files/logs/recidive
 testcases/files/logs/sieve
 testcases/files/logs/selinux-ssh
+testcases/files/logs/sendmail-auth
+testcases/files/logs/sendmail-reject
 testcases/files/logs/suhosin
 testcases/files/logs/uwimap-auth
 testcases/files/logs/wuftpd
@@ -173,7 +175,7 @@ config/filter.d/pam-generic.conf
 config/filter.d/php-url-fopen.conf
 config/filter.d/postfix-sasl.conf
 config/filter.d/sendmail-auth.conf
-config/filter.d/sendmail-spam.conf
+config/filter.d/sendmail-reject.conf
 config/filter.d/sieve.conf
 config/filter.d/solid-pop3d.conf
 config/filter.d/squid.conf
diff --git a/config/jail.conf b/config/jail.conf
index ea4f4555..5ba1c7c4 100644
--- a/config/jail.conf
+++ b/config/jail.conf
@@ -165,11 +165,11 @@ action   = iptables-multiport[name=sendmail-auth, port="submission,465,smtp", pr
 logpath  = /var/log/mail.log
 
 
-[sendmail-spam]
+[sendmail-reject]
 
 enabled  = false
-filter   = sendmail-spam
-action   = iptables[name=sendmail-spam, port=smtp, protocol=tcp]
+filter   = sendmail-reject
+action   = iptables[name=sendmail-reject, port=smtp, protocol=tcp]
 logpath  = /var/log/mail.log
 
 
diff --git a/config/filter.d/sendmail-spam.conf b/sendmail-reject.conf
similarity index 100%
rename from config/filter.d/sendmail-spam.conf
rename to sendmail-reject.conf
diff --git a/testcases/files/logs/sendmail-spam b/testcases/files/logs/sendmail-reject
similarity index 100%
rename from testcases/files/logs/sendmail-spam
rename to testcases/files/logs/sendmail-reject