diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2004-10-05 15:20:31 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2004-10-05 15:20:31 +0000 |
| commit | ee8ac6825d2f6833f195a4988b95ef8669c69803 (patch) | |
| tree | a96df23a789b40f0f902b130c50fdebebf324bec /libexec/spamd | |
| parent | 836c209470564add0501dcbe65e1fb2f51d3d653 (diff) | |
change default to 451 for greylisting, thanks to a number of
people on misc, and some observations by Evan harris on the greylisting
mailing list that a number of clustered mailers like aol behave better
(and retry from the same IP) when they see a 451, but do not when
they see a 450 (traditionally used for mailbox lock failure)
450 was the original for spamd, as the default for the tarpit is to
encourage quick retries to punish blacklisted smtp servers more. This
got carried over to the greylisting implementation, and isnt' really
optimal for that case.
ok millert@, henning@, todd@
Diffstat (limited to 'libexec/spamd')
| -rw-r--r-- | libexec/spamd/spamd.8 | 4 | ||||
| -rw-r--r-- | libexec/spamd/spamd.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libexec/spamd/spamd.8 b/libexec/spamd/spamd.8 index 7b0084ac96c..5b52ef5dacd 100644 --- a/libexec/spamd/spamd.8 +++ b/libexec/spamd/spamd.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: spamd.8,v 1.49 2004/03/16 09:19:25 jmc Exp $ +.\" $OpenBSD: spamd.8,v 1.50 2004/10/05 15:20:30 beck Exp $ .\" .\" Copyright (c) 2002 Theo de Raadt. All rights reserved. .\" @@ -235,7 +235,7 @@ will be considered for greylisting. Such connections will not be stuttered at or delayed, and will receive the pleasantly innocuous temporary failure of: .Bd -literal -offset 4n -450 Temporary failure, please try again later. +451 Temporary failure, please try again later. .Ed .Pp in the SMTP dialogue immediately after the recipient is specified. diff --git a/libexec/spamd/spamd.c b/libexec/spamd/spamd.c index 5f244f324d9..b434bf0e583 100644 --- a/libexec/spamd/spamd.c +++ b/libexec/spamd/spamd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spamd.c,v 1.72 2004/09/18 07:29:38 beck Exp $ */ +/* $OpenBSD: spamd.c,v 1.73 2004/10/05 15:20:30 beck Exp $ */ /* * Copyright (c) 2002 Theo de Raadt. All rights reserved. @@ -481,7 +481,7 @@ nomatch: nreply, cp->addr, nreply, nreply); else asprintf(&cp->obuf, - "450 Temporary failure, please try again later.\r\n"); + "451 Temporary failure, please try again later.\r\n"); if (cp->obuf != NULL) cp->osize = strlen(cp->obuf) + 1; else |