/*
* driver.c -- generic driver for mail fetch method protocols
*
- * Copyright 1996 by Eric S. Raymond
- * All rights reserved.
+ * Copyright 1997 by Eric S. Raymond
* For license terms, see the file COPYING in this directory.
*/
-#include <config.h>
+#include "config.h"
#include <stdio.h>
#include <setjmp.h>
#include <errno.h>
#include <ctype.h>
#include <string.h>
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif /* HAVE_MEMORY_H */
#if defined(STDC_HEADERS)
#include <stdlib.h>
#endif
#endif
#if defined(HAVE_ALLOCA_H)
#include <alloca.h>
+#else
+#ifdef _AIX
+ #pragma alloca
+#endif
+#endif
+#if defined(HAVE_SYS_ITIMER_H)
+#include <sys/itimer.h>
#endif
#include <sys/time.h>
#include <signal.h>
#endif /* HAVE_GETHOSTBYNAME */
#ifdef KERBEROS_V4
+#if defined (__bsdi__)
+#include <des.h> /* order of includes matters */
+#include <krb.h>
+#define krb_get_err_text(e) (krb_err_txt[e])
+#else
+#if defined(__FreeBSD__) || defined(__linux__)
+#define krb_get_err_text(e) (krb_err_txt[e])
+#include <krb.h>
+#include <des.h>
+#else
#include <krb.h>
#include <des.h>
+#endif /* ! defined (__FreeBSD__) */
+#endif /* ! defined (__bsdi__) */
#include <netinet/in.h>
#include <netdb.h>
#endif /* KERBEROS_V4 */
-#include "socket.h"
#include "fetchmail.h"
#include "socket.h"
#include "smtp.h"
#define SMTP_PORT 25 /* standard SMTP service port */
+#ifndef strstr /* glibc-2.1 declares this as a macro */
extern char *strstr(); /* needed on sysV68 R3V7.1. */
+#endif /* strstr */
-int batchlimit; /* how often to tear down the delivery connection */
int fetchlimit; /* how often to tear down the server connection */
int batchcount; /* count of messages sent in current batch */
-int peek_capable; /* can we peek for better error recovery? */
+flag peek_capable; /* can we peek for better error recovery? */
+int pass; /* how many times have we re-polled? */
static const struct method *protocol;
static jmp_buf restart;
char tag[TAGLEN];
static int tagnum;
-#define GENSYM (sprintf(tag, "a%04d", ++tagnum), tag)
+#define GENSYM (sprintf(tag, "a%04d", ++tagnum % TAGMOD), tag)
static char *shroud; /* string to shroud in debug output, if non-NULL */
static int mytimeout; /* value of nonreponse timeout */
+static int msglen; /* actual message length */
-static void vtalarm(int timeleft)
+static void set_timeout(int timeleft)
/* reset the nonresponse-timeout */
{
struct itimerval ntimeout;
ntimeout.it_interval.tv_sec = ntimeout.it_interval.tv_usec = 0;
ntimeout.it_value.tv_sec = timeleft;
ntimeout.it_value.tv_usec = 0;
- setitimer(ITIMER_VIRTUAL, &ntimeout, (struct itimerval *)NULL);
+ setitimer(ITIMER_REAL, &ntimeout, (struct itimerval *)NULL);
}
-static void vtalarm_handler (int signal)
-/* handle server-timeout SIGVTALARM signal */
+static void timeout_handler (int signal)
+/* handle server-timeout SIGALRM signal */
{
longjmp(restart, 1);
}
+#define XMIT_ACCEPT 1
+#define XMIT_REJECT 2
+#define XMIT_ANTISPAM 3
+static int accept_count, reject_count;
+
#ifdef HAVE_RES_SEARCH
#define MX_RETRIES 3
struct hostent *he;
struct mxentry *mxp, *mxrecords;
+ struct hostdata *lead_server =
+ ctl->server.lead_server ? ctl->server.lead_server : &ctl->server;
+
/*
* The first two checks are optimizations that will catch a good
- * many cases. (1) check against the hostname the user
- * specified. Odds are good this will either be the mailserver's
- * FQDN or a suffix of it with the mailserver's domain's default
- * host name omitted. Then check the rest of the `also known as'
+ * many cases.
+ *
+ * (1) check against the `true name' deduced from the poll label
+ * and the via option (if present) at the beginning of the poll cycle.
+ * Odds are good this will either be the mailserver's FQDN or a suffix of
+ * it with the mailserver's domain's default host name omitted.
+ *
+ * (2) Then check the rest of the `also known as'
* cache accumulated by previous DNS checks. This cache is primed
* by the aka list option.
*
- * (2) check against the mailserver's FQDN, in case
- * it's not the same as the declared hostname.
- *
- * Either of these on a mail address is definitive. Only if the
- * name doesn't match either is it time to call the bind library.
+ * Any of these on a mail address is definitive. Only if the
+ * name doesn't match any is it time to call the bind library.
* If this happens odds are good we're looking at an MX name.
*/
- if (str_in_list(&ctl->server.lead_server->names, name))
+ if (strcmp(lead_server->truename, name) == 0)
return(TRUE);
- else if (strcmp(name, ctl->server.canonical_name) == 0)
+ else if (str_in_list(&lead_server->akalist, name))
return(TRUE);
- else if (ctl->server.no_dns)
+ else if (!ctl->server.dns)
return(FALSE);
/*
*/
else if ((he = gethostbyname(name)) != (struct hostent *)NULL)
{
- if (strcmp(ctl->server.canonical_name, he->h_name) == 0)
+ if (strcmp(ctl->server.truename, he->h_name) == 0)
goto match;
else
return(FALSE);
putchar('\n'); /* terminate the progress message */
error(0, 0,
"nameserver failure while looking for `%s' during poll of %s.",
- name, ctl->server.names->id);
+ name, ctl->server.pollname);
ctl->errcount++;
- longjmp(restart, 2); /* try again next poll cycle */
break;
}
case NO_RECOVERY: /* non-recoverable name server error */
case TRY_AGAIN: /* temporary error on authoritative server */
default:
- error(0, 0,
+ error(0, -1,
"nameserver failure while looking for `%s' during poll of %s.",
- name, ctl->server.names->id);
+ name, ctl->server.pollname);
ctl->errcount++;
- longjmp(restart, 2); /* try again next poll cycle */
break;
}
}
else
{
for (mxp = mxrecords; mxp->name; mxp++)
- if (strcmp(ctl->server.canonical_name, mxp->name) == 0)
+ if (strcmp(ctl->server.truename, mxp->name) == 0)
goto match;
return(FALSE);
match:;
}
/* add this name to relevant server's `also known as' list */
- save_str(&ctl->server.lead_server->names, -1, name);
+ save_str(&lead_server->akalist, -1, name);
return(TRUE);
}
struct idlist **xmit_names; /* list of recipient names parsed out */
{
const char *lname;
-
+ int sl;
+ int off = 0;
+
lname = idpair_find(&ctl->localnames, name);
if (!lname && ctl->wildcard)
lname = name;
if (lname != (char *)NULL)
{
+ /*
+ * If the name of the user begins with a
+ * qmail virtual domain prefix, remove
+ * the prefix
+ */
+ if (ctl->server.qvirtual)
+ {
+ sl=strlen(ctl->server.qvirtual);
+ if (!strncasecmp(lname,ctl->server.qvirtual,sl)) off=sl;
+ }
if (outlevel == O_VERBOSE)
- error(0, 0, "mapped %s to local %s", name, lname);
- save_str(xmit_names, -1, lname);
+ error(0, 0, "mapped %s to local %s", name, lname+off);
+ save_str(xmit_names, XMIT_ACCEPT, lname+off);
+ accept_count++;
}
}
return;
else
{
- char *cp, *lname;
+ char *cp;
if ((cp = nxtaddr(hdr)) != (char *)NULL)
do {
{
char *rhs;
- rhs = atsign + 1 + (strlen(atsign) - strlen(idp->id));
+ rhs = atsign + (strlen(atsign) - strlen(idp->id));
if ((rhs[-1] == '.' || rhs[-1] == '@')
- && strcmp(rhs, idp->id) == 0)
+ && strcasecmp(rhs, idp->id) == 0)
{
if (outlevel == O_VERBOSE)
error(0, 0, "passed through %s matching %s",
cp, idp->id);
- save_str(xmit_names, -1, cp);
+ save_str(xmit_names, XMIT_ACCEPT, cp);
+ accept_count++;
continue;
}
}
* going and try to find a mapping to a client name.
*/
if (!is_host_alias(atsign+1, ctl))
+ {
+ save_str(xmit_names, XMIT_REJECT, cp);
+ reject_count++;
continue;
+ }
atsign[0] = '\0';
}
}
}
-char *parse_received(struct query *ctl, char *bufp)
-/* try to extract */
+static char *parse_received(struct query *ctl, char *bufp)
+/* try to extract real addressee from the Received line */
{
- char *ok;
+ char *ok = (char *)NULL;
static char rbuf[HOSTLEN + USERNAMELEN + 4];
/*
* address in the Received line. Sendmail itself only
* does this when the mail has a single recipient.
*/
- if ((ok = strstr(bufp, "by ")) == (char *)NULL)
- ok = (char *)NULL;
- else
+ if ((ok = strstr(bufp, "by ")) && isspace(ok[-1]))
{
char *sp, *tp;
* recipient name after a following "for". Otherwise
* punt.
*/
- if (is_host_alias(rbuf, ctl))
- ok = strstr(sp, "for ");
- else
+ if (!is_host_alias(rbuf, ctl))
ok = (char *)NULL;
- }
-
- if (ok != 0)
- {
- char *sp, *tp;
-
- tp = rbuf;
- sp = ok + 4;
- if (*sp == '<')
- sp++;
- while (*sp && *sp != '>' && *sp != '@' && *sp != ';')
- if (!isspace(*sp))
- *tp++ = *sp++;
- else
- {
- /* uh oh -- whitespace here can't be right! */
- ok = (char *)NULL;
- break;
- }
- *tp = '\0';
+ else if ((ok = strstr(sp, "for ")) && isspace(ok[-1]))
+ {
+ tp = rbuf;
+ sp = ok + 4;
+ if (*sp == '<')
+ sp++;
+ while (*sp == '@') /* skip routes */
+ while (*sp++ != ':')
+ continue;
+ while (*sp && *sp != '>' && *sp != '@' && *sp != ';')
+ if (!isspace(*sp))
+ *tp++ = *sp++;
+ else
+ {
+ /* uh oh -- whitespace here can't be right! */
+ ok = (char *)NULL;
+ break;
+ }
+ *tp = '\0';
+ }
}
if (!ok)
}
#endif /* HAVE_RES_SEARCH */
-static FILE *smtp_open(struct query *ctl)
+static int smtp_open(struct query *ctl)
/* try to open a socket to the appropriate SMTP server for this query */
{
- struct query *lead;
-
- lead = ctl->lead_smtp; /* go to the SMTP leader for this query */
-
/* maybe it's time to close the socket in order to force delivery */
- if (batchlimit && lead->smtp_sockfp && batchcount++ == batchlimit)
+ if (ctl->batchlimit > 0 && (ctl->smtp_socket != -1) && batchcount++ == ctl->batchlimit)
{
- fclose(lead->smtp_sockfp);
- lead->smtp_sockfp = (FILE *)NULL;
+ close(ctl->smtp_socket);
+ ctl->smtp_socket = -1;
batchcount = 0;
}
- /*
- * RFC 1123 requires that the domain name in HELO address is a
- * "valid principal domain name" for the client host. We
- * violate this with malice aforethought in order to make the
- * Received headers and logging look right.
- *
- * In fact this code relies on the RFC1123 requirement that the
- * SMTP listener must accept messages even if verification of the
- * HELO name fails (RFC1123 section 5.2.5, paragraph 2).
- */
-
- /* if no socket to this host is already set up, try to open ESMTP */
- if (lead->smtp_sockfp == (FILE *)NULL)
+ /* if no socket to any SMTP host is already set up, try to open one */
+ if (ctl->smtp_socket == -1)
{
- if ((lead->smtp_sockfp = SockOpen(lead->smtphost, SMTP_PORT)) == (FILE *)NULL)
- return((FILE *)NULL);
- else if (SMTP_ok(lead->smtp_sockfp) != SM_OK
- || SMTP_ehlo(lead->smtp_sockfp,
- ctl->server.names->id,
- &lead->server.esmtp_options) != SM_OK)
+ /*
+ * RFC 1123 requires that the domain name in HELO address is a
+ * "valid principal domain name" for the client host. If we're
+ * running in invisible mode, violate this with malice
+ * aforethought in order to make the Received headers and
+ * logging look right.
+ *
+ * In fact this code relies on the RFC1123 requirement that the
+ * SMTP listener must accept messages even if verification of the
+ * HELO name fails (RFC1123 section 5.2.5, paragraph 2).
+ *
+ * How we compute the true mailhost name to pass to the
+ * listener doesn't affect behavior on RFC1123- violating
+ * listener that check for name match; we're going to lose
+ * on those anyway because we can never give them a name
+ * that matches the local machine fetchmail is running on.
+ * What it will affect is the listener's logging.
+ */
+ struct idlist *idp;
+ char *id_me = use_invisible ? ctl->server.truename : fetchmailhost;
+
+ errno = 0;
+
+ /*
+ * Run down the SMTP hunt list looking for a server that's up.
+ * Use both explicit hunt entries (value TRUE) and implicit
+ * (default) ones (value FALSE).
+ */
+ for (idp = ctl->smtphunt; idp; idp = idp->next)
{
+ ctl->smtphost = idp->id; /* remember last host tried. */
+
+ if ((ctl->smtp_socket = SockOpen(idp->id,SMTP_PORT)) == -1)
+ continue;
+
+ if (SMTP_ok(ctl->smtp_socket) == SM_OK &&
+ SMTP_ehlo(ctl->smtp_socket, id_me,
+ &ctl->server.esmtp_options) == SM_OK)
+ break; /* success */
+
/*
* RFC 1869 warns that some listeners hang up on a failed EHLO,
* so it's safest not to assume the socket will still be good.
*/
- fclose(lead->smtp_sockfp);
- lead->smtp_sockfp = (FILE *)NULL;
+ close(ctl->smtp_socket);
+ ctl->smtp_socket = -1;
+
+ /* if opening for ESMTP failed, try SMTP */
+ if ((ctl->smtp_socket = SockOpen(idp->id,SMTP_PORT)) == -1)
+ continue;
+
+ if (SMTP_ok(ctl->smtp_socket) == SM_OK &&
+ SMTP_helo(ctl->smtp_socket, id_me) == SM_OK)
+ break; /* success */
+
+ close(ctl->smtp_socket);
+ ctl->smtp_socket = -1;
}
}
- /* if opening for ESMTP failed, try SMTP */
- if (lead->smtp_sockfp == (FILE *)NULL)
+ if (outlevel >= O_VERBOSE && ctl->smtp_socket != -1)
+ error(0, 0, "forwarding to SMTP port on %s", ctl->smtphost);
+
+ return(ctl->smtp_socket);
+}
+
+/* these are shared by stuffline, readheaders and readbody */
+static FILE *sinkfp;
+static RETSIGTYPE (*sigchld)();
+static int sizeticker;
+
+static int stuffline(struct query *ctl, char *buf)
+/* ship a line to the given control block's output sink (SMTP server or MDA) */
+{
+ int n;
+
+ /* fix message lines that have only \n termination (for qmail) */
+ if (ctl->forcecr)
{
- if ((lead->smtp_sockfp = SockOpen(lead->smtphost, SMTP_PORT)) == (FILE *)NULL)
- return((FILE *)NULL);
- else if (SMTP_ok(lead->smtp_sockfp) != SM_OK
- || SMTP_helo(lead->smtp_sockfp, ctl->server.names->id) != SM_OK)
+ char *cp = buf + strlen(buf) - 1;
+
+ if (*cp == '\n' && (cp == buf || cp[-1] != '\r'))
+ {
+ *cp++ = '\r';
+ *cp++ = '\n';
+ *cp++ = '\0';
+ }
+ }
+
+ /*
+ * SMTP byte-stuffing. We only do this if the protocol does *not*
+ * use .<CR><LF> as EOM. If it does, the server will already have
+ * decorated any . lines it sends back up.
+ */
+ if (*buf == '.')
+ if (protocol->delimited) /* server has already byte-stuffed */
{
- fclose(lead->smtp_sockfp);
- lead->smtp_sockfp = (FILE *)NULL;
+ if (ctl->mda)
+ ++buf;
+ else
+ /* writing to SMTP, leave the byte-stuffing in place */;
}
+ else /* if (!protocol->delimited) -- not byte-stuffed already */
+ {
+ if (!ctl->mda)
+ SockWrite(ctl->smtp_socket, buf, 1); /* byte-stuff it */
+ else
+ /* leave it alone */;
+ }
+
+ /* we may need to strip carriage returns */
+ if (ctl->stripcr)
+ {
+ char *sp, *tp;
+
+ for (sp = tp = buf; *sp; sp++)
+ if (*sp != '\r')
+ *tp++ = *sp;
+ *tp = '\0';
}
- return(lead->smtp_sockfp);
+ n = 0;
+ if (ctl->mda)
+ n = fwrite(buf, 1, strlen(buf), sinkfp);
+ else if (ctl->smtp_socket != -1)
+ n = SockWrite(ctl->smtp_socket, buf, strlen(buf));
+
+ return(n);
}
-static int gen_readmsg(sockfp, len, delimited, ctl, realname)
-/* read message content and ship to SMTP or MDA */
-FILE *sockfp; /* to which the server is connected */
-long len; /* length of message */
-int delimited; /* does the protocol use a message delimiter? */
+static int readheaders(sock, fetchlen, reallen, ctl, num)
+/* read message headers and ship to SMTP or MDA */
+int sock; /* to which the server is connected */
+long fetchlen; /* length of message according to fetch response */
+long reallen; /* length of message according to getsizes */
struct query *ctl; /* query control record */
-char *realname; /* real name of host */
+int num; /* index of message */
{
- char buf [MSGBUFSIZE+1];
- int from_offs, to_offs, cc_offs, bcc_offs, ctt_offs, env_offs;
- char *headers, *received_for;
- int n, oldlen, ch, sizeticker, delete_ok;
- FILE *sinkfp;
- RETSIGTYPE (*sigchld)();
-#ifdef HAVE_GETHOSTBYNAME
- char rbuf[HOSTLEN + USERNAMELEN + 4];
-#endif /* HAVE_GETHOSTBYNAME */
+ struct addrblk
+ {
+ int offset;
+ struct addrblk *next;
+ } *addrchain = NULL, **chainptr = &addrchain;
+ char buf[MSGBUFSIZE+1], return_path[MSGBUFSIZE+1];
+ int from_offs, ctt_offs, env_offs, next_address;
+ char *headers, *received_for, *desthost, *rcv;
+ int n, linelen, oldlen, ch, remaining, skipcount;
char *cp;
struct idlist *idp, *xmit_names;
- int good_addresses, bad_addresses;
+ flag good_addresses, bad_addresses, has_nuls;
#ifdef HAVE_RES_SEARCH
- int no_local_matches = FALSE;
+ flag no_local_matches = FALSE;
#endif /* HAVE_RES_SEARCH */
+ int olderrs;
- sizeticker = 0;
- delete_ok = TRUE;
+ next_address = sizeticker = 0;
+ has_nuls = FALSE;
+ return_path[0] = '\0';
+ olderrs = ctl->errcount;
/* read message headers */
headers = received_for = NULL;
- from_offs = to_offs = cc_offs = bcc_offs = ctt_offs = env_offs = -1;
+ from_offs = ctt_offs = env_offs = -1;
oldlen = 0;
- for (;;)
+ msglen = 0;
+ skipcount = 0;
+
+ for (remaining = fetchlen; remaining > 0 || protocol->delimited; remaining -= linelen)
{
- char *bufp, *line;
+ char *line;
line = xmalloc(sizeof(buf));
+ linelen = 0;
line[0] = '\0';
do {
- if (!SockGets(buf, sizeof(buf)-1, sockfp))
+ if ((n = SockRead(sock, buf, sizeof(buf)-1)) == -1)
return(PS_SOCKET);
- vtalarm(ctl->server.timeout);
- /* leave extra room for reply_hack to play with */
- line = realloc(line, strlen(line) + strlen(buf) + HOSTLEN + 1);
+ linelen += n;
+ msglen += n;
+
+ /* lines may not be properly CRLF terminated; fix this for qmail */
+ if (ctl->forcecr)
+ {
+ cp = buf + strlen(buf) - 1;
+ if (*cp == '\n' && (cp == buf || cp[-1] != '\r'))
+ {
+ *cp++ = '\r';
+ *cp++ = '\n';
+ *cp++ = '\0';
+ }
+ }
+
+ set_timeout(ctl->server.timeout);
+
+ line = (char *) realloc(line, strlen(line) + strlen(buf) +1);
+
strcat(line, buf);
if (line[0] == '\r' && line[1] == '\n')
break;
} while
/* we may need to grab RFC822 continuations */
- ((ch = SockPeek(sockfp)) == ' ' || ch == '\t');
+ ((ch = SockPeek(sock)) == ' ' || ch == '\t');
/* write the message size dots */
- if ((n = strlen(line)) > 0)
+ if ((outlevel > O_SILENT && outlevel < O_VERBOSE) && linelen > 0)
{
- sizeticker += n;
+ sizeticker += linelen;
while (sizeticker >= SIZETICKER)
{
- if (outlevel > O_SILENT)
- error_build(".");
+ error_build(".");
sizeticker -= SIZETICKER;
}
}
- len -= n;
+
+ if (linelen != strlen(line))
+ has_nuls = TRUE;
/* check for end of headers; don't save terminating line */
if (line[0] == '\r' && line[1] == '\n')
break;
}
- if (!ctl->no_rewrite)
- reply_hack(line, realname);
+ /*
+ * The University of Washington IMAP server (the reference
+ * implementation of IMAP4 written by Mark Crispin) relies
+ * on being able to keep base-UID information in a special
+ * message at the head of the mailbox. This message should
+ * neither be deleted nor forwarded.
+ */
+#ifdef POP2_ENABLE
+ /*
+ * We disable this check under POP2 because there's no way to
+ * prevent deletion of the message. So at least we ought to
+ * forward it to the user so he or she will have some clue
+ * that things have gone awry.
+ */
+ if (protocol->port != 109)
+#endif /* POP2_ENABLE */
+ if (num == 1 && !strncasecmp(line, "X-IMAP:", 7))
+ return(PS_RETAINED);
+
+ /*
+ * This code prevents fetchmail from becoming an accessory after
+ * the fact to upstream sendmails with the `E' option on. This
+ * can result in an escaped Unix From_ line at the beginning of
+ * the headers. If fetchmail just passes it through, the client
+ * listener may think the message has *no* headers (since the first)
+ * line it sees doesn't look RFC822-conformant) and fake up a set.
+ *
+ * What the user would see in this case is bogus (synthesized)
+ * headers, followed by a blank line, followed by the >From,
+ * followed by the real headers, followed by a blank line,
+ * followed by text.
+ *
+ * We forestall this lossage by tossing anything that looks
+ * like an escaped From_ line in headers. These aren't RFC822
+ * so our conscience is clear...
+ */
+ if (!strncasecmp(line, ">From ", 6))
+ {
+ free(line);
+ continue;
+ }
+
+ /*
+ * If we see a Status line, it may have been inserted by an MUA
+ * on the mail host, or it may have been inserted by the server
+ * program after the headers in the transaction stream. This
+ * can actually hose some new-mail notifiers such as xbuffy,
+ * which assumes any Status line came from a *local* MDA and
+ * therefore indicates that the message has been seen.
+ *
+ * Some buggy POP servers (including at least the 3.3(20)
+ * version of the one distributed with IMAP) insert empty
+ * Status lines in the transaction stream; we'll chuck those
+ * unconditionally. Nonempty ones get chucked if the user
+ * turns on the dropstatus flag.
+ */
+ if (!strncasecmp(line, "Status:", 7))
+ {
+ char *cp;
+
+ for (cp = line + 7; *cp && isspace(*cp); cp++)
+ continue;
+
+ if (!*cp || ctl->dropstatus)
+ {
+ free(line);
+ continue;
+ }
+ }
+
+ /*
+ * OK, this is messy. If we're forwarding by SMTP, it's the
+ * SMTP-receiver's job (according to RFC821, page 22, section
+ * 4.1.1) to generate a Return-Path line on final delivery.
+ * The trouble is, we've already got one because the
+ * mailserver's SMTP thought *it* was responsible for final
+ * delivery.
+ *
+ * Stash away the contents of Return-Path for use in generating
+ * MAIL FROM later on, then prevent the header from being saved
+ * with the others. In effect, we strip it off here.
+ *
+ * If the SMTP server conforms to the standards, and fetchmail gets the
+ * envelope sender from the Return-Path, the new Return-Path should be
+ * exactly the same as the original one.
+ */
+ if (!ctl->mda && !strncasecmp("Return-Path:", line, 12))
+ {
+ strcpy(return_path, nxtaddr(line));
+ free(line);
+ continue;
+ }
+
+ if (ctl->rewrite)
+ line = reply_hack(line, ctl->server.truename);
- bufp = line;
if (!headers)
{
- oldlen = strlen(bufp);
+ oldlen = strlen(line);
headers = xmalloc(oldlen + 1);
- (void) strcpy(headers, bufp);
- bufp = headers;
+ (void) strcpy(headers, line);
+ free(line);
+ line = headers;
}
else
{
int newlen;
- newlen = oldlen + strlen(bufp);
- headers = realloc(headers, newlen + 1);
+ newlen = oldlen + strlen(line);
+ headers = (char *) realloc(headers, newlen + 1);
if (headers == NULL)
return(PS_IOERR);
- strcpy(headers + oldlen, bufp);
- bufp = headers + oldlen;
+ strcpy(headers + oldlen, line);
+ free(line);
+ line = headers + oldlen;
oldlen = newlen;
}
- free(line);
- if (from_offs == -1 && !strncasecmp("From:", bufp, 5))
- from_offs = (bufp - headers);
- else if (from_offs == -1 && !strncasecmp("Resent-From:", bufp, 12))
- from_offs = (bufp - headers);
- else if (from_offs == -1 && !strncasecmp("Apparently-From:", bufp, 16))
- from_offs = (bufp - headers);
+ if (from_offs == -1 && !strncasecmp("From:", line, 5))
+ from_offs = (line - headers);
+ else if (from_offs == -1 && !strncasecmp("Resent-From:", line, 12))
+ from_offs = (line - headers);
+ else if (from_offs == -1 && !strncasecmp("Apparently-From:", line, 16))
+ from_offs = (line - headers);
+ else if (!strncasecmp("Content-Transfer-Encoding:", line, 26))
+ ctt_offs = (line - headers);
+ else if (!strncasecmp("Message-Id:", buf, 11 ))
+ {
+ if( ctl->server.uidl )
+ {
+ char id[IDLEN+1];
+ /* prevent stack overflows */
+ buf[IDLEN+12] = 0;
+ sscanf( buf+12, "%s", id);
+ if( !str_find( &ctl->newsaved, num ) )
+ save_str(&ctl->newsaved, num, id );
+ }
+ }
+
+ else if (!MULTIDROP(ctl))
+ continue;
- else if (!strncasecmp("To:", bufp, 3))
- to_offs = (bufp - headers);
+ else if (!strncasecmp("To:", line, 3)
+ || !strncasecmp("Cc:", line, 3)
+ || !strncasecmp("Bcc:", line, 4))
+ {
+ *chainptr = xmalloc(sizeof(struct addrblk));
+ (*chainptr)->offset = (line - headers);
+ chainptr = &(*chainptr)->next;
+ *chainptr = NULL;
+ }
- else if (env_offs == -1 && !strncasecmp(ctl->server.envelope,
- bufp,
+ else if (ctl->server.envelope != STRING_DISABLED)
+ {
+ if (ctl->server.envelope
+ && strcasecmp(ctl->server.envelope, "received"))
+ {
+ if (env_offs == -1 && !strncasecmp(ctl->server.envelope,
+ line,
strlen(ctl->server.envelope)))
- env_offs = (bufp - headers);
-
- else if (!strncasecmp("Cc:", bufp, 3))
- cc_offs = (bufp - headers);
-
- else if (!strncasecmp("Bcc:", bufp, 4))
- bcc_offs = (bufp - headers);
-
- else if (!strncasecmp("Content-Transfer-Encoding:", bufp, 26))
- ctt_offs = (bufp - headers);
-
+ {
+ if (skipcount++ != ctl->server.envskip)
+ continue;
+ env_offs = (line - headers);
+ }
+ }
#ifdef HAVE_RES_SEARCH
- else if (MULTIDROP(ctl) && !received_for && !strncasecmp("Received:", bufp, 9))
- received_for = parse_received(ctl, bufp);
+ else if (!received_for && !strncasecmp("Received:", line, 9))
+ {
+ if (skipcount++ != ctl->server.envskip)
+ continue;
+ received_for = parse_received(ctl, line);
+ }
#endif /* HAVE_RES_SEARCH */
+ }
+ }
+
+ /*
+ * Hack time. If the first line of the message was blank, with no headers
+ * (this happens occasionally due to bad gatewaying software) cons up
+ * a set of fake headers.
+ *
+ * If you modify the fake header template below, be sure you don't
+ * make either From or To address @-less, otherwise the reply_hack
+ * logic will do bad things.
+ */
+ if (headers == (char *)NULL)
+ {
+#ifdef HAVE_SNPRINTF
+ snprintf(buf, sizeof(buf),
+#else
+ sprintf(buf,
+#endif /* HAVE_SNPRINTF */
+ "From: <FETCHMAIL-DAEMON@%s>\r\nTo: %s@localhost\r\nSubject: Headerless mail from %s's mailbox on %s\r\n",
+ fetchmailhost, user, ctl->remotename, ctl->server.truename);
+ headers = xstrdup(buf);
}
/*
/* cons up a list of local recipients */
xmit_names = (struct idlist *)NULL;
- bad_addresses = good_addresses = 0;
+ bad_addresses = good_addresses = accept_count = reject_count = 0;
#ifdef HAVE_RES_SEARCH
/* is this a multidrop box? */
if (MULTIDROP(ctl))
* We haven't extracted the envelope address.
* So check all the header addresses.
*/
- if (to_offs > -1)
- find_server_names(headers + to_offs, ctl, &xmit_names);
- if (cc_offs > -1)
- find_server_names(headers + cc_offs, ctl, &xmit_names);
- if (bcc_offs > -1)
- find_server_names(headers + bcc_offs, ctl, &xmit_names);
+ while (addrchain)
+ {
+ register struct addrblk *nextptr;
+
+ find_server_names(headers+addrchain->offset, ctl, &xmit_names);
+ nextptr = addrchain->next;
+ free(addrchain);
+ addrchain = nextptr;
+ }
}
- if (!xmit_names)
+ if (!accept_count)
{
no_local_matches = TRUE;
- save_str(&xmit_names, -1, user);
+ save_str(&xmit_names, XMIT_ACCEPT, user);
if (outlevel == O_VERBOSE)
error(0, 0,
"no local matches, forwarding to %s",
}
else /* it's a single-drop box, use first localname */
#endif /* HAVE_RES_SEARCH */
- save_str(&xmit_names, -1, ctl->localnames->id);
+ save_str(&xmit_names, XMIT_ACCEPT, ctl->localnames->id);
- /* time to address the message */
- if (ctl->mda) /* we have a declared MDA */
+
+ /*
+ * Time to either address the message or decide we can't deliver it yet.
+ */
+ if (ctl->errcount > olderrs) /* there were DNS errors above */
+ {
+ if (outlevel == O_VERBOSE)
+ error(0,0, "forwarding and deletion suppressed due to DNS errors");
+ free(headers);
+ return(PS_TRANSIENT);
+ }
+ else if (ctl->mda) /* we have a declared MDA */
{
int length = 0;
- char *names, *cmd;
+ char *names, *before, *after;
- /*
- * We go through this in order to be able to handle very
- * long lists of users and (re)implement %s.
- */
- for (idp = xmit_names; idp; idp = idp->next)
- length += (strlen(idp->id) + 1);
- names = (char *)alloca(length);
- names[0] = '\0';
for (idp = xmit_names; idp; idp = idp->next)
+ if (idp->val.num == XMIT_ACCEPT)
+ good_addresses++;
+
+ desthost = "localhost";
+
+ length = strlen(ctl->mda) + 1;
+ before = xstrdup(ctl->mda);
+
+ /* sub user addresses for %T (or %s for backward compatibility) */
+ cp = (char *)NULL;
+ if (strstr(before, "%s") || (cp = strstr(before, "%T")))
+ {
+ char *sp;
+
+ if (cp && cp[1] == 'T')
+ cp[1] = 's';
+
+ /* \177 had better be out-of-band for MDA commands */
+ for (sp = before; *sp; sp++)
+ if (*sp == '%' && sp[1] != 's' && sp[1] != 'T')
+ *sp = '\177';
+
+ /*
+ * We go through this in order to be able to handle very
+ * long lists of users and (re)implement %s.
+ */
+ for (idp = xmit_names; idp; idp = idp->next)
+ if (idp->val.num == XMIT_ACCEPT)
+ length += (strlen(idp->id) + 1);
+
+ names = (char *)alloca(++length);
+ names[0] = '\0';
+ for (idp = xmit_names; idp; idp = idp->next)
+ if (idp->val.num == XMIT_ACCEPT)
+ {
+ strcat(names, idp->id);
+ strcat(names, " ");
+ }
+ after = (char *)alloca(length);
+#ifdef SNPRINTF
+ snprintf(after, length, before, names);
+#else
+ sprintf(after, before, names);
+#endif /* SNPRINTF */
+ free(before);
+ before = after;
+
+ for (sp = before; *sp; sp++)
+ if (*sp == '\177')
+ *sp = '%';
+ }
+
+ /* substitute From address for %F */
+ if ((cp = strstr(before, "%F")))
{
- strcat(names, idp->id);
- strcat(names, " ");
+ char *from = nxtaddr(headers + from_offs);
+ char *sp;
+
+ /* \177 had better be out-of-band for MDA commands */
+ for (sp = before; *sp; sp++)
+ if (*sp == '%' && sp[1] != 'F')
+ *sp = '\177';
+
+ length += strlen(from);
+ after = alloca(length);
+ cp[1] = 's';
+#ifdef SNPRINTF
+ snprintf(after, length, before, from);
+#else
+ sprintf(after, before, from);
+#endif /* SNPRINTF */
+ free(before);
+ before = after;
+
+ for (sp = before; *sp; sp++)
+ if (*sp == '\177')
+ *sp = '%';
}
- cmd = (char *)alloca(strlen(ctl->mda) + length);
- sprintf(cmd, ctl->mda, names);
+
if (outlevel == O_VERBOSE)
- error(0, 0, "about to deliver with: %s", cmd);
+ error(0, 0, "about to deliver with: %s", before);
#ifdef HAVE_SETEUID
/*
seteuid(ctl->uid);
#endif /* HAVE_SETEUID */
- sinkfp = popen(cmd, "w");
+ sinkfp = popen(before, "w");
#ifdef HAVE_SETEUID
/* this will fail quietly if we didn't start as root */
}
else
{
- char *ap, *ctt, options[MSGBUFSIZE];
- int smtperr;
+ char *ap, *ctt, options[MSGBUFSIZE], addr[128];
/* build a connection to the SMTP listener */
- if (!ctl->mda && ((sinkfp = smtp_open(ctl)) == NULL))
+ if ((smtp_open(ctl) == -1))
{
+ error(0, errno, "SMTP connect to %s failed",
+ ctl->smtphost ? ctl->smtphost : "localhost");
free_str_list(&xmit_names);
- error(0, 0, "SMTP connect failed");
return(PS_SMTP);
}
* desired tokenizing effect.
*/
options[0] = '\0';
- if ((ctl->server.esmtp_options & ESMTP_8BITMIME)
- && (ctt_offs >= 0)
- && (ctt = nxtaddr(headers + ctt_offs)))
- if (!strcasecmp(ctt,"7BIT"))
- sprintf(options, " BODY=7BIT", ctt);
- else if (!strcasecmp(ctt,"8BIT"))
- sprintf(options, " BODY=8BITMIME", ctt);
- if ((ctl->server.esmtp_options & ESMTP_SIZE) && !delimited)
- sprintf(options + strlen(options), " SIZE=%d", len);
+ if (ctl->server.esmtp_options & ESMTP_8BITMIME)
+ if (ctl->pass8bits)
+ strcpy(options, " BODY=8BITMIME");
+ else if ((ctt_offs >= 0) && (ctt = nxtaddr(headers + ctt_offs)))
+ {
+ if (!strcasecmp(ctt,"7BIT"))
+ strcpy(options, " BODY=7BIT");
+ else if (!strcasecmp(ctt,"8BIT"))
+ strcpy(options, " BODY=8BITMIME");
+ }
+ if ((ctl->server.esmtp_options & ESMTP_SIZE) && reallen > 0)
+ sprintf(options + strlen(options), " SIZE=%ld", reallen);
/*
- * Try to get the SMTP listener to take the header
- * From address as MAIL FROM (this makes the logging
- * nicer). If it won't, fall back on the calling-user
- * ID. This won't affect replies, which use the header
- * From address anyway.
+ * If there is a Return-Path address on the message, this was
+ * almost certainly the MAIL FROM address given the originating
+ * sendmail. This is the best thing to use for logging the
+ * message origin (it sets up the right behavior for bounces and
+ * mailing lists). Otherwise, take the From address.
+ *
+ * Try to get the SMTP listener to take the Return-Path or
+ * From address as MAIL FROM . If it won't, fall back on the
+ * calling-user ID. This won't affect replies, which use the
+ * header From address anyway.
*
* RFC 1123 requires that the domain name part of the
* MAIL FROM address be "canonicalized", that is a
* is if rewrite is on). RFC 1123 is silent on whether
* a nonexistent hostname part is considered canonical.
*
- * This is a potential problem if the MTAs further
- * upstream didn't pass canonicalized From lines, *and*
- * the local SMTP listener insists on them.
+ * This is a potential problem if the MTAs further upstream
+ * didn't pass canonicalized From/Return-Path lines, *and* the
+ * local SMTP listener insists on them.
*/
- if (from_offs == -1 || !(ap = nxtaddr(headers + from_offs)))
+ ap = (char *)NULL;
+ if (return_path[0])
+ ap = return_path;
+ else if (from_offs == -1 || !(ap = nxtaddr(headers + from_offs)))
ap = user;
- if (SMTP_from(sinkfp, ap, options) != SM_OK)
+ if (SMTP_from(ctl->smtp_socket, ap, options) != SM_OK)
{
int smtperr = atoi(smtp_response);
- if (smtperr >= 400)
- error(0, 0, "SMTP error: %s", smtp_response);
-
/*
- * There'a one problem with this flow of control;
- * there's no way to avoid reading the whole message
- * off the server, even if the MAIL FROM response
- * tells us that it's just to be discarded. We could
- * fix this under IMAP by reading headers first, then
- * trying to issue the MAIL FROM, and *then* reading
- * the body...but POP3 can't do this.
+ * Suppress error message only if the response specifically
+ * means `excluded for policy reasons'. We *should* see
+ * an error when the return code is less specific.
*/
+ if (smtperr >= 400 && smtperr != 571)
+ error(0, -1, "SMTP error: %s", smtp_response);
switch (smtperr)
{
- case 571: /* unsolicited email refused */
+ case 571: /* sendmail's "unsolicited email refused" */
+ case 501: /* exim's old antispam response */
+ case 550: /* exim's new antispam response (temporary) */
/*
* SMTP listener explicitly refuses to deliver
* mail coming from this address, probably due
* this. Don't try to ship the message, and
* don't prevent it from being deleted.
*/
- sinkfp = (FILE *)NULL;
- goto skiptext;
+ free(headers);
+ return(PS_REFUSED);
case 452: /* insufficient system storage */
/*
* and suppress deletion so it can be retried on
* a future retrieval cycle.
*/
- delete_ok = FALSE;
- sinkfp = (FILE *)NULL;
- SMTP_rset(sockfp); /* required by RFC1870 */
- goto skiptext;
+ SMTP_rset(ctl->smtp_socket); /* required by RFC1870 */
+ free(headers);
+ return(PS_TRANSIENT);
case 552: /* message exceeds fixed maximum message size */
/*
* ESMTP server. Don't try to ship the message,
* and allow it to be deleted.
*/
- sinkfp = (FILE *)NULL;
- SMTP_rset(sockfp); /* required by RFC1870 */
- goto skiptext;
+ SMTP_rset(ctl->smtp_socket); /* required by RFC1870 */
+ free(headers);
+ return(PS_REFUSED);
default: /* retry with invoking user's address */
- if (SMTP_from(sinkfp, user, options) != SM_OK)
+ if (SMTP_from(ctl->smtp_socket, user, options) != SM_OK)
{
- error(0,0,"SMTP error: %s", smtp_response);
+ error(0, -1, "SMTP error: %s", smtp_response);
+ free(headers);
return(PS_SMTP); /* should never happen */
}
}
*
* 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. RFC1123 doesn't say whether
- * the FQDN part can be null (as it frequently will be
- * here), but it's hard to see how this could cause a
- * problem.
+ * or MX but not a CNAME. Some listeners (like exim)
+ * enforce this.
*/
+ desthost = ctl->smtphost ? ctl->smtphost : "localhost";
for (idp = xmit_names; idp; idp = idp->next)
- if (SMTP_rcpt(sinkfp, idp->id) == SM_OK)
- good_addresses++;
- else
+ if (idp->val.num == XMIT_ACCEPT)
{
- bad_addresses++;
- idp->val.num = 0;
- error(0, 0,
- "SMTP listener doesn't like recipient address `%s'", idp->id);
+ if (strchr(idp->id, '@'))
+ strcpy(addr, idp->id);
+ else
+#ifdef HAVE_SNPRINTF
+ snprintf(addr, sizeof(addr)-1, "%s@%s", idp->id, desthost);
+#else
+ sprintf(addr, "%s@%s", idp->id, desthost);
+#endif /* HAVE_SNPRINTF */
+
+ if (SMTP_rcpt(ctl->smtp_socket, addr) == SM_OK)
+ good_addresses++;
+ else
+ {
+ bad_addresses++;
+ idp->val.num = XMIT_ANTISPAM;
+ error(0, 0,
+ "SMTP listener doesn't like recipient address `%s'", idp->id);
+ }
}
- if (!good_addresses && SMTP_rcpt(sinkfp, user) != SM_OK)
+ if (!good_addresses)
{
- error(0, 0,
- "can't even send to calling user!");
- return(PS_SMTP);
+#ifdef HAVE_SNPRINTF
+ snprintf(addr, sizeof(addr)-1, "%s@%s", user, desthost);
+#else
+ sprintf(addr, "%s@%s", user, desthost);
+#endif /* HAVE_SNPRINTF */
+
+ if (SMTP_rcpt(ctl->smtp_socket, addr) != SM_OK)
+ {
+ error(0, 0, "can't even send to calling user!");
+ free(headers);
+ return(PS_SMTP);
+ }
}
/* tell it we're ready to send data */
- SMTP_data(sinkfp);
-
- skiptext:;
+ SMTP_data(ctl->smtp_socket);
}
- /* we may need to strip carriage returns */
- if (ctl->stripcr)
+ n = 0;
+ /*
+ * Some server/sendmail combinations cause problems when our
+ * synthetic Received line is before the From header. Cope
+ * with this...
+ */
+ if ((rcv = strstr(headers, "Received:")) == (char *)NULL)
+ rcv = headers;
+ if (rcv > headers)
{
- char *sp, *tp;
+ *rcv = '\0';
+ n = stuffline(ctl, headers);
+ *rcv = 'R';
+ }
+ if (!use_invisible && n != -1)
+ {
+ /* utter any per-message Received information we need here */
+ sprintf(buf, "Received: from %s\n", ctl->server.truename);
+ n = stuffline(ctl, buf);
+ if (n != -1)
+ {
+ sprintf(buf, "\tby %s (fetchmail-%s %s run for %s)\n",
+ fetchmailhost,
+ RELEASE_ID,
+ protocol->name,
+ ctl->remotename);
+ n = stuffline(ctl, buf);
+ if (n != -1)
+ {
+ time_t now;
- for (sp = tp = headers; *sp; sp++)
- if (*sp != '\r')
- *tp++ = *sp;
- *tp = '\0';
+ buf[0] = '\t';
+ if (good_addresses == 0)
+ {
+ sprintf(buf+1,
+ "for <%s@%s> (by default); ",
+ user, desthost);
+ }
+ else if (good_addresses == 1)
+ {
+ for (idp = xmit_names; idp; idp = idp->next)
+ if (idp->val.num == XMIT_ACCEPT)
+ break; /* only report first address */
+ sprintf(buf+1, "for <%s@%s> (%s); ",
+ idp->id, desthost,
+ MULTIDROP(ctl) ? "multi-drop" : "single-drop");
+ }
+ else
+ buf[1] = '\0';
+ time(&now);
+ strcat(buf, ctime(&now));
+ n = stuffline(ctl, buf);
+ }
+ }
}
- /* write all the headers */
- if (sinkfp)
+ if (n != -1)
+ n = stuffline(ctl, rcv); /* ship out rest of headers */
+
+ if (n == -1)
{
+ error(0, errno, "writing RFC822 headers");
if (ctl->mda)
- n = fwrite(headers, 1, strlen(headers), sinkfp);
- else
- n = SockWrite(headers, 1, strlen(headers), sinkfp);
-
- if (n < 0)
{
- free(headers);
- headers = NULL;
- error(0, errno, "writing RFC822 headers");
- if (ctl->mda)
- {
- pclose(sinkfp);
- signal(SIGCHLD, sigchld);
- }
- return(PS_IOERR);
+ pclose(sinkfp);
+ signal(SIGCHLD, sigchld);
}
- else if (outlevel == O_VERBOSE)
- fputs("#", stderr);
+ return(PS_IOERR);
}
- free(headers);
- headers = NULL;
+ else if (outlevel == O_VERBOSE)
+ fputs("#", stderr);
/* write error notifications */
#ifdef HAVE_RES_SEARCH
- if (no_local_matches || bad_addresses)
+ if (no_local_matches || has_nuls || bad_addresses)
#else
- if (bad_addresses)
+ if (has_nuls || bad_addresses)
#endif /* HAVE_RES_SEARCH */
{
int errlen = 0;
#ifdef HAVE_RES_SEARCH
if (no_local_matches)
{
- strcat(errhd, "no recipient addresses matched declared local names");
- if (bad_addresses)
- strcat(errhd, "; ");
+ if (reject_count != 1)
+ strcat(errhd, "no recipient addresses matched declared local names");
+ else
+ {
+ for (idp = xmit_names; idp; idp = idp->next)
+ if (idp->val.num == XMIT_REJECT)
+ break;
+ sprintf(errhd+strlen(errhd), "recipient address %s didn't match any local name", idp->id);
+ }
}
#endif /* HAVE_RES_SEARCH */
+ if (has_nuls)
+ {
+ if (errhd[sizeof("X-Fetchmail-Warning: ")])
+ strcat(errhd, "; ");
+ strcat(errhd, "message has embedded NULs");
+ }
+
if (bad_addresses)
{
+ if (errhd[sizeof("X-Fetchmail-Warning: ")])
+ strcat(errhd, "; ");
strcat(errhd, "SMTP listener rejected local recipient addresses: ");
errlen = strlen(errhd);
for (idp = xmit_names; idp; idp = idp->next)
- if (!idp->val.num)
+ if (idp->val.num == XMIT_ANTISPAM)
errlen += strlen(idp->id) + 2;
errmsg = alloca(errlen+3);
(void) strcpy(errmsg, errhd);
for (idp = xmit_names; idp; idp = idp->next)
- if (!idp->val.num)
+ if (idp->val.num == XMIT_ANTISPAM)
{
strcat(errmsg, idp->id);
if (idp->next)
strcat(errmsg, ", ");
}
+
}
strcat(errmsg, "\n");
- /* we may need to strip carriage returns */
- if (ctl->stripcr)
- {
- char *sp, *tp;
-
- for (sp = tp = errmsg; *sp; sp++)
- if (*sp != '\r')
- *tp++ = *sp;
- *tp = '\0';
- }
-
/* ship out the error line */
if (sinkfp)
- {
- if (ctl->mda)
- fwrite(errmsg, 1, strlen(errmsg), sinkfp);
- else
- SockWrite(errmsg, 1, strlen(errmsg), sinkfp);
- }
+ stuffline(ctl, errmsg);
}
free_str_list(&xmit_names);
/* issue the delimiter line */
- if (sinkfp)
- {
- if (ctl->mda)
- fputc('\n', sinkfp);
- else
- SockWrite("\r\n", 1, 2, sinkfp);
- }
+ cp = buf;
+ *cp++ = '\r';
+ *cp++ = '\n';
+ *cp++ = '\0';
+ stuffline(ctl, buf);
- /*
- * Body processing starts here
- */
+ return(PS_SUCCESS);
+}
+
+static int readbody(sock, ctl, forward, len)
+/* read and dispose of a message body presented on sock */
+struct query *ctl; /* query control record */
+int sock; /* to which the server is connected */
+int len; /* length of message */
+flag forward; /* TRUE to forward */
+{
+ int linelen;
+ char buf[MSGBUFSIZE+1];
/* pass through the text lines */
- while (delimited || len > 0)
+ while (protocol->delimited || len > 0)
{
- if (!SockGets(buf, sizeof(buf)-1, sockfp))
+ if ((linelen = SockRead(sock, buf, sizeof(buf)-1)) == -1)
+ {
+ if (ctl->mda)
+ {
+ pclose(sinkfp);
+ signal(SIGCHLD, sigchld);
+ }
return(PS_SOCKET);
- vtalarm(ctl->server.timeout);
+ }
+ set_timeout(ctl->server.timeout);
/* write the message size dots */
- if ((n = strlen(buf)) > 0)
+ if (linelen > 0)
{
- sizeticker += n;
+ sizeticker += linelen;
while (sizeticker >= SIZETICKER)
{
if (outlevel > O_SILENT)
sizeticker -= SIZETICKER;
}
}
- len -= n;
+ len -= linelen;
/* check for end of message */
- if (delimited && *buf == '.')
- if (buf[1] == '\r' && buf[2] == '\n')
+ if (protocol->delimited && *buf == '.')
+ if (buf[1] == '\r' && buf[2] == '\n' && buf[3] == '\0')
+ break;
+ else if (buf[1] == '\n' && buf[2] == '\0')
break;
+ else
+ msglen--; /* subtract the size of the dot escape */
+
+ msglen += linelen;
/* ship out the text line */
- if (sinkfp)
+ if (forward)
{
- /* SMTP byte-stuffing */
- if (*buf == '.')
- if (ctl->mda)
- fputs(".", sinkfp);
- else
- SockWrite(buf, 1, 1, sinkfp);
-
- /* we may need to strip carriage returns */
- if (ctl->stripcr)
- {
- char *sp, *tp;
-
- for (sp = tp = buf; *sp; sp++)
- if (*sp != '\r')
- *tp++ = *sp;
- *tp = '\0';
- }
-
- /* ship the text line */
- if (ctl->mda)
- n = fwrite(buf, 1, strlen(buf), sinkfp);
- else if (sinkfp)
- n = SockWrite(buf, 1, strlen(buf), sinkfp);
+ int n = stuffline(ctl, buf);
if (n < 0)
{
}
}
- /*
- * End-of-message processing starts here
- */
-
- if (outlevel == O_VERBOSE)
- fputc('\n', stderr);
-
- if (ctl->mda)
- {
- int rc;
-
- /* close the delivery pipe, we'll reopen before next message */
- rc = pclose(sinkfp);
- signal(SIGCHLD, sigchld);
- if (rc)
- {
- error(0, 0, "MDA exited abnormally or returned nonzero status");
- return(PS_IOERR);
- }
- }
- else if (sinkfp)
- {
- /* write message terminator */
- if (SMTP_eom(sinkfp) != SM_OK)
- {
- error(0, 0, "SMTP listener refused delivery");
- return(PS_TRANSIENT);
- }
- }
-
- return(delete_ok ? PS_SUCCESS : PS_TRANSIENT);
+ return(PS_SUCCESS);
}
#ifdef KERBEROS_V4
kerberos_auth (socket, canonical)
/* authenticate to the server host using Kerberos V4 */
int socket; /* socket to server host */
+#ifdef __FreeBSD__
+char *canonical; /* server name */
+#else
const char *canonical; /* server name */
+#endif
{
char * host_primary;
KTEXT ticket;
free (ticket);
if (rem != KSUCCESS)
{
- error(0, 0, "kerberos error %s", (krb_get_err_text (rem)));
- return (PS_ERROR);
+ error(0, -1, "kerberos error %s", (krb_get_err_text (rem)));
+ return (PS_AUTHFAIL);
}
return (0);
}
struct query *ctl; /* parsed options with merged-in defaults */
const struct method *proto; /* protocol method table */
{
- int ok, js, pst;
- char *msg, *sp, *cp, realname[HOSTLEN];
+ int ok, js, sock = -1;
+ char *msg;
void (*sigsave)();
#ifndef KERBEROS_V4
- if (ctl->server.authenticate == A_KERBEROS)
+ if (ctl->server.preauthenticate == A_KERBEROS_V4)
{
- error(0, 0, "Kerberos support not linked.");
+ error(0, -1, "Kerberos V4 support not linked.");
return(PS_ERROR);
}
#endif /* KERBEROS_V4 */
}
protocol = proto;
+ pass = 0;
tagnum = 0;
tag[0] = '\0'; /* nuke any tag hanging out from previous query */
ok = 0;
- error_init(poll_interval == 0 && !logfile);
/* set up the server-nonresponse timeout */
- sigsave = signal(SIGVTALRM, vtalarm_handler);
- vtalarm(mytimeout = ctl->server.timeout);
+ sigsave = signal(SIGALRM, timeout_handler);
+ set_timeout(mytimeout = ctl->server.timeout);
if ((js = setjmp(restart)) == 1)
{
error(0, 0,
"timeout after %d seconds waiting for %s.",
- ctl->server.timeout, ctl->server.names->id);
- ok = PS_ERROR;
- }
- else if (js == 2)
- {
- /* error message printed at point of longjmp */
+ ctl->server.timeout, ctl->server.pollname);
+ if (ctl->smtp_socket != -1)
+ close(ctl->smtp_socket);
+ if (sock != -1)
+ close(sock);
ok = PS_ERROR;
}
else
{
- char buf [POPBUFSIZE+1];
+ char buf [POPBUFSIZE+1], *realhost;
int *msgsizes, len, num, count, new, deletions = 0;
- FILE *sockfp;
+ int port, fetches, dispatches;
+ struct idlist *idp;
+
/* execute pre-initialization command, if any */
if (ctl->preconnect && (ok = system(ctl->preconnect)))
{
}
/* open a socket to the mail server */
- if (!(sockfp = SockOpen(ctl->server.names->id,
- ctl->server.port ? ctl->server.port : protocol->port)))
+ port = ctl->server.port ? ctl->server.port : protocol->port;
+ realhost = ctl->server.via ? ctl->server.via : ctl->server.pollname;
+ if ((sock = SockOpen(realhost, port)) == -1)
{
#ifndef EHOSTUNREACH
#define EHOSTUNREACH (-1)
#endif
- if (errno != EHOSTUNREACH)
- error(0, errno, "connecting to host");
+ if (outlevel == O_VERBOSE || errno != EHOSTUNREACH)
+ {
+ error_build("fetchmail: %s connection to %s failed: ",
+ protocol->name, ctl->server.pollname);
+ if (h_errno == HOST_NOT_FOUND)
+ error_complete(0, 0, "host is unknown");
+ else if (h_errno == NO_ADDRESS)
+ error_complete(0, 0, "name is valid but has no IP address");
+ else if (h_errno == NO_RECOVERY)
+ error_complete(0, 0, "unrecoverable name server error");
+ else if (h_errno == TRY_AGAIN)
+ error_complete(0, 0, "temporary name server error");
+ else if (h_errno)
+ error_complete(0, 0, "unknown DNS error %d", h_errno);
+ else
+ error_complete(0, errno, "local error");
+ }
ok = PS_SOCKET;
goto closeUp;
}
#ifdef KERBEROS_V4
- if (ctl->authenticate == A_KERBEROS)
+ if (ctl->server.preauthenticate == A_KERBEROS_V4)
{
- ok = kerberos_auth(fileno(sockfp), ctl->server.canonical_name);
+ ok = kerberos_auth(sock, ctl->server.truename);
if (ok != 0)
goto cleanUp;
- vtalarm(ctl->server.timeout);
+ set_timeout(ctl->server.timeout);
}
#endif /* KERBEROS_V4 */
/* accept greeting message from mail server */
- ok = (protocol->parse_response)(sockfp, buf);
+ ok = (protocol->parse_response)(sock, buf);
if (ok != 0)
goto cleanUp;
- vtalarm(ctl->server.timeout);
+ set_timeout(ctl->server.timeout);
- /*
- * Try to parse the host's actual name out of the greeting
- * message. We do this so that the progress messages will
- * make sense even if the connection is indirected through
- * ssh. *Do* use this for hacking reply headers, but *don't*
- * use it for error logging, as the names in the log should
- * correlate directly back to rc file entries.
- *
- * This assumes that the first space-delimited token found
- * that contains at least two dots (with the characters on
- * each side of the dot alphanumeric to exclude version
- * numbers) is the hostname. The hostname candidate may not
- * contain @ -- if it does it's probably a mailserver
- * maintainer's name. If no such token is found, fall back on
- * the .fetchmailrc id.
- */
- pst = 0;
- for (cp = buf; *cp; cp++)
+ /* try to get authorized to fetch mail */
+ if (protocol->getauth)
{
- switch (pst)
+ shroud = ctl->password;
+ ok = (protocol->getauth)(sock, ctl, buf);
+ shroud = (char *)NULL;
+ if (ok != 0)
{
- case 0: /* skip to end of current token */
- if (*cp == ' ')
- pst = 1;
- break;
-
- case 1: /* look for blank-delimited token */
- if (*cp != ' ')
- {
- sp = cp;
- pst = 2;
- }
- break;
-
- case 2: /* look for first dot */
- if (*cp == '@')
- pst = 0;
- else if (*cp == ' ')
- pst = 1;
- else if (*cp == '.' && isalpha(cp[1]) && isalpha(cp[-1]))
- pst = 3;
- break;
-
- case 3: /* look for second dot */
- if (*cp == '@')
- pst = 0;
- else if (*cp == ' ')
- pst = 1;
- else if (*cp == '.' && isalpha(cp[1]) && isalpha(cp[-1]))
- pst = 4;
- break;
-
- case 4: /* look for trailing space */
- if (*cp == '@')
- pst = 0;
- else if (*cp == ' ')
+ if (ok == PS_LOCKBUSY)
+ error(0, -1, "Lock-busy error on %s@%s",
+ ctl->remotename,
+ ctl->server.truename);
+ else
{
- pst = 5;
- goto done;
+ if (ok == PS_ERROR)
+ ok = PS_AUTHFAIL;
+ error(0, -1, "Authorization failure on %s@%s",
+ ctl->remotename,
+ ctl->server.truename);
}
- break;
+ goto cleanUp;
}
+ set_timeout(ctl->server.timeout);
}
- done:
- if (pst == 5)
- {
- char *tp = realname;
- while (sp < cp)
- *tp++ = *sp++;
- *tp = '\0';
- }
- else
- strcpy(realname, ctl->server.names->id);
+ ctl->errcount = fetches = 0;
- /* try to get authorized to fetch mail */
- shroud = ctl->password;
- ok = (protocol->getauth)(sockfp, ctl, buf);
- shroud = (char *)NULL;
- if (ok == PS_ERROR)
- ok = PS_AUTHFAIL;
- if (ok != 0)
+ /* now iterate over each folder selected */
+ for (idp = ctl->mailboxes; idp; idp = idp->next)
{
- error(0, 0, "Authorization failure on %s@%s",
- ctl->remotename,
- realname);
- goto cleanUp;
- }
- vtalarm(ctl->server.timeout);
-
- /* compute number of messages and number of new messages waiting */
- ok = (protocol->getrange)(sockfp, ctl, &count, &new);
- if (ok != 0)
- goto cleanUp;
- vtalarm(ctl->server.timeout);
-
- /* show user how many messages we downloaded */
- if (outlevel > O_SILENT)
- if (count == 0)
- error(0, 0, "No mail from %s@%s",
- ctl->remotename,
- realname);
- else
- {
- if (new != -1 && (count - new) > 0)
- error(0, 0, "%d message%s (%d seen) from %s@%s.",
- count, count > 1 ? "s" : "", count-new,
- ctl->remotename,
- realname);
+ pass = 0;
+ do {
+ dispatches = 0;
+ ++pass;
+
+ if (outlevel >= O_VERBOSE)
+ if (idp->id)
+ error(0, 0, "selecting or re-polling folder %s", idp->id);
+ else
+ error(0, 0, "selecting or re-polling default folder");
+
+ /* compute # of messages and number of new messages waiting */
+ ok = (protocol->getrange)(sock, ctl, idp->id, &count, &new);
+ if (ok != 0)
+ goto cleanUp;
+ set_timeout(ctl->server.timeout);
+
+ /* show user how many messages we downloaded */
+ if (idp->id)
+ (void) sprintf(buf, "%s at %s (folder %s)",
+ ctl->remotename, ctl->server.truename, idp->id);
else
- error(0, 0, "%d message%s from %s@%s.", count, count > 1 ? "s" : "",
- ctl->remotename,
- realname);
- }
-
- /* we may need to get sizes in order to check message limits */
- msgsizes = (int *)NULL;
- if (!ctl->fetchall && proto->getsizes && ctl->limit)
- {
- msgsizes = (int *)alloca(sizeof(int) * count);
-
- ok = (proto->getsizes)(sockfp, count, msgsizes);
- if (ok != 0)
- goto cleanUp;
- vtalarm(ctl->server.timeout);
- }
-
- if (check_only)
- {
- if (new == -1 || ctl->fetchall)
- new = count;
- ok = ((new > 0) ? PS_SUCCESS : PS_NOMAIL);
- goto cleanUp;
- }
- else if (count > 0)
- {
- /*
- * What forces this code is that in POP3 and IMAP2BIS you can't
- * fetch a message without having it marked `seen'. In IMAP4,
- * on the other hand, you can (peek_capable is set to convey
- * this).
- *
- * The result of being unable to peek is that if there's
- * any kind of transient error (DNS lookup failure, or
- * sendmail refusing delivery due to process-table limits)
- * the message will be marked "seen" on the server without
- * having been delivered. This is not a big problem if
- * fetchmail is running in foreground, because the user
- * will see a "skipped" message when it next runs and get
- * clued in.
- *
- * But in daemon mode this leads to the message being silently
- * ignored forever. This is not acceptable.
- *
- * We compensate for this by checking the error count from the
- * previous pass and forcing all messages to be considered new
- * if it's nonzero.
- */
- int force_retrieval = !peek_capable && (ctl->errcount > 0);
-
- ctl->errcount = 0;
+ (void) sprintf(buf, "%s at %s", ctl->remotename, ctl->server.truename);
+ if (outlevel > O_SILENT)
+ if (count == -1) /* only used for ETRN */
+ error(0, 0, "Polling %s", ctl->server.truename);
+ else if (count != 0)
+ {
+ if (new != -1 && (count - new) > 0)
+ error(0, 0, "%d message%s (%d seen) for %s.",
+ count, count > 1 ? "s" : "", count-new, buf);
+ else
+ error(0, 0, "%d message%s for %s.",
+ count, count > 1 ? "s" : "", buf);
+ }
+ else
+ {
+ /* these are pointless in normal daemon mode */
+ if (pass == 1 && (poll_interval == 0 || outlevel == O_VERBOSE))
+ error(0, 0, "No mail for %s", buf);
+ }
- /* read, forward, and delete messages */
- for (num = 1; num <= count; num++)
- {
- int toolarge = msgsizes && (msgsizes[num-1] > ctl->limit);
- int fetch_it = ctl->fetchall ||
- (!toolarge && (force_retrieval || !(protocol->is_old && (protocol->is_old)(sockfp,ctl,num))));
- int suppress_delete = FALSE;
+ /* very important, this is where we leave the do loop */
+ if (count == 0)
+ break;
- /* we may want to reject this message if it's old */
- if (!fetch_it)
+ if (check_only)
{
- if (outlevel > O_SILENT)
- {
- error_build("skipping message %d", num);
- if (toolarge)
- error_build(" (oversized, %d bytes)", msgsizes[num-1]);
- }
+ if (new == -1 || ctl->fetchall)
+ new = count;
+ ok = ((new > 0) ? PS_SUCCESS : PS_NOMAIL);
+ goto cleanUp;
}
- else
- {
- /* request a message */
- ok = (protocol->fetch)(sockfp, ctl, num, &len);
- if (ok != 0)
- goto cleanUp;
- vtalarm(ctl->server.timeout);
+ else if (count > 0)
+ {
+ flag force_retrieval;
- if (outlevel > O_SILENT)
+ /*
+ * What forces this code is that in POP3 and
+ * IMAP2BIS you can't fetch a message without
+ * having it marked `seen'. In IMAP4, on the
+ * other hand, you can (peek_capable is set to
+ * convey this).
+ *
+ * The result of being unable to peek is that if there's
+ * any kind of transient error (DNS lookup failure, or
+ * sendmail refusing delivery due to process-table limits)
+ * the message will be marked "seen" on the server without
+ * having been delivered. This is not a big problem if
+ * fetchmail is running in foreground, because the user
+ * will see a "skipped" message when it next runs and get
+ * clued in.
+ *
+ * But in daemon mode this leads to the message
+ * being silently ignored forever. This is not
+ * acceptable.
+ *
+ * We compensate for this by checking the error
+ * count from the previous pass and forcing all
+ * messages to be considered new if it's nonzero.
+ */
+ force_retrieval = !peek_capable && (ctl->errcount > 0);
+
+ /*
+ * We need the size of each message before it's
+ * loaded in order to pass via the ESMTP SIZE
+ * option. If the protocol has a getsizes method,
+ * we presume this means it doesn't get reliable
+ * sizes from message fetch responses.
+ */
+ if (proto->getsizes)
{
- error_build("reading message %d", num);
- if (len > 0)
- error_build(" (%d bytes)", len);
- if (outlevel == O_VERBOSE)
- error_complete(0, 0, "");
- else
- error_build(" ");
- }
+ int i;
- /* read the message and ship it to the output sink */
- ok = gen_readmsg(sockfp,
- len,
- protocol->delimited,
- ctl,
- realname);
- if (ok == PS_TRANSIENT)
- suppress_delete = TRUE;
- else if (ok)
- goto cleanUp;
- vtalarm(ctl->server.timeout);
-
- /* tell the server we got it OK and resynchronize */
- if (protocol->trail)
- {
- ok = (protocol->trail)(sockfp, ctl, num);
+ msgsizes = (int *)alloca(sizeof(int) * count);
+ for (i = 0; i < count; i++)
+ msgsizes[i] = -1;
+
+ ok = (proto->getsizes)(sock, count, msgsizes);
if (ok != 0)
goto cleanUp;
- vtalarm(ctl->server.timeout);
+ set_timeout(ctl->server.timeout);
}
- }
- /*
- * At this point in flow of control, either we've bombed
- * on a protocol error or had delivery refused by the SMTP
- * server (unlikely -- I've never seen it) or we've seen
- * `accepted for delivery' and the message is shipped.
- * It's safe to mark the message seen and delete it on the
- * server now.
- */
+ /* read, forward, and delete messages */
+ for (num = 1; num <= count; num++)
+ {
+ flag toolarge = (ctl->limit > 0)
+ && msgsizes && (msgsizes[num-1] > ctl->limit);
+ flag fetch_it = !toolarge
+ && (ctl->fetchall || force_retrieval || !(protocol->is_old && (protocol->is_old)(sock,ctl,num)));
+ flag suppress_delete = FALSE;
+ flag suppress_forward = FALSE;
+ flag retained = FALSE;
+
+ /*
+ * This check copes with Post Office/NT's
+ * annoying habit of randomly prepending bogus
+ * LIST items of length -1. Patrick Audley
+ * <paudley@pobox.com> tells us: LIST shows a
+ * size of -1, RETR and TOP return "-ERR
+ * System error - couldn't open message", and
+ * DELE succeeds but doesn't actually delete
+ * the message.
+ */
+ if (msgsizes && msgsizes[num-1] == -1)
+ {
+ if (outlevel >= O_VERBOSE)
+ error(0, 0,
+ "Skipping message %d, length -1",
+ num - 1);
+ continue;
+ }
- /* maybe we delete this message now? */
- if (protocol->delete
- && !suppress_delete
- && (fetch_it ? !ctl->keep : ctl->flush))
- {
- deletions++;
- if (outlevel > O_SILENT)
- error_complete(0, 0, " flushed");
- ok = (protocol->delete)(sockfp, ctl, num);
- if (ok != 0)
- goto cleanUp;
- vtalarm(ctl->server.timeout);
- delete_str(&ctl->newsaved, num);
- }
- else if (outlevel > O_SILENT)
- error_complete(0, 0, " not flushed");
+ /* we may want to reject this message if it's old */
+ if (!fetch_it)
+ {
+ if (outlevel > O_SILENT)
+ {
+ error_build("skipping message %d", num);
+ if (toolarge)
+ error_build(" (oversized, %d bytes)",
+ msgsizes[num-1]);
+ }
+ }
+ else
+ {
+ flag wholesize = !protocol->fetch_body;
+
+ /* request a message */
+ ok = (protocol->fetch_headers)(sock,ctl,num, &len);
+ if (ok != 0)
+ goto cleanUp;
+ set_timeout(ctl->server.timeout);
+
+ /* -1 means we didn't see a size in the response */
+ if (len == -1 && msgsizes)
+ {
+ len = msgsizes[num - 1];
+ wholesize = TRUE;
+ }
+
+ if (outlevel > O_SILENT)
+ {
+ error_build("reading message %d of %d",
+ num,count);
+
+ if (len > 0)
+ error_build(" (%d %sbytes)",
+ len, wholesize ? "" : "header ");
+ if (outlevel == O_VERBOSE)
+ error_complete(0, 0, "");
+ else
+ error_build(" ");
+ }
+
+ /*
+ * Read the message headers and ship them to the
+ * output sink.
+ */
+ ok = readheaders(sock, len, msgsizes[num-1],
+ ctl, num);
+ if (ok == PS_RETAINED)
+ suppress_forward = retained = TRUE;
+ else if (ok == PS_TRANSIENT)
+ suppress_delete = suppress_forward = TRUE;
+ else if (ok == PS_REFUSED)
+ suppress_forward = TRUE;
+ else if (ok)
+ goto cleanUp;
+ set_timeout(ctl->server.timeout);
+
+ /*
+ * If we're using IMAP4 or something else that
+ * can fetch headers separately from bodies,
+ * it's time to request the body now. This
+ * fetch may be skipped if we got an anti-spam
+ * or other PS_REFUSED error response during
+ * read_headers.
+ */
+ if (protocol->fetch_body)
+ {
+ if (outlevel == O_VERBOSE)
+ fputc('\n', stderr);
+
+ if ((ok = (protocol->trail)(sock, ctl, num)))
+ goto cleanUp;
+ set_timeout(ctl->server.timeout);
+ len = 0;
+ if (!suppress_forward)
+ {
+ if ((ok=(protocol->fetch_body)(sock,ctl,num,&len)))
+ goto cleanUp;
+ if (outlevel > O_SILENT && !wholesize)
+ error_build(" (%d body bytes) ", len);
+ set_timeout(ctl->server.timeout);
+ }
+ }
+
+ /* process the body now */
+ if (len > 0)
+ {
+ ok = readbody(sock,
+ ctl,
+ !suppress_forward,
+ len);
+ if (ok == PS_TRANSIENT)
+ suppress_delete = suppress_forward = TRUE;
+ else if (ok)
+ goto cleanUp;
+ set_timeout(ctl->server.timeout);
+
+ /* tell server we got it OK and resynchronize */
+ if (protocol->trail)
+ {
+ if (outlevel == O_VERBOSE)
+ fputc('\n', stderr);
+
+ ok = (protocol->trail)(sock, ctl, num);
+ if (ok != 0)
+ goto cleanUp;
+ set_timeout(ctl->server.timeout);
+ }
+ }
+
+ /* count # messages forwarded on this pass */
+ if (!suppress_forward)
+ dispatches++;
+
+ /*
+ * Check to see if the numbers matched?
+ *
+ * Yes, some servers foo this up horribly.
+ * All IMAP servers seem to get it right, and
+ * so does Eudora QPOP at least in 2.xx
+ * versions.
+ *
+ * Microsoft Exchange gets it completely
+ * wrong, reporting compressed rather than
+ * actual sizes (so the actual length of
+ * message is longer than the reported size).
+ * Another fine example of Microsoft brain death!
+ *
+ * Some older POP servers, like the old UCB
+ * POP server and the pre-QPOP QUALCOMM
+ * versions, report a longer size in the LIST
+ * response than actually gets shipped up.
+ * It's unclear what is going on here, as the
+ * QUALCOMM server (at least) seems to be
+ * reporting the on-disk size correctly.
+ */
+ if (msgsizes && msglen != msgsizes[num-1])
+ {
+ if (outlevel >= O_VERBOSE)
+ error(0, 0,
+ "message %d was not the expected length (%d != %d)",
+ num, msglen, msgsizes[num-1]);
+ }
+
+ /* end-of-message processing starts here */
+
+ if (ctl->mda)
+ {
+ int rc;
+
+ /* close the delivery pipe, we'll reopen before next message */
+ rc = pclose(sinkfp);
+ signal(SIGCHLD, sigchld);
+ if (rc)
+ {
+ error(0, -1, "MDA exited abnormally or returned nonzero status");
+ goto cleanUp;
+ }
+ }
+ else if (!suppress_forward)
+ {
+ /* write message terminator */
+ if (SMTP_eom(ctl->smtp_socket) != SM_OK)
+ {
+ error(0, -1, "SMTP listener refused delivery");
+ ctl->errcount++;
+ suppress_delete = TRUE;
+ }
+ }
+
+ fetches++;
+ }
- /* perhaps this as many as we're ready to handle */
- if (ctl->fetchlimit && ctl->fetchlimit <= num)
- break;
- }
+ /*
+ * At this point in flow of control, either
+ * we've bombed on a protocol error or had
+ * delivery refused by the SMTP server
+ * (unlikely -- I've never seen it) or we've
+ * seen `accepted for delivery' and the
+ * message is shipped. It's safe to mark the
+ * message seen and delete it on the server
+ * now.
+ */
+
+ /* maybe we delete this message now? */
+ if (retained)
+ {
+ if (outlevel > O_SILENT)
+ error_complete(0, 0, " retained");
+ }
+ else if (protocol->delete
+ && !suppress_delete
+ && (fetch_it ? !ctl->keep : ctl->flush))
+ {
+ deletions++;
+ if (outlevel > O_SILENT)
+ error_complete(0, 0, " flushed");
+ ok = (protocol->delete)(sock, ctl, num);
+ if (ok != 0)
+ goto cleanUp;
+ set_timeout(ctl->server.timeout);
+#ifdef POP3_ENABLE
+ delete_str(&ctl->newsaved, num);
+#endif /* POP3_ENABLE */
+ }
+ else if (outlevel > O_SILENT)
+ error_complete(0, 0, " not flushed");
- ok = gen_transact(sockfp, protocol->exit_cmd);
- if (ok == 0)
- ok = PS_SUCCESS;
- vtalarm(0);
- fclose(sockfp);
- goto closeUp;
- }
- else {
- ok = gen_transact(sockfp, protocol->exit_cmd);
- if (ok == 0)
- ok = PS_NOMAIL;
- vtalarm(0);
- fclose(sockfp);
- goto closeUp;
+ /* perhaps this as many as we're ready to handle */
+ if (ctl->fetchlimit > 0 && ctl->fetchlimit <= fetches)
+ goto no_error;
+ }
+ }
+ } while
+ /*
+ * Only re-poll if we had some actual forwards, allowed
+ * deletions and had no errors.
+ * Otherwise it is far too easy to get into infinite loops.
+ */
+ (dispatches && protocol->retry && !ctl->keep && !ctl->errcount);
}
+ no_error:
+ set_timeout(ctl->server.timeout);
+ ok = (protocol->logout_cmd)(sock, ctl);
+ /*
+ * Hmmmm...arguably this would be incorrect if we had fetches but
+ * no dispatches (due to oversized messages, etc.)
+ */
+ if (ok == 0)
+ ok = (fetches > 0) ? PS_SUCCESS : PS_NOMAIL;
+ set_timeout(0);
+ close(sock);
+ goto closeUp;
+
cleanUp:
- vtalarm(ctl->server.timeout);
+ set_timeout(ctl->server.timeout);
if (ok != 0 && ok != PS_SOCKET)
- gen_transact(sockfp, protocol->exit_cmd);
- vtalarm(0);
- fclose(sockfp);
+ (protocol->logout_cmd)(sock, ctl);
+ set_timeout(0);
+ close(sock);
}
+ msg = (char *)NULL; /* sacrifice to -Wall */
switch (ok)
{
case PS_SOCKET:
case PS_PROTOCOL:
msg = "client/server protocol";
break;
+ case PS_LOCKBUSY:
+ msg = "lock busy on server";
+ break;
case PS_SMTP:
msg = "SMTP transaction";
break;
+ case PS_DNS:
+ msg = "DNS lookup";
+ break;
case PS_UNDEFINED:
error(0, 0, "undefined");
break;
}
- if (ok==PS_SOCKET || ok==PS_AUTHFAIL || ok==PS_SYNTAX || ok==PS_IOERR
- || ok==PS_ERROR || ok==PS_PROTOCOL || ok==PS_SMTP)
- error(0, 0, "%s error while fetching from %s", msg, ctl->server.names->id);
+ if (ok==PS_SOCKET || ok==PS_AUTHFAIL || ok==PS_SYNTAX
+ || ok==PS_IOERR || ok==PS_ERROR || ok==PS_PROTOCOL
+ || ok==PS_LOCKBUSY || ok==PS_SMTP)
+ error(0,-1, "%s error while fetching from %s", msg, ctl->server.pollname);
closeUp:
- signal(SIGVTALRM, sigsave);
+ /* execute post-initialization command, if any */
+ if (ctl->postconnect && (ok = system(ctl->postconnect)))
+ {
+ char buf[80];
+
+ sprintf(buf, "post-connection command failed with status %d", ok);
+ error(0, 0, buf);
+ if (ok == PS_SUCCESS)
+ ok = PS_SYNTAX;
+ }
+
+ signal(SIGALRM, sigsave);
return(ok);
}
#if defined(HAVE_STDARG_H)
-void gen_send(FILE *sockfp, char *fmt, ... )
+void gen_send(int sock, const char *fmt, ... )
/* assemble command in printf(3) style and send to the server */
#else
-void gen_send(sockfp, fmt, va_alist)
+void gen_send(sock, fmt, va_alist)
/* assemble command in printf(3) style and send to the server */
-FILE *sockfp; /* socket to which server is connected */
+int sock; /* socket to which server is connected */
const char *fmt; /* printf-style format */
va_dcl
#endif
#else
va_start(ap);
#endif
+#ifdef HAVE_VSNPRINTF
+ vsnprintf(buf + strlen(buf), sizeof(buf), fmt, ap);
+#else
vsprintf(buf + strlen(buf), fmt, ap);
+#endif
va_end(ap);
strcat(buf, "\r\n");
- SockWrite(buf, 1, strlen(buf), sockfp);
+ SockWrite(sock, buf, strlen(buf));
if (outlevel == O_VERBOSE)
{
- if (shroud)
+ char *cp;
+
+ if (shroud && shroud[0] && (cp = strstr(buf, shroud)))
{
- char *cp;
+ char *sp;
- if ((cp = strstr(buf, shroud)))
- memset(cp, '*', strlen(shroud));
+ sp = cp + strlen(shroud);
+ *cp++ = '*';
+ while (*sp)
+ *cp++ = *sp++;
+ *cp = '\0';
}
buf[strlen(buf)-2] = '\0';
error(0, 0, "%s> %s", protocol->name, buf);
}
}
-int gen_recv(sockfp, buf, size)
+int gen_recv(sock, buf, size)
/* get one line of input from the server */
-FILE *sockfp; /* socket to which server is connected */
+int sock; /* socket to which server is connected */
char *buf; /* buffer to receive input */
int size; /* length of buffer */
{
- if (!SockGets(buf, size, sockfp))
+ if (SockRead(sock, buf, size) == -1)
return(PS_SOCKET);
else
{
}
#if defined(HAVE_STDARG_H)
-int gen_transact(FILE *sockfp, char *fmt, ... )
+int gen_transact(int sock, char *fmt, ... )
/* assemble command in printf(3) style, send to server, accept a response */
#else
-int gen_transact(sockfp, fmt, va_alist)
+int gen_transact(int sock, fmt, va_alist)
/* assemble command in printf(3) style, send to server, accept a response */
-FILE *sockfp; /* socket to which server is connected */
+int sock; /* socket to which server is connected */
const char *fmt; /* printf-style format */
va_dcl
#endif
#else
va_start(ap);
#endif
+#ifdef HAVE_VSNPRINTF
+ vsnprintf(buf + strlen(buf), sizeof(buf), fmt, ap);
+#else
vsprintf(buf + strlen(buf), fmt, ap);
+#endif
va_end(ap);
strcat(buf, "\r\n");
- SockWrite(buf, 1, strlen(buf), sockfp);
+ SockWrite(sock, buf, strlen(buf));
if (outlevel == O_VERBOSE)
{
- if (shroud)
+ char *cp;
+
+ if (shroud && shroud[0] && (cp = strstr(buf, shroud)))
{
- char *cp;
+ char *sp;
- if ((cp = strstr(buf, shroud)))
- memset(cp, '*', strlen(shroud));
+ sp = cp + strlen(shroud);
+ *cp++ = '*';
+ while (*sp)
+ *cp++ = *sp++;
+ *cp = '\0';
}
buf[strlen(buf)-1] = '\0';
error(0, 0, "%s> %s", protocol->name, buf);
}
/* we presume this does its own response echoing */
- ok = (protocol->parse_response)(sockfp, buf);
- vtalarm(mytimeout);
+ ok = (protocol->parse_response)(sock, buf);
+ set_timeout(mytimeout);
return(ok);
}
/* driver.c ends here */
-
projects / ~andy / fetchmail / blobdiff