aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--antispam.72
-rw-r--r--dspam-exec.c9
2 files changed, 5 insertions, 6 deletions
diff --git a/antispam.7 b/antispam.7
index 84234b4..855728c 100644
--- a/antispam.7
+++ b/antispam.7
@@ -127,7 +127,7 @@ plugin {
# semicolon-separated list of extra arguments to dspam
# (default unset i.e. none)
# antispam_dspam_args =
- # antispam_dspam_args = --user;%u # % expansion done by dovecot
+ # antispam_dspam_args = --deliver=;--user;%u # % expansion done by dovecot
# antispam_dspam_args = --mode=teft
#=====================
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 */