diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2001-09-24 22:26:31 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2001-09-24 22:26:31 +0000 |
| commit | 710615ccf85ccc1c0d1669bb5413bd102a97891e (patch) | |
| tree | 49ec9ac2ee787c2bf37781490412f74b93fcfca2 | |
| parent | 85686bbe17df59ba904b0888fc1d0e09a20a6ebf (diff) | |
| download | fetchmail-710615ccf85ccc1c0d1669bb5413bd102a97891e.tar.gz fetchmail-710615ccf85ccc1c0d1669bb5413bd102a97891e.tar.bz2 fetchmail-710615ccf85ccc1c0d1669bb5413bd102a97891e.zip | |
Merge the explicit-bounce code back in, conditioned out, in case we
need it.
svn path=/trunk/; revision=3480
| -rw-r--r-- | sink.c | 33 |
1 files changed, 33 insertions, 0 deletions
@@ -604,6 +604,9 @@ int open_sink(struct query *ctl, struct msgblk *msg, const char *ap; char options[MSGBUFSIZE]; char addr[HOSTLEN+USERNAMELEN+1]; +#ifdef EXPLICIT_BOUNCE + char **from_responses; +#endif /* EXPLICIT_BOUNCE */ int total_addresses; /* @@ -683,6 +686,9 @@ int open_sink(struct query *ctl, struct msgblk *msg, total_addresses = 0; for (idp = msg->recipients; idp; idp = idp->next) total_addresses++; +#ifdef EXPLICIT_BOUNCE_ON_BAD_ADDRESS + xalloca(from_responses, char **, sizeof(char *) * total_addresses); +#endif /* EXPLICIT_BOUNCE_ON_BAD_ADDRESS */ for (idp = msg->recipients; idp; idp = idp->next) if (idp->val.status.mark == XMIT_ACCEPT) { @@ -710,6 +716,22 @@ int open_sink(struct query *ctl, struct msgblk *msg, { handle_smtp_report(ctl, msg); +#ifdef EXPLICIT_BOUNCE_ON_BAD_ADDRESS +#ifdef HAVE_SNPRINTF + snprintf(errbuf, sizeof(errbuf), "%s: %s", + idp->id, smtp_response); +#else + strncpy(errbuf, idp->id, sizeof(errbuf)); + strcat(errbuf, ": "); + strcat(errbuf, smtp_response); +#endif /* HAVE_SNPRINTF */ + + xalloca(from_responses[*bad_addresses], + char *, + strlen(errbuf)+1); + strcpy(from_responses[*bad_addresses], errbuf); +#endif /* EXPLICIT_BOUNCE_ON_BAD_ADDRESS */ + (*bad_addresses)++; idp->val.status.mark = XMIT_RCPTBAD; if (outlevel >= O_VERBOSE) @@ -719,6 +741,17 @@ int open_sink(struct query *ctl, struct msgblk *msg, } } +#ifdef EXPLICIT_BOUNCE_ON_BAD_ADDRESS + /* + * This should not be necessary, because the SMTP listener itself + * should genrate a bounce for the bad address. + */ + if (*bad_addresses) + send_bouncemail(ctl, msg, XMIT_RCPTBAD, + "Some addresses were rejected by the MDA fetchmail forwards to.\r\n", + *bad_addresses, from_responses); +#endif /* EXPLICIT_BOUNCE_ON_BAD_ADDRESS */ + /* * It's tempting to do local notification only if bouncemail was * insufficient -- that is, to add && total_addresses > *bad_addresses |