diff options
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | driver.c | 3 | ||||
| -rw-r--r-- | fetchmail.c | 6 | ||||
| -rw-r--r-- | fetchmail.h | 1 | ||||
| -rw-r--r-- | rcfile_y.y | 22 |
5 files changed, 22 insertions, 16 deletions
@@ -1,10 +1,12 @@ Release Notes: -fetchmail-4.5.4 (): +fetchmail-4.5.5 (): * Brendan Cully's FAQ entry on GSSAPI. * Andrew Cagney's improvement to Received-line parsing. +* Kent Robotti sent an updated version of fetchsetup. +* Fixed the spam-block code that I broke in 4.5.3 :-(. -There are 260 people on fetchmail-friends and 251 on fetchmail-announce. +There are 260 people on fetchmail-friends and 252 on fetchmail-announce. fetchmail-4.5.4 (Sat Jul 25 10:25:14 EDT 1998): * Fixed processing of --antispam option. @@ -1210,9 +1210,10 @@ int num; /* index of message */ * try to ship the message, and don't prevent it from * being deleted. Typical values: * - * 571 = sendmail's "unsolicited email refused" * 501 = exim's old antispam response * 550 = exim's new antispam response (temporary) + * 553 = sendmail 8.8.7's generic REJECT + * 571 = sendmail's "unsolicited email refused" * * We don't send bouncemail on antispam failures because * we don't want the scumbags to know the address is even diff --git a/fetchmail.c b/fetchmail.c index a9d52ac8..1d549eb5 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -741,9 +741,9 @@ 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, (char *)NULL, 0)->val.status.num = 571; - save_str(&def_opts.antispam, (char *)NULL, 0)->val.status.num = 550; - save_str(&def_opts.antispam, (char *)NULL, 0)->val.status.num = 501; + 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; def_opts.server.protocol = P_AUTO; def_opts.server.timeout = CLIENT_TIMEOUT; diff --git a/fetchmail.h b/fetchmail.h index acbf14fc..c4ce591d 100644 --- a/fetchmail.h +++ b/fetchmail.h @@ -400,5 +400,6 @@ void itimerthread(void*); #endif #define STRING_DISABLED (char *)-1 +#define STRING_DUMMY "" /* fetchmail.h ends here */ @@ -261,16 +261,18 @@ smtp_list : STRING {save_str(¤t.smtphunt, $1,TRUE);} | smtp_list STRING {save_str(¤t.smtphunt, $2,TRUE);} ; -num_list : NUMBER { - struct idlist *id; - id=save_str(¤t.antispam,0,0); - id->val.status.num = $1; - } - | num_list NUMBER { - struct idlist *id; - id=save_str(¤t.antispam,0,0); - id->val.status.num = $2; - } +num_list : NUMBER + { + struct idlist *id; + id=save_str(¤t.antispam,STRING_DUMMY,0); + id->val.status.num = $1; + } + | num_list NUMBER + { + struct idlist *id; + id=save_str(¤t.antispam,STRING_DUMMY,0); + id->val.status.num = $2; + } ; user_option : TO localnames HERE |