diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2007-03-14 19:13:36 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2007-03-14 19:13:36 +0000 |
| commit | 186ee2136c53cb339e717d7467251281ea75d545 (patch) | |
| tree | 75aa22158fec0cdf1d19e35dfd196554fe5115db /libexec/spamd/grey.c | |
| parent | 08a8f5ca3c33376ac20f78625b0a83de3c171137 (diff) | |
Don't delete grey entries when whitelisting. They expire anyway
and this hides the evidence. Avoids a potential race when
using -M traps where a retry comes in between deletion and
whitelisting.
ok millert@
Diffstat (limited to 'libexec/spamd/grey.c')
| -rw-r--r-- | libexec/spamd/grey.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libexec/spamd/grey.c b/libexec/spamd/grey.c index dd76fccf4f1..334d23b1a2b 100644 --- a/libexec/spamd/grey.c +++ b/libexec/spamd/grey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grey.c,v 1.35 2007/03/12 03:14:44 beck Exp $ */ +/* $OpenBSD: grey.c,v 1.36 2007/03/14 19:13:35 beck Exp $ */ /* * Copyright (c) 2004-2006 Bob Beck. All rights reserved. @@ -567,7 +567,6 @@ greyscan(char *dbname) char *cp; /* - * remove this tuple-keyed entry from db * add address to whitelist * add an address-keyed entry to db */ @@ -586,10 +585,6 @@ greyscan(char *dbname) if (tuple) { if (cp != NULL) - *cp = '\n'; - if (queue_change(a, NULL, 0, DBC_DEL) == -1) - goto bad; - if (cp != NULL) *cp = '\0'; /* re-add entry, keyed only by ip */ gd.expire = now + whiteexp; |