Merge branch 'Evil2000/fetchmail-legacy_64' into legacy_64

1 files changed, 10 insertions, 2 deletions

diff --git a/sink.c b/sink.c
index e025a412..e8dd8355 100644
--- a/sink.c
+++ b/sink.c
@@ -1491,8 +1491,16 @@ int close_sink(struct query *ctl, struct msgblk *msg, flag forward)
 		    }
 		    if (smtp_err != SM_OK)
 		    {
-			responses[errors] = xstrdup(smtp_response);
-			errors++;
+			/*
+			 * amavis returns the SMTP code from the recieving
+			 * host after the DATA-DOT. So we need to compare the
+			 * response to the antispam option here instead.
+			 */
+			if (handle_smtp_report(ctl, msg) != PS_REFUSED) {
+			    /* Only count an error if the message was not refused */
+			    responses[errors] = xstrdup(smtp_response);
+			    errors++;
+			}
 		    }
 		}