diff options
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/em-junk-filter.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index f6af13ea4f..94316ca0d1 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2004-06-21 Radek Doulik <rodo@ximian.com> + + * em-junk-filter.c (em_junk_sa_test_spamd): make sure we test for + -p and --port only and not for other options as --pidfile + + Fixes #60260 + 2004-06-18 Not Zed <NotZed@Ximian.com> ** See #31027. diff --git a/mail/em-junk-filter.c b/mail/em-junk-filter.c index a6fe7c4cd2..338dd5d931 100644 --- a/mail/em-junk-filter.c +++ b/mail/em-junk-filter.c @@ -279,7 +279,7 @@ em_junk_sa_test_spamd (void) i = 0; argv [i++] = "/bin/sh"; argv [i++] = "-c"; - argv [i++] = "ps ax|grep -v grep|grep -E 'spamd.*(\\-L|\\-\\-local)'|grep -E -v '\\-p|\\-\\-port'"; + argv [i++] = "ps ax|grep -v grep|grep -E 'spamd.*(\\-L|\\-\\-local)'|grep -E -v '\\ \\-p\\ |\\ \\-\\-port\\ '"; argv[i] = NULL; if (pipe_to_sa (NULL, NULL, argv) != 0) { |