diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2006-11-27 20:46:04 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2006-11-27 20:46:04 +0000 |
| commit | 99e75407b87092ca34b7fedd4b4f804b1baa9636 (patch) | |
| tree | fdaeec8147f09e251968ade63c8eee12569b73de /libexec/spamd | |
| parent | 28a3f24d7c8fcd82cc666e76680f97650632e619 (diff) | |
Make spamd error out for a greylisted session only after the DATA
command not after the RCPT command, as this helps people out when
they are faced with retarded sender verification schemes - tested
out by a number of people on tech@, and running at u of a for a
while. Supposedly this makes verizon sender verification happy.
Suggested as a stable candidate by people on tech@, I'm ok with
that.
Diffstat (limited to 'libexec/spamd')
| -rw-r--r-- | libexec/spamd/spamd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libexec/spamd/spamd.c b/libexec/spamd/spamd.c index 950fbe7b2f5..08bc2dcc4dc 100644 --- a/libexec/spamd/spamd.c +++ b/libexec/spamd/spamd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spamd.c,v 1.84 2006/10/29 22:06:28 henning Exp $ */ +/* $OpenBSD: spamd.c,v 1.85 2006/11/27 20:46:03 beck Exp $ */ /* * Copyright (c) 2002 Theo de Raadt. All rights reserved. @@ -753,9 +753,6 @@ nextstate(struct con *cp) fprintf(grey, "IP:%s\nFR:%s\nTO:%s\n", cp->addr, cp->mail, cp->rcpt); fflush(grey); - cp->laststate = cp->state; - cp->state = 98; - goto done; } } break; @@ -792,6 +789,11 @@ nextstate(struct con *cp) cp->op = cp->obuf; cp->ol = strlen(cp->op); cp->w = t + cp->stutter; + if (greylist && cp->blacklists == NULL) { + cp->laststate = cp->state; + cp->state = 98; + goto done; + } break; case 60: /* sent 354 blah */ |