From 9a84c940aeed3246f872dfde07bcc256d4118445 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Sat, 2 Feb 2008 18:57:33 +0100 Subject: dspam backend: don't force --stdout and recommend --deliver= --- dspam-exec.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'dspam-exec.c') diff --git a/dspam-exec.c b/dspam-exec.c index 0b0a9cb..20350d9 100644 --- a/dspam-exec.c +++ b/dspam-exec.c @@ -33,7 +33,7 @@ static const char *dspam_binary = "/usr/bin/dspam"; static char **extra_args = NULL; static int extra_args_num = 0; -#define FIXED_ARGS_NUM 6 +#define FIXED_ARGS_NUM 5 static int call_dspam(const char *signature, enum classification wanted) { @@ -127,9 +127,8 @@ static int call_dspam(const char *signature, enum classification wanted) argv[0] = (char *)dspam_binary; argv[1] = "--source=error"; - argv[2] = "--stdout"; - argv[3] = (char *)class_arg; - argv[4] = (char *)sign_arg; + argv[2] = (char *)class_arg; + argv[3] = (char *)sign_arg; #ifdef DEBUG_SYSLOG /* @@ -141,7 +140,7 @@ static int call_dspam(const char *signature, enum classification wanted) #endif for (i = 0; i < extra_args_num; i++) - argv[i + 5] = (char *)extra_args[i]; + argv[i + 4] = (char *)extra_args[i]; execv(dspam_binary, argv); /* fall through if dspam can't be found */ -- cgit v1.2.3