Bug fixes and added more tests

README.md

@@ -16,28 +16,22 @@ Some features can have rejections disabled in the [reject] section.
 
 ```ini
 [check]
-reject_all=false
 single_recipient=true
-empty_return_path=true
-bad_rcpt=true
+empty_return_path=false
 bounce_spf=true
 non_local_msgid=true
 
 [reject]
 single_recipient=true
-empty_return_path=true
+empty_return_path=false
+bad_rcpt=true
 bounce_spf=false
 non_local_msgid=false
+all_bounces=false
 ```
 
 ## Features
 
-### reject_all
-
-When enabled, blocks all bounce messages using the simple rule of checking for `MAIL FROM:<>`.
-
-It is generally a bad idea to block all bounces. This option can be useful for mail servers at domains with frequent spoofing and few or no human users.
-
 ### single_recipient
 
 Valid bounces have a single recipient. Assure that the message really is a bounce by enforcing bounces to be addressed to a single recipient.
@@ -60,6 +54,12 @@ Parses the message body and any MIME parts for Received: headers and strips out
 
 If no 'Pass' result is found, then this test will fail. If SPF returns 'None', 'TempError' or 'PermError' then the test will be skipped.
 
+### all_bounces
+
+When enabled, blocks all bounce messages using the simple rule of checking for `MAIL FROM:<>`.
+
+It is generally a bad idea to block all bounces. This option can be useful for mail servers at domains with frequent spoofing and few or no human users.
+
 ## USAGE
 
 Add `bounce` to Haraka's config/plugins file. If desired, install and customize a local bounce.ini.

config/bounce.ini

@@ -1,15 +1,13 @@
 ; config/bounce_bad_rcpt: addresses that should never get bounces
 
-
 [check]
 single_recipient=true
 empty_return_path=true
-bad_rcpt=true
-
-; reject all bounce messages (generally a bad idea)
-reject_all=false
-
 
 [reject]
 single_recipient=true
 empty_return_path=true
+bad_rcpt=true
+
+; reject all bounce messages (generally a bad idea)
+all_bounces=false