batchcount = 0;
}
-int smtp_open(struct query *ctl)
+static void smtp_rset(struct query *ctl)
+/* reset the mail transaction */
+{
+ if (SMTP_rset(ctl->smtp_socket, ctl->smtphostmode) == SM_UNRECOVERABLE)
+ {
+ /* close the bad connection. fetchmail will reconnect for the
+ * next mail */
+ smtp_close(ctl, 0);
+ }
+}
+
+int smtp_setup(struct query *ctl)
/* try to open a socket to the appropriate SMTP server for this query */
{
/* maybe it's time to close the socket in order to force delivery */
*/
struct idlist *idp;
const char *id_me = run.invisible ? ctl->server.truename : fetchmailhost;
- int oldphase = phase;
+ int oldphase;
char *parsed_host = NULL;
errno = 0;
for (idp = ctl->smtphunt; idp; idp = idp->next)
{
char *cp;
- char *portnum = SMTP_PORT;
+ const char *portnum = SMTP_PORT;
ctl->smtphost = idp->id; /* remember last host tried. */
if (ctl->smtphost[0]=='/')
portnum = cp;
}
if ((ctl->smtp_socket = SockOpen(parsed_host,portnum,
- ctl->server.plugout)) == -1)
+ ctl->server.plugout, &ai1)) == -1)
{
xfree(parsed_host);
continue;
}
/* first, probe for ESMTP */
- if (SMTP_ok(ctl->smtp_socket, ctl->smtphostmode) == SM_OK &&
+ if (SMTP_ok(ctl->smtp_socket, ctl->smtphostmode, TIMEOUT_STARTSMTP) == SM_OK &&
SMTP_ehlo(ctl->smtp_socket, ctl->smtphostmode, id_me,
ctl->server.esmtp_name, ctl->server.esmtp_password,
&ctl->server.esmtp_options) == SM_OK)
else
{
if ((ctl->smtp_socket = SockOpen(parsed_host,portnum,
- ctl->server.plugout)) == -1)
+ ctl->server.plugout, &ai1)) == -1)
{
xfree(parsed_host);
continue;
}
}
- if (SMTP_ok(ctl->smtp_socket, ctl->smtphostmode) == SM_OK &&
+ if (SMTP_ok(ctl->smtp_socket, ctl->smtphostmode, TIMEOUT_STARTSMTP) == SM_OK &&
SMTP_helo(ctl->smtp_socket, ctl->smtphostmode, id_me) == SM_OK)
break; /* success */
}
static int send_bouncemail(struct query *ctl, struct msgblk *msg,
- int userclass, char *message,
+ int userclass, const char *message /* should have \r\n at the end */,
int nerrors, char *errors[])
/* bounce back an error report a la RFC 1892 */
{
char daemon_name[15 + HOSTLEN] = "MAILER-DAEMON@";
- char boundary[BUFSIZ], *bounce_to;
+ char boundary[BUFSIZ];
+ const char *bounce_to;
int sock;
static char *fqdn_of_host = NULL;
const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
/* don't bounce in reply to undeliverable bounces */
- if (!msg->return_path[0] ||
+ if (!msg || !msg->return_path[0] ||
strcmp(msg->return_path, "<>") == 0 ||
strcasecmp(msg->return_path, md1) == 0 ||
strncasecmp(msg->return_path, md2, strlen(md2)) == 0)
/* we need only SMTP for this purpose */
/* XXX FIXME: hardcoding localhost is nonsense if smtphost can be
* configured */
- if ((sock = SockOpen("localhost", SMTP_PORT, NULL)) == -1)
+ if ((sock = SockOpen("localhost", SMTP_PORT, NULL, &ai1)) == -1)
return(FALSE);
- if (SMTP_ok(sock, SMTP_MODE) != SM_OK)
+ if (SMTP_ok(sock, SMTP_MODE, TIMEOUT_STARTSMTP) != SM_OK)
{
SockClose(sock);
return FALSE;
/* our first duty is to keep the sacred foo counters turning... */
snprintf(boundary, sizeof(boundary), "foo-mani-padme-hum-%ld-%ld-%ld",
- (long)getpid(), (long)getppid(), time(NULL));
+ (long)getpid(), (long)getppid(), (long)time(NULL));
if (outlevel >= O_VERBOSE)
report(stdout, GT_("SMTP: (bounce-message body)\n"));
SockPrintf(sock, "--%s\r\n", boundary);
SockPrintf(sock,"Content-Type: text/plain\r\n");
SockPrintf(sock, "\r\n");
- SockPrintf(sock, "This message was created automatically by mail delivery software.\r\n\r\n");
+ SockPrintf(sock, "This message was created automatically by mail delivery software.\r\n");
+ SockPrintf(sock, "\r\n");
SockPrintf(sock, "A message that you sent could not be delivered to one or more of its\r\n");
- SockPrintf(sock, "recipients. This is a permanent error. The following address(es) failed:\r\n");
+ SockPrintf(sock, "recipients. This is a permanent error.\r\n");
+ SockPrintf(sock, "\r\n");
+ SockPrintf(sock, "Reason: %s", message);
SockPrintf(sock, "\r\n");
+ SockPrintf(sock, "The following address(es) failed:\r\n");
if (nerrors)
{
{
int smtperr = atoi(smtp_response);
char *responses[1];
- struct idlist *walk;
- int found = 0;
responses[0] = xstrdup(smtp_response);
* RSET discards the message body and it doesn't get sent to the
* valid recipients.
*/
- SMTP_rset(ctl->smtp_socket); /* stay on the safe side */
+ smtp_rset(ctl); /* stay on the safe side */
if (outlevel >= O_DEBUG)
report(stdout, GT_("Saved error is still %d\n"), smtperr);
#endif /* __UNUSED */
* messages, which are probably in English (none of the
* MTAs I know about are internationalized).
*/
- for( walk = ctl->antispam; walk; walk = walk->next )
- if ( walk->val.status.num == smtperr )
- {
- found=1;
- break;
- }
-
- /* if (str_find(&ctl->antispam, smtperr)) */
- if ( found )
+ if (str_find(&ctl->antispam, smtperr))
{
/*
* SMTP listener explicitly refuses to deliver mail
free(responses[0]);
return(PS_REFUSED);
+ case 530: /* must issue STARTTLS error */
+ /*
+ * Some SMTP servers insist on encrypted communication
+ * Let's set PS_TRANSIENT, otherwise all messages to be sent
+ * over such server would be blackholed - see RFC 3207.
+ */
+ if (outlevel > O_SILENT)
+ report_complete(stdout,
+ GT_("SMTP server requires STARTTLS, keeping message.\n"));
+ free(responses[0]);
+ return(PS_TRANSIENT);
+
default:
/* bounce non-transient errors back to the sender */
if (smtperr >= 500 && smtperr <= 599)
{
- send_bouncemail(ctl, msg, XMIT_ACCEPT,
+ if (run.bouncemail)
+ send_bouncemail(ctl, msg, XMIT_ACCEPT,
"General SMTP/ESMTP error.\r\n",
1, responses);
free(responses[0]);
{
int smtperr = atoi(smtp_response);
+ (void)msg;
+
if (str_find(&ctl->antispam, smtperr))
{
if (run.spambounce)
int n, oldphase;
char *last;
+ if (!buf)
+ return -1;
+
/* The line may contain NUL characters. Find the last char to use
* -- the real line termination is the sequence "\n\0".
*/
if (ctl->server.base_protocol->delimited) /* server has already byte-stuffed */
{
if (ctl->mda) {
+ /* writing to MDA, undo byte-stuffing */
++buf;
} else {
/* writing to SMTP, leave the byte-stuffing in place */;
}
else /* if (!protocol->delimited) -- not byte-stuffed already */
{
- if (!ctl->mda) /* byte-stuff it */
- {
- if (!ctl->bsmtp)
- SockWrite(ctl->smtp_socket, buf, 1);
- else
- {
- fwrite(buf, 1, 1, sinkfp);
+ /* byte-stuff it */
+ if (!ctl->mda) {
+ if (!ctl->bsmtp) {
+ n = SockWrite(ctl->smtp_socket, buf, 1);
+ } else {
+ n = fwrite(buf, 1, 1, sinkfp);
+ if (ferror(sinkfp)) n = -1;
}
+ if (n < 0)
+ return n;
}
}
}
}
n = 0;
- if (ctl->mda || ctl->bsmtp)
- n = fwrite(buf, last - buf, 1, sinkfp);
- else if (ctl->smtp_socket != -1)
+ if (ctl->mda || ctl->bsmtp) {
+ n = fwrite(buf, 1, last - buf, sinkfp);
+ if (ferror(sinkfp)) n = -1;
+ } else if (ctl->smtp_socket != -1)
n = SockWrite(ctl->smtp_socket, buf, last - buf);
phase = oldphase;
else
sinkfp = fopen(ctl->bsmtp, "a");
+ if (!sinkfp || ferror(sinkfp)) {
+ report(stderr, GT_("BSMTP file open failed: %s\n"),
+ strerror(errno));
+ return(PS_BSMTP);
+ }
+
/* see the ap computation under the SMTP branch */
need_anglebrs = (msg->return_path[0] != '<');
fprintf(sinkfp,
fputs("DATA\r\n", sinkfp);
- if (ferror(sinkfp))
+ if (fflush(sinkfp) || ferror(sinkfp))
{
- report(stderr, GT_("BSMTP file open or preamble write failed\n"));
+ report(stderr, GT_("BSMTP preamble write failed: %s.\n"), strerror(errno));
return(PS_BSMTP);
}
{
int err = handle_smtp_report(ctl, msg); /* map to PS_TRANSIENT or PS_REFUSED */
- SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* stay on the safe side */
+ smtp_rset(ctl); /* stay on the safe side */
return(err);
}
for (idp = msg->recipients; idp; idp = idp->next)
total_addresses++;
#ifdef EXPLICIT_BOUNCE_ON_BAD_ADDRESS
- from_responses = xmalloc(sizeof(char *) * total_addresses);
+ from_responses = (char **)xmalloc(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)
case PS_SUCCESS:
#ifdef EXPLICIT_BOUNCE_ON_BAD_ADDRESS
from_responses[*bad_addresses] = xstrdup(smtp_response);
- strcpy(from_responses[*bad_addresses], smtp_response);
#endif /* EXPLICIT_BOUNCE_ON_BAD_ADDRESS */
(*bad_addresses)++;
* crap. If one of the recipients returned PS_TRANSIENT,
* we return exactly that.
*/
- SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* required by RFC1870 */
+ smtp_rset(ctl); /* required by RFC1870 */
goto transient;
}
#ifdef EXPLICIT_BOUNCE_ON_BAD_ADDRESS
{
if (outlevel >= O_VERBOSE)
report(stderr, GT_("no address matches; no postmaster set.\n"));
- SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* required by RFC1870 */
+ smtp_rset(ctl); /* required by RFC1870 */
return(PS_REFUSED);
}
if ((smtp_err = SMTP_rcpt(ctl->smtp_socket, ctl->smtphostmode,
if (smtp_err != SM_OK)
{
report(stderr, GT_("can't even send to %s!\n"), run.postmaster);
- SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* required by RFC1870 */
+ smtp_rset(ctl); /* required by RFC1870 */
return(PS_REFUSED);
}
if (smtp_err != SM_OK)
{
int err = handle_smtp_report(ctl, msg);
- SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* stay on the safe side */
+ smtp_rset(ctl); /* stay on the safe side */
return(err);
}
*/
nameslen = 0;
for (idp = msg->recipients; idp; idp = idp->next)
- if ((idp->val.status.mark == XMIT_ACCEPT))
+ if (idp->val.status.mark == XMIT_ACCEPT)
nameslen += (strlen(idp->id) + 1); /* string + ' ' */
- if ((*good_addresses == 0))
+ if (*good_addresses == 0)
nameslen = strlen(run.postmaster);
names = (char *)xmalloc(nameslen + 1); /* account for '\0' */
sp += 2;
}
- after = xmalloc(length + 1);
+ after = (char *)xmalloc(length + 1);
/* copy mda source string to after, while expanding %[sTF] */
for (dp = after, sp = before; (*dp = *sp); dp++, sp++) {
* under all BSDs and Linux)
*/
orig_uid = getuid();
- seteuid(ctl->uid);
+ if (seteuid(ctl->uid)) {
+ report(stderr, GT_("Cannot switch effective user id to %ld: %s\n"), (long)ctl->uid, strerror(errno));
+ return PS_IOERR;
+ }
#endif /* HAVE_SETEUID */
sinkfp = popen(before, "w");
#ifdef HAVE_SETEUID
/* this will fail quietly if we didn't start as root */
- seteuid(orig_uid);
+ if (seteuid(orig_uid)) {
+ report(stderr, GT_("Cannot switch effective user id back to original %ld: %s\n"), (long)orig_uid, strerror(errno));
+ return PS_IOERR;
+ }
#endif /* HAVE_SETEUID */
if (!sinkfp)
{
*bad_addresses = *good_addresses = 0;
+ if (want_progress() && outlevel >= O_VERBOSE && !ctl->mda && !ctl->bsmtp) puts("");
+
if (ctl->bsmtp) /* dump to a BSMTP batch file */
return(open_bsmtp_sink(ctl, msg, good_addresses, bad_addresses));
/*
* open a socket fails, fall through to attempt delivery via
* local MDA.
*/
- else if (!ctl->mda && smtp_open(ctl) != -1)
+ else if (!ctl->mda && smtp_setup(ctl) != -1)
return(open_smtp_sink(ctl, msg, good_addresses, bad_addresses));
/*
/* perform end-of-message actions on the current output sink */
{
int smtp_err;
- if (ctl->mda)
- {
- int rc;
+
+ if (want_progress() && outlevel >= O_VERBOSE && !ctl->mda && !ctl->bsmtp) puts("");
+
+ if (ctl->bsmtp && sinkfp) {
+ int error, oerrno;
+
+ /* implicit disk-full check here... */
+ fputs(".\r\n", sinkfp);
+ error = ferror(sinkfp);
+ oerrno = errno;
+ if (strcmp(ctl->bsmtp, "-"))
+ {
+ if (fclose(sinkfp) == EOF) {
+ error = 1;
+ oerrno = errno;
+ }
+ sinkfp = (FILE *)NULL;
+ }
+ if (error)
+ {
+ report(stderr,
+ GT_("Message termination or close of BSMTP file failed: %s\n"), strerror(oerrno));
+ return(FALSE);
+ }
+ } else if (ctl->mda) {
+ int rc = 0, e = 0, e2 = 0, err = 0;
/* close the delivery pipe, we'll reopen before next message */
if (sinkfp)
{
+ if (ferror(sinkfp))
+ err = 1, e2 = errno;
+ if ((fflush(sinkfp)))
+ err = 1, e2 = errno;
+
+ errno = 0;
rc = pclose(sinkfp);
+ e = errno;
sinkfp = (FILE *)NULL;
}
- else
- rc = 0;
deal_with_sigchld(); /* Restore SIGCHLD handling to reap zombies */
- if (rc)
+ if (rc || err)
{
- if (WIFSIGNALED(rc)) {
+ if (err) {
+ report(stderr, GT_("Error writing to MDA: %s\n"), strerror(e2));
+ } else if (WIFSIGNALED(rc)) {
report(stderr,
GT_("MDA died of signal %d\n"), WTERMSIG(rc));
} else if (WIFEXITED(rc)) {
GT_("MDA returned nonzero status %d\n"), WEXITSTATUS(rc));
} else {
report(stderr,
- GT_("Strange: MDA pclose returned %d, cannot handle at %s:%d\n"), rc, __FILE__, __LINE__);
+ GT_("Strange: MDA pclose returned %d and errno %d/%s, cannot handle at %s:%d\n"),
+ rc, e, strerror(e), __FILE__, __LINE__);
}
return(FALSE);
}
}
- else if (ctl->bsmtp && sinkfp)
- {
- int error;
-
- /* implicit disk-full check here... */
- fputs(".\r\n", sinkfp);
- error = ferror(sinkfp);
- if (strcmp(ctl->bsmtp, "-"))
- {
- if (fclose(sinkfp) == EOF) error = 1;
- sinkfp = (FILE *)NULL;
- }
- if (error)
- {
- report(stderr,
- GT_("Message termination or close of BSMTP file failed\n"));
- return(FALSE);
- }
- }
else if (forward)
{
/* write message terminator */
{
if (handle_smtp_report(ctl, msg) != PS_REFUSED)
{
- SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* stay on the safe side */
+ smtp_rset(ctl); /* stay on the safe side */
return(FALSE);
}
else
{
report(stderr, GT_("SMTP listener refused delivery\n"));
- SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* stay on the safe side */
+ smtp_rset(ctl); /* stay on the safe side */
return(TRUE);
}
}
{
if (lmtp_responses == 0)
{
- SMTP_ok(ctl->smtp_socket, ctl->smtphostmode);
+ SMTP_ok(ctl->smtp_socket, ctl->smtphostmode, TIMEOUT_EOM);
/*
* According to RFC2033, 503 is the only legal response
char **responses;
/* eat the RFC2033-required responses, saving errors */
- responses = xmalloc(sizeof(char *) * lmtp_responses);
+ responses = (char **)xmalloc(sizeof(char *) * lmtp_responses);
for (errors = i = 0; i < lmtp_responses; i++)
{
- if ((smtp_err = SMTP_ok(ctl->smtp_socket, ctl->smtphostmode))
+ if ((smtp_err = SMTP_ok(ctl->smtp_socket, ctl->smtphostmode, TIMEOUT_EOM))
== SM_UNRECOVERABLE)
{
smtp_close(ctl, 0);
projects / ~andy / fetchmail / blobdiff