diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | fetchmail.c | 9 | ||||
| -rw-r--r-- | fetchmail.man | 2 |
3 files changed, 8 insertions, 4 deletions
@@ -17,6 +17,7 @@ fetchmail-5.0.6 (): * Lexer states added to tell the lexer to return a string after a `username' or `password' keyword, courtesy of Brian Boutel. * Interface option fix from Bill Currie. +* 554 added to default antispam vaklues (for Postfix). There are 267 people on fetchmail-friends and 420 on fetchmail-announce. diff --git a/fetchmail.c b/fetchmail.c index eaf1886a..de0977f3 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -887,9 +887,12 @@ static int load_params(int argc, char **argv, int optind) memset(&def_opts, '\0', sizeof(struct query)); def_opts.smtp_socket = -1; def_opts.smtpaddress = (char *)0; - save_str(&def_opts.antispam, STRING_DUMMY, 0)->val.status.num = 571; - save_str(&def_opts.antispam, STRING_DUMMY, 0)->val.status.num = 550; - save_str(&def_opts.antispam, STRING_DUMMY, 0)->val.status.num = 501; +#define ANTISPAM(n) save_str(&def_opts.antispam, STRING_DUMMY, 0)->val.status.num = (n) + ANTISPAM(571); /* sendmail */ + ANTISPAM(550); /* old exim */ + ANTISPAM(501); /* new exim */ + ANTISPAM(554); /* Postfix */ +#undef ANTISPAM def_opts.server.protocol = P_AUTO; def_opts.server.timeout = CLIENT_TIMEOUT; diff --git a/fetchmail.man b/fetchmail.man index 52771d82..cb26738a 100644 --- a/fetchmail.man +++ b/fetchmail.man @@ -868,7 +868,7 @@ move to 550 soon. The .I fetchmail code recognizes and discards the message on any of a list of responses -that defaults to [571, 550, 501] but can be set with the `antispam' +that defaults to [571, 550, 501, 554] but can be set with the `antispam' option. This is one of the .I only two circumstance under which fetchmail ever discards mail (the others |