From e0c6254d3e0ddd6d9eec93c796f25aa59c0c7652 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Mon, 7 Dec 1998 20:37:55 +0000 Subject: Minor cleanup. svn path=/trunk/; revision=2267 --- NEWS | 5 +++-- driver.c | 4 ++-- fetchmail.h | 6 +++--- sink.c | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index d883ef22..94f99a40 100644 --- a/NEWS +++ b/NEWS @@ -5,8 +5,9 @@ fetchmail-4.7.0 (): * Rob Funk's old-message-check optimization. * Fix an error in the logic for detecting when all connections are wedged. * Unwedge connections on wakeup. +* Fix Ken Estes's LMTP coredump error. -There are 244 people on fetchmail-friends and 315 on fetchmail-announce. +There are 243 people on fetchmail-friends and 322 on fetchmail-announce. fetchmail-4.6.9 (Tue Dec 1 14:46:19 EST 1998): * Better RFC822 conformance in fetchmail trace headers. @@ -36,7 +37,7 @@ There are 247 people on fetchmail-friends and 309 on fetchmail-announce. fetchmail-4.6.7 (Sat Nov 21 13:59:47 EST 1998): * Gerald Britton's patches to enable Hesiod support. * Postmaster option fix from Bill Metzenthen . -* Socks library support forom Guiseppe Guerini. +* Socks library support from Guiseppe Guerini. * Notification mail is now sent to the user on 20 consecutive timeouts. There are 247 people on fetchmail-friends and 308 on fetchmail-announce. diff --git a/driver.c b/driver.c index 84a48632..9b7f6be5 100644 --- a/driver.c +++ b/driver.c @@ -1010,13 +1010,13 @@ static int readheaders(int sock, strcat(errhd, _("SMTP listener rejected local recipient addresses: ")); errlen = strlen(errhd); for (idp = msgblk.recipients; idp; idp = idp->next) - if (idp->val.status.mark == XMIT_ANTISPAM) + if (idp->val.status.mark == XMIT_RCPTBAD) errlen += strlen(idp->id) + 2; xalloca(errmsg, char *, errlen+3); (void) strcpy(errmsg, errhd); for (idp = msgblk.recipients; idp; idp = idp->next) - if (idp->val.status.mark == XMIT_ANTISPAM) + if (idp->val.status.mark == XMIT_RCPTBAD) { strcat(errmsg, idp->id); if (idp->next) diff --git a/fetchmail.h b/fetchmail.h index f3522c51..b7a048b6 100644 --- a/fetchmail.h +++ b/fetchmail.h @@ -370,9 +370,9 @@ int gen_transact (); extern int phase; /* mark values for name lists */ -#define XMIT_ACCEPT 1 -#define XMIT_REJECT 2 -#define XMIT_ANTISPAM 3 +#define XMIT_ACCEPT 1 /* accepted; matches local domain or name */ +#define XMIT_REJECT 2 /* rejected; no match */ +#define XMIT_RCPTBAD 3 /* SMTP listener rejected the name */ /* sink.c: forwarding */ int stuffline(struct query *, char *); diff --git a/sink.c b/sink.c index 3d012811..a96332b2 100644 --- a/sink.c +++ b/sink.c @@ -687,7 +687,7 @@ int open_sink(struct query *ctl, struct msgblk *msg, else { (*bad_addresses)++; - idp->val.status.mark = XMIT_ANTISPAM; + idp->val.status.mark = XMIT_RCPTBAD; error(0, 0, _("%cMTP listener doesn't like recipient address `%s'"), ctl->listener, addr); -- cgit v1.2.3