if (ctl->smtp_socket != -1)
{
if (sayquit)
- SMTP_quit(ctl->smtp_socket);
+ SMTP_quit(ctl->smtp_socket, ctl->smtphostmode);
SockClose(ctl->smtp_socket);
ctl->smtp_socket = -1;
}
int smtp_open(struct query *ctl)
/* try to open a socket to the appropriate SMTP server for this query */
{
- char *parsed_host = NULL;
-
/* maybe it's time to close the socket in order to force delivery */
if (last_smtp_ok > 0 && time((time_t *)NULL) - last_smtp_ok > mytimeout)
{
struct idlist *idp;
const char *id_me = run.invisible ? ctl->server.truename : fetchmailhost;
int oldphase = phase;
+ char *parsed_host = NULL;
errno = 0;
char *portnum = SMTP_PORT;
ctl->smtphost = idp->id; /* remember last host tried. */
- if(ctl->smtphost[0]=='/')
- ctl->listener = LMTP_MODE;
-
- parsed_host = xstrdup(idp->id);
-
- if ((cp = strrchr(parsed_host, '/')))
+ if (ctl->smtphost[0]=='/')
{
- *cp++ = 0;
- portnum = cp;
- }
-
- if (ctl->smtphost[0]=='/'){
+ ctl->smtphostmode = LMTP_MODE;
+ xfree(parsed_host);
if ((ctl->smtp_socket = UnixOpen(ctl->smtphost))==-1)
continue;
- } else
+ }
+ else
+ {
+ ctl->smtphostmode = ctl->listener;
+ parsed_host = xstrdup(idp->id);
+ if ((cp = strrchr(parsed_host, '/')))
+ {
+ *cp++ = 0;
+ if (cp[0])
+ portnum = cp;
+ }
if ((ctl->smtp_socket = SockOpen(parsed_host,portnum,
- ctl->server.plugout)) == -1)
+ ctl->server.plugout, &ai1)) == -1)
+ {
+ xfree(parsed_host);
continue;
+ }
+ }
/* return immediately for ODMR */
if (ctl->server.protocol == P_ODMR)
{
- set_timeout(0);
- phase = oldphase;
- xfree(parsed_host);
- return(ctl->smtp_socket); /* success */
+ set_timeout(0);
+ phase = oldphase;
+ xfree(parsed_host);
+ return(ctl->smtp_socket); /* success */
}
- /* are we doing SMTP or LMTP? */
- SMTP_setmode(ctl->listener);
-
/* first, probe for ESMTP */
- if (SMTP_ok(ctl->smtp_socket) == SM_OK &&
- SMTP_ehlo(ctl->smtp_socket, id_me,
- ctl->server.esmtp_name, ctl->server.esmtp_password,
- &ctl->server.esmtp_options) == SM_OK)
- break; /* success */
+ if (SMTP_ok(ctl->smtp_socket, ctl->smtphostmode) == 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)
+ break; /* success */
/*
* RFC 1869 warns that some listeners hang up on a failed EHLO,
smtp_close(ctl, 0);
/* if opening for ESMTP failed, try SMTP */
- if ((ctl->smtp_socket = SockOpen(parsed_host,portnum,
- ctl->server.plugout)) == -1)
- continue;
+ if (ctl->smtphost[0]=='/')
+ {
+ if ((ctl->smtp_socket = UnixOpen(ctl->smtphost))==-1)
+ continue;
+ }
+ else
+ {
+ if ((ctl->smtp_socket = SockOpen(parsed_host,portnum,
+ ctl->server.plugout, &ai1)) == -1)
+ {
+ xfree(parsed_host);
+ continue;
+ }
+ }
- if (SMTP_ok(ctl->smtp_socket) == SM_OK &&
- SMTP_helo(ctl->smtp_socket, id_me) == SM_OK)
+ if (SMTP_ok(ctl->smtp_socket, ctl->smtphostmode) == SM_OK &&
+ SMTP_helo(ctl->smtp_socket, ctl->smtphostmode, id_me) == SM_OK)
break; /* success */
smtp_close(ctl, 0);
}
set_timeout(0);
phase = oldphase;
- }
- /*
- * RFC 1123 requires that the domain name part of the
- * RCPT TO address be "canonicalized", that is a FQDN
- * or MX but not a CNAME. Some listeners (like exim)
- * enforce this. Now that we have the actual hostname,
- * compute what we should canonicalize with.
- *
- * make sure we do not forget to drop the /port if
- * using LMTP (hmh)
- */
- if (ctl->listener == LMTP_MODE && !ctl->smtpaddress)
- {
- if (parsed_host && parsed_host[0] != 0)
- ctl->destaddr = xstrdup(parsed_host);
- else
- ctl->destaddr = (ctl->smtphost && ctl->smtphost[0] != '/') ? ctl->smtphost : "localhost";
- }
- else
- {
- /*
- * Here we try to find a correct domain name part for the RCPT
- * TO address. If smtpaddress is set, no need to guestimate
- * it. Otherwise, using ctl->smtphost as a base is a good
- * base, although we may have to strip any port appended to
- * communicate with SMTP servers that do not listen on the
- * SMTP port. (benj) */
+ /*
+ * RFC 1123 requires that the domain name part of the
+ * RCPT TO address be "canonicalized", that is a FQDN
+ * or MX but not a CNAME. Some listeners (like exim)
+ * enforce this. Now that we have the actual hostname,
+ * compute what we should canonicalize with.
+ */
+ xfree(ctl->destaddr);
if (ctl->smtpaddress)
- ctl->destaddr = ctl->smtpaddress;
- else if (ctl->smtphost && ctl->smtphost[0] != '/')
- {
- char * cp;
- if ((cp = strchr (ctl->smtphost, '/')))
- {
- /* As an alternate port for smtphost is specified, we
- need to strip it from domain name. */
- char *smtpname = xmalloc(cp - ctl->smtphost + 1);
- strncpy(smtpname, ctl->smtphost, cp - ctl->smtphost +1);
- cp = strchr(smtpname, '/');
- *cp = 0;
- ctl->destaddr = smtpname;
- }
- else
- /* No need to strip port, domain name is smtphost. */
- ctl->destaddr = ctl->smtphost;
- }
+ ctl->destaddr = xstrdup(ctl->smtpaddress);
+ /* parsed_host is smtphost without the /port */
+ else if (parsed_host && parsed_host[0] != 0)
+ ctl->destaddr = xstrdup(parsed_host);
/* No smtphost is specified or it is a UNIX socket, then use
localhost as a domain part. */
else
- ctl->destaddr = "localhost";
- }
+ ctl->destaddr = xstrdup("localhost");
+ xfree(parsed_host);
+ }
+ /* end if (ctl->smtp_socket == -1) */
if (outlevel >= O_DEBUG && ctl->smtp_socket != -1)
report(stdout, GT_("forwarding to %s\n"), ctl->smtphost);
- xfree(parsed_host);
return(ctl->smtp_socket);
}
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)
bounce_to = (run.bouncemail ? msg->return_path : run.postmaster);
- SMTP_setmode(SMTP_MODE);
-
/* can't just use fetchmailhost here, it might be localhost */
if (fqdn_of_host == NULL)
fqdn_of_host = host_fqdn(0); /* can't afford to bail out and
/* 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) != SM_OK)
+ if (SMTP_ok(sock, SMTP_MODE) != SM_OK)
{
SockClose(sock);
return FALSE;
}
- if (SMTP_helo(sock, fetchmailhost) != SM_OK
- || SMTP_from(sock, "<>", (char *)NULL) != SM_OK
- || SMTP_rcpt(sock, bounce_to) != SM_OK
- || SMTP_data(sock) != SM_OK)
+ if (SMTP_helo(sock, SMTP_MODE, fetchmailhost) != SM_OK
+ || SMTP_from(sock, SMTP_MODE, "<>", (char *)NULL) != SM_OK
+ || SMTP_rcpt(sock, SMTP_MODE, bounce_to) != SM_OK
+ || SMTP_data(sock, SMTP_MODE) != SM_OK)
{
- SMTP_quit(sock);
+ SMTP_quit(sock, SMTP_MODE);
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);
- if (SMTP_eom(sock) != SM_OK || SMTP_quit(sock))
+ if (SMTP_eom(sock, SMTP_MODE) != SM_OK
+ || SMTP_quit(sock, SMTP_MODE) != SM_OK)
{
SockClose(sock);
return(FALSE);
*/
if (smtperr >= 400)
report(stderr, GT_("%cMTP error: %s\n"),
- ctl->listener,
+ ctl->smtphostmode,
responses[0]);
switch (smtperr)
/* 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]);
if (smtperr >= 400)
report(stderr, GT_("%cMTP error: %s\n"),
- ctl->listener,
+ ctl->smtphostmode,
smtp_response);
switch (smtperr)
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,
* enforce this. Now that we have the actual hostname,
* compute what we should canonicalize with.
*/
- ctl->destaddr = ctl->smtpaddress ? ctl->smtpaddress : "localhost";
+ xfree(ctl->destaddr);
+ ctl->destaddr = xstrdup(ctl->smtpaddress ? ctl->smtpaddress : "localhost");
*bad_addresses = 0;
for (idp = msg->recipients; idp; idp = idp->next)
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.\n"));
return(PS_BSMTP);
}
ap = addr;
}
- if ((smtp_err = SMTP_from(ctl->smtp_socket, ap, options)) == SM_UNRECOVERABLE)
+ if ((smtp_err = SMTP_from(ctl->smtp_socket, ctl->smtphostmode,
+ ap, options)) == SM_UNRECOVERABLE)
{
smtp_close(ctl, 0);
return(PS_TRANSIENT);
{
int err = handle_smtp_report(ctl, msg); /* map to PS_TRANSIENT or PS_REFUSED */
- SMTP_rset(ctl->smtp_socket); /* stay on the safe side */
+ SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* 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)
{
const char *address;
address = rcpt_address (ctl, idp->id, 1);
- if ((smtp_err = SMTP_rcpt(ctl->smtp_socket, address)) == SM_UNRECOVERABLE)
+ if ((smtp_err = SMTP_rcpt(ctl->smtp_socket, ctl->smtphostmode,
+ address)) == SM_UNRECOVERABLE)
{
smtp_close(ctl, 0);
transient:
#ifdef EXPLICIT_BOUNCE_ON_BAD_ADDRESS
while (*bad_addresses)
- free(from_responses[*--bad_addresses]);
+ free(from_responses[--*bad_addresses]);
free(from_responses);
#endif /* EXPLICIT_BOUNCE_ON_BAD_ADDRESS */
return(PS_TRANSIENT);
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)++;
if (outlevel >= O_VERBOSE)
report(stderr,
GT_("%cMTP listener doesn't like recipient address `%s'\n"),
- ctl->listener, address);
+ ctl->smtphostmode, address);
break;
case PS_REFUSED:
if (outlevel >= O_VERBOSE)
report(stderr,
GT_("%cMTP listener doesn't really like recipient address `%s'\n"),
- ctl->listener, address);
+ ctl->smtphostmode, address);
break;
}
}
* crap. If one of the recipients returned PS_TRANSIENT,
* we return exactly that.
*/
- SMTP_rset(ctl->smtp_socket); /* required by RFC1870 */
+ SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* required by RFC1870 */
goto transient;
}
#ifdef EXPLICIT_BOUNCE_ON_BAD_ADDRESS
/*
* This should not be necessary, because the SMTP listener itself
- * should genrate a bounce for the bad address.
+ * should generate a bounce for the bad address.
+ *
+ * XXX FIXME 2006-01-19: is this comment true? I don't think
+ * it is, because the SMTP listener isn't required to accept bogus
+ * messages. There appears to be general SMTP<->MDA and
+ * responsibility confusion.
*/
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);
while (*bad_addresses)
- free(from_responses[*--bad_addresses]);
+ free(from_responses[--*bad_addresses]);
free(from_responses);
#endif /* EXPLICIT_BOUNCE_ON_BAD_ADDRESS */
{
if (outlevel >= O_VERBOSE)
report(stderr, GT_("no address matches; no postmaster set.\n"));
- SMTP_rset(ctl->smtp_socket); /* required by RFC1870 */
+ SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* required by RFC1870 */
return(PS_REFUSED);
}
- if ((smtp_err = SMTP_rcpt(ctl->smtp_socket,
+ if ((smtp_err = SMTP_rcpt(ctl->smtp_socket, ctl->smtphostmode,
rcpt_address (ctl, run.postmaster, 0))) == SM_UNRECOVERABLE)
{
smtp_close(ctl, 0);
if (smtp_err != SM_OK)
{
report(stderr, GT_("can't even send to %s!\n"), run.postmaster);
- SMTP_rset(ctl->smtp_socket); /* required by RFC1870 */
+ SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* required by RFC1870 */
return(PS_REFUSED);
}
* Tell the listener we're ready to send data.
* Some listeners (like zmailer) may return antispam errors here.
*/
- if ((smtp_err = SMTP_data(ctl->smtp_socket)) == SM_UNRECOVERABLE)
+ if ((smtp_err = SMTP_data(ctl->smtp_socket, ctl->smtphostmode))
+ == SM_UNRECOVERABLE)
{
smtp_close(ctl, 0);
return(PS_TRANSIENT);
if (smtp_err != SM_OK)
{
int err = handle_smtp_report(ctl, msg);
- SMTP_rset(ctl->smtp_socket); /* stay on the safe side */
+ SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* stay on the safe side */
return(err);
}
int length = 0, fromlen = 0, nameslen = 0;
char *names = NULL, *before, *after, *from = NULL;
- ctl->destaddr = "localhost";
+ (void)bad_addresses;
+ xfree(ctl->destaddr);
+ ctl->destaddr = xstrdup("localhost");
for (idp = msg->recipients; idp; idp = idp->next)
if (idp->val.status.mark == XMIT_ACCEPT)
else if (!ctl->mda)
{
report(stderr, GT_("%cMTP connect to %s failed\n"),
- ctl->listener,
+ ctl->smtphostmode,
ctl->smtphost ? ctl->smtphost : "localhost");
#ifndef FALLBACK_MDA
int smtp_err;
if (ctl->mda)
{
- int rc;
+ int rc,e,e2,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;
+ rc = e = 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 (forward)
{
/* write message terminator */
- if ((smtp_err = SMTP_eom(ctl->smtp_socket)) == SM_UNRECOVERABLE)
+ if ((smtp_err = SMTP_eom(ctl->smtp_socket, ctl->smtphostmode))
+ == SM_UNRECOVERABLE)
{
smtp_close(ctl, 0);
return(FALSE);
{
if (handle_smtp_report(ctl, msg) != PS_REFUSED)
{
- SMTP_rset(ctl->smtp_socket); /* stay on the safe side */
+ SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* stay on the safe side */
return(FALSE);
}
else
{
report(stderr, GT_("SMTP listener refused delivery\n"));
- SMTP_rset(ctl->smtp_socket); /* stay on the safe side */
+ SMTP_rset(ctl->smtp_socket, ctl->smtphostmode); /* stay on the safe side */
return(TRUE);
}
}
* otherwise the message will get left in the queue and resent
* to people who got it the first time.
*/
- if (ctl->listener == LMTP_MODE)
+ if (ctl->smtphostmode == LMTP_MODE)
{
if (lmtp_responses == 0)
{
- SMTP_ok(ctl->smtp_socket);
+ SMTP_ok(ctl->smtp_socket, ctl->smtphostmode);
/*
* 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)) == SM_UNRECOVERABLE)
+ if ((smtp_err = SMTP_ok(ctl->smtp_socket, ctl->smtphostmode))
+ == SM_UNRECOVERABLE)
{
smtp_close(ctl, 0);
goto unrecov;
return(TRUE);
}
-int open_warning_by_mail(struct query *ctl, struct msgblk *msg)
+int open_warning_by_mail(struct query *ctl)
/* set up output sink for a mailed warning to calling user */
{
int good, bad;
projects / ~andy / fetchmail / blobdiff