aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-12-04 05:48:56 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-12-04 05:48:56 +0800
commit19b21da74a879a86f1172376bd45c070ac1db80b (patch)
tree3e4f3392a71b5d59283315d65b74e9b140614428
parent792772dc246fe7d2119f946a2ea95a70256fb147 (diff)
downloadgsoc2013-evolution-19b21da74a879a86f1172376bd45c070ac1db80b.tar.gz
gsoc2013-evolution-19b21da74a879a86f1172376bd45c070ac1db80b.tar.zst
gsoc2013-evolution-19b21da74a879a86f1172376bd45c070ac1db80b.zip
** Fixes bug #560420 (patch by hp@syntomax.com)
2008-12-03 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #560420 (patch by hp@syntomax.com) * plugins/sa-junk-plugin/em-junk-filter.c (pipe_to_sa_full): spamc and spamassassin use error codes >= 64 to denote execution errors. Positive error codes < 64 means the message was identified as spam. svn path=/trunk/; revision=36828
-rw-r--r--plugins/sa-junk-plugin/ChangeLog9
-rw-r--r--plugins/sa-junk-plugin/em-junk-filter.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog
index badfbb83ff..46f51c7003 100644
--- a/plugins/sa-junk-plugin/ChangeLog
+++ b/plugins/sa-junk-plugin/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-03 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes bug #560420 (patch by hp@syntomax.com)
+
+ * em-junk-filter.c (pipe_to_sa_full):
+ spamc and spamassassin use error codes >= 64 to denote execution
+ errors. Positive error codes < 64 means the message was identified
+ as spam.
+
2008-09-29 Sankar P <psankar@novell.com>
License Changes
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 1a442b42aa..4cb554eb17 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -250,7 +250,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err,
else
res = rv_err;
- if (res != 0)
+ if (res >= 64)
g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to SpamAssassin failed, error code: %d"), res);
return res;