aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2004-01-23 04:46:29 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2004-01-23 04:46:29 +0800
commit48a7a688f2bd5253805ad6525b57a4ec464dbecd (patch)
treefd569f363dfa0d4dbf1c39d4957d50ec65c375e9 /mail
parent7836c1f8de5fb80225602eda22f7663088bf88fd (diff)
downloadgsoc2013-evolution-48a7a688f2bd5253805ad6525b57a4ec464dbecd.tar
gsoc2013-evolution-48a7a688f2bd5253805ad6525b57a4ec464dbecd.tar.gz
gsoc2013-evolution-48a7a688f2bd5253805ad6525b57a4ec464dbecd.tar.bz2
gsoc2013-evolution-48a7a688f2bd5253805ad6525b57a4ec464dbecd.tar.lz
gsoc2013-evolution-48a7a688f2bd5253805ad6525b57a4ec464dbecd.tar.xz
gsoc2013-evolution-48a7a688f2bd5253805ad6525b57a4ec464dbecd.tar.zst
gsoc2013-evolution-48a7a688f2bd5253805ad6525b57a4ec464dbecd.zip
Oops, when calling spamassassin rather than spamc, we need to invoke
2004-01-22 Jeffrey Stedfast <fejj@ximian.com> * em-junk-filter.c (em_junk_sa_test_spamd): Oops, when calling spamassassin rather than spamc, we need to invoke /bin/sh -c since spamassassin is a shell script. (em_junk_sa_check_junk): Same. svn path=/trunk/; revision=24372
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/em-junk-filter.c16
2 files changed, 15 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index a06c791344..75dd8c0fea 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,10 @@
2004-01-22 Jeffrey Stedfast <fejj@ximian.com>
+ * em-junk-filter.c (em_junk_sa_test_spamd): Oops, when calling
+ spamassassin rather than spamc, we need to invoke /bin/sh -c
+ since spamassassin is a shell script.
+ (em_junk_sa_check_junk): Same.
+
Fixes bug #53175.
* em-junk-filter.c (pipe_to_sa): Don't need an argc (we don't even
diff --git a/mail/em-junk-filter.c b/mail/em-junk-filter.c
index c0f5a28824..8a5623b191 100644
--- a/mail/em-junk-filter.c
+++ b/mail/em-junk-filter.c
@@ -189,8 +189,9 @@ em_junk_sa_test_spamd (void)
{
int port = SPAMD_PORT;
char *argv[6] = {
- "spamassassin",
- "--version",
+ "/bin/sh",
+ "-c",
+ "spamassassin --version",
NULL,
};
@@ -264,7 +265,7 @@ em_junk_sa_is_available (void)
static gboolean
em_junk_sa_check_junk (CamelMimeMessage *msg)
{
- char *argv[4], buf[12];
+ char *argv[5], buf[12];
int i = 0;
d(fprintf (stderr, "em_junk_sa_check_junk\n"));
@@ -281,10 +282,13 @@ em_junk_sa_check_junk (CamelMimeMessage *msg)
argv[i++] = buf;
}
} else {
- argv[i++] = "spamassassin";
- argv[i++] = "--exit-code";
+ argv[i++] = "/bin/sh";
+ argv[i++] = "-c";
+
if (mail_session_get_sa_local_only ())
- argv[i++] = "--local";
+ argv[i++] = "spamassassin --exit-code --local";
+ else
+ argv[i++] = "spamassassin --exit-code";
}
argv[i] = NULL;