aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2001-10-01 02:54:54 +0000
committerEric S. Raymond <esr@thyrsus.com>2001-10-01 02:54:54 +0000
commitc2d9bf6f5b0a8a9143763836c13d046ae26b313b (patch)
tree57a2edac1ebe1cf2894ec719536ec01d8b55389f
parent07eb0c14abbe2a1b4986d82bb3cb64f0cbb1ffb8 (diff)
downloadfetchmail-c2d9bf6f5b0a8a9143763836c13d046ae26b313b.tar.gz
fetchmail-c2d9bf6f5b0a8a9143763836c13d046ae26b313b.tar.bz2
fetchmail-c2d9bf6f5b0a8a9143763836c13d046ae26b313b.zip
HMH fixes.
svn path=/trunk/; revision=3528
-rw-r--r--sink.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/sink.c b/sink.c
index 1625626c..a72be53a 100644
--- a/sink.c
+++ b/sink.c
@@ -449,11 +449,6 @@ static int handle_smtp_report(struct query *ctl, struct msgblk *msg)
}
/* these are shared by open_sink and stuffline */
-#ifndef HAVE_SIGACTION
-static RETSIGTYPE (*sigchld)(int);
-#else
-static struct sigaction sa_old;
-#endif /* HAVE_SIGACTION */
static FILE *sinkfp;
int stuffline(struct query *ctl, char *buf)
@@ -590,7 +585,7 @@ static int open_bsmtp_sink(struct query *ctl, struct msgblk *msg,
}
/* this is experimental and will be removed if double bounces are reported */
-#define EXPLICIT_BOUNCE
+#define EXPLICIT_BOUNCE_ON_BAD_ADDRESS
static int open_smtp_sink(struct query *ctl, struct msgblk *msg,
int *good_addresses, int *bad_addresses)
@@ -600,9 +595,9 @@ static int open_smtp_sink(struct query *ctl, struct msgblk *msg,
struct idlist *idp;
char options[MSGBUFSIZE];
char addr[HOSTLEN+USERNAMELEN+1];
-#ifdef EXPLICIT_BOUNCE
+#ifdef EXPLICIT_BOUNCE_ON_BAD_ADDRESS
char **from_responses;
-#endif /* EXPLICIT_BOUNCE */
+#endif /* EXPLICIT_BOUNCE_ON_BAD_ADDRESS */
int total_addresses;
/*
@@ -710,6 +705,9 @@ static int open_smtp_sink(struct query *ctl, struct msgblk *msg,
(*good_addresses)++;
else
{
+#ifdef EXPLICIT_BOUNCE_ON_BAD_ADDRESS
+ char errbuf[POPBUFSIZE];
+#endif /* EXPLICIT_BOUNCE_ON_BAD_ADDRESS */
handle_smtp_report(ctl, msg);
#ifdef EXPLICIT_BOUNCE_ON_BAD_ADDRESS