#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
#include "mx.h"
#endif /* HAVE_GETHOSTBYNAME */
-#ifdef SUNOS
-#include <memory.h>
-#endif
-
#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__)
+#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>
static char *shroud; /* string to shroud in debug output, if non-NULL */
static int mytimeout; /* value of nonreponse timeout */
+#ifdef MSGLEN
+static int msglen; /* actual message length */
+#endif /* MSGLEN */
static void set_timeout(int timeleft)
/* reset the nonresponse-timeout */
}
}
-char *parse_received(struct query *ctl, char *bufp)
+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 && *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 */
-int 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 idlist *idp;
-
/* maybe it's time to close the socket in order to force delivery */
if (ctl->batchlimit > 0 && (ctl->smtp_socket != -1) && batchcount++ == ctl->batchlimit)
{
batchcount = 0;
}
- /* run down the SMTP hunt list looking for a server that's up */
- for (idp = ctl->smtphunt; idp; idp = idp->next)
+ /* if no socket to any SMTP host is already set up, try to open one */
+ if (ctl->smtp_socket == -1)
{
/*
* RFC 1123 requires that the domain name in HELO address is a
* that matches the local machine fetchmail is running on.
* What it will affect is the listener's logging.
*/
+ struct idlist *idp;
- /* if no socket to this host is already set up, try to open ESMTP */
- if (ctl->smtp_socket == -1)
+ /* run down the SMTP hunt list looking for a server that's up */
+ for (idp = ctl->smtphunt; idp; idp = idp->next)
{
-#ifndef HAVE_RES_SEARCH
- char *fakename;
-#endif /* HAVE_RES_SEARCH */
+ 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,
- ctl->server.truename,
- &ctl->server.esmtp_options) != SM_OK)
- {
- /*
- * 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.
- */
- close(ctl->smtp_socket);
- ctl->smtp_socket = -1;
- }
- else
- {
- ctl->smtphost = idp->id;
- break;
- }
- }
+ if (SMTP_ok(ctl->smtp_socket) == SM_OK &&
+ SMTP_ehlo(ctl->smtp_socket,
+ ctl->server.truename,
+ &ctl->server.esmtp_options) == SM_OK)
+ break; /* success */
- /* if opening for ESMTP failed, try SMTP */
- if (ctl->smtp_socket == -1)
- {
+ /*
+ * 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.
+ */
+ 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;
- else if (SMTP_ok(ctl->smtp_socket) != SM_OK
- || SMTP_helo(ctl->smtp_socket,
- ctl->server.truename) != SM_OK)
- {
- close(ctl->smtp_socket);
- ctl->smtp_socket = -1;
- }
- else
- {
- ctl->smtphost = idp->id;
- break;
- }
+
+ if (SMTP_ok(ctl->smtp_socket) == SM_OK &&
+ SMTP_helo(ctl->smtp_socket, ctl->server.truename) == SM_OK)
+ break; /* success */
+
+ close(ctl->smtp_socket);
+ ctl->smtp_socket = -1;
}
}
+ 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 readheaders and readbody */
+/* these are shared by stuffline, readheaders and readbody */
static FILE *sinkfp;
static RETSIGTYPE (*sigchld)();
static int sizeticker;
-static int readheaders(sock, len, ctl, realname)
+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)
+ {
+ 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 (!protocol->delimited && *buf == '.')
+ if (sinkfp && ctl->mda)
+ fputs(".", sinkfp);
+ else if (ctl->smtp_socket != -1)
+ SockWrite(ctl->smtp_socket, buf, 1);
+
+ /* 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';
+ }
+
+ 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 readheaders(sock, len, ctl, realname, num)
/* read message headers and ship to SMTP or MDA */
int sock; /* to which the server is connected */
long len; /* length of message */
struct query *ctl; /* query control record */
char *realname; /* real name of host */
+int num; /* index of message */
{
+ 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, addressoffs[128], next_address;
- char *headers, *received_for;
+ int from_offs, ctt_offs, env_offs, next_address;
+ char *headers, *received_for, *desthost;
int n, linelen, oldlen, ch, remaining;
char *cp;
struct idlist *idp, *xmit_names;
headers = received_for = NULL;
from_offs = ctt_offs = env_offs = -1;
oldlen = 0;
- for (remaining = len; remaining > 0; remaining -= linelen)
+#ifdef MSGLEN
+ msglen = 0;
+#endif /* MSGLEN */
+ for (remaining = len; remaining > 0 || protocol->delimited; remaining -= linelen)
{
char *line;
if ((n = SockRead(sock, buf, sizeof(buf)-1)) == -1)
return(PS_SOCKET);
linelen += n;
+#ifdef MSGLEN
+ msglen += n;
+#endif /* MSGLEN */
/* lines may not be properly CRLF terminated; fix this for qmail */
if (ctl->forcecr)
}
set_timeout(ctl->server.timeout);
- /* leave extra room for reply_hack to play with */
- line = (char *) realloc(line, strlen(line) + strlen(buf) + HOSTLEN + 1);
+
+ line = (char *) realloc(line, strlen(line) + strlen(buf) +1);
+
strcat(line, buf);
if (line[0] == '\r' && line[1] == '\n')
break;
break;
}
+ /*
+ * 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 != pop2)
+#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
}
if (ctl->rewrite)
- reply_hack(line, realname);
+ line = reply_hack(line, realname);
if (!headers)
{
from_offs = (line - headers);
else if (from_offs == -1 && !strncasecmp("Apparently-From:", line, 16))
from_offs = (line - headers);
- else if (!strncasecmp("To:", line, 3))
- {
- if (next_address >= sizeof(addressoffs)/sizeof(addressoffs[0]))
- error(PS_UNDEFINED, errno, "too many destination headers");
- addressoffs[next_address++] = (line - headers);
- }
-
- else if (!strncasecmp("Cc:", line, 3))
+ else if (!strncasecmp("Content-Transfer-Encoding:", line, 26))
+ ctt_offs = (line - headers);
+ else if (!strncasecmp("Message-Id:", buf, 11 ))
{
- if (next_address >= sizeof(addressoffs)/sizeof(addressoffs[0]))
- error(PS_UNDEFINED, errno, "too many destination headers");
- addressoffs[next_address++] = (line - headers);
- }
+ if( ctl->server.uidl )
+ {
+ char id[IDLEN+1];
+ sscanf( buf+12, "%s", id);
+ if( !str_in_list( &ctl->newsaved, id ) )
+ save_str(&ctl->newsaved, num, id );
+ }
+ }
+
+ else if (!MULTIDROP(ctl))
+ continue;
- else if (!strncasecmp("Bcc:", line, 4))
+ else if (!strncasecmp("To:", line, 3)
+ || !strncasecmp("Cc:", line, 3)
+ || !strncasecmp("Bcc:", line, 4))
{
- if (next_address >= sizeof(addressoffs)/sizeof(addressoffs[0]))
- error(PS_UNDEFINED, errno, "too many destination headers");
- addressoffs[next_address++] = (line - headers);
+ *chainptr = xmalloc(sizeof(struct addrblk));
+ (*chainptr)->offset = (line - headers);
+ chainptr = &(*chainptr)->next;
+ *chainptr = NULL;
}
- else if (!strncasecmp("Content-Transfer-Encoding:", line, 26))
- ctt_offs = (line - headers);
-
- else if (MULTIDROP(ctl) && ctl->server.envelope != STRING_DISABLED)
+ else if (ctl->server.envelope != STRING_DISABLED)
{
if (ctl->server.envelope
&& strcasecmp(ctl->server.envelope, "received"))
* We haven't extracted the envelope address.
* So check all the header addresses.
*/
- for (i = 0; i < next_address; i++)
- find_server_names(headers + addressoffs[i], 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 (!accept_count)
{
int length = 0;
char *names, *cmd;
+ desthost = "localhost";
+
/*
* 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);
+ good_addresses++;
+ }
names = (char *)alloca(length);
names[0] = '\0';
for (idp = xmit_names; idp; idp = idp->next)
}
else
{
- char *ap, *ctt, options[MSGBUFSIZE];
+ char *ap, *ctt, options[MSGBUFSIZE], addr[128];
/* build a connection to the SMTP listener */
if ((smtp_open(ctl) == -1))
{
free_str_list(&xmit_names);
- error(0, -1, "SMTP connect to %s failed",
+ error(0, errno, "SMTP connect to %s failed",
ctl->smtphost ? ctl->smtphost : "localhost");
return(PS_SMTP);
}
*
* 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 (idp->val.num == XMIT_ACCEPT)
- if (SMTP_rcpt(ctl->smtp_socket, idp->id) == SM_OK)
+ {
+ 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
{
error(0, 0,
"SMTP listener doesn't like recipient address `%s'", idp->id);
}
- if (!good_addresses && SMTP_rcpt(ctl->smtp_socket, user) != SM_OK)
+ }
+ if (!good_addresses)
{
- error(0, 0,
- "can't even send to calling user!");
- free(headers);
- 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(ctl->smtp_socket);
}
- /* we may need to strip carriage returns */
- if (ctl->stripcr)
+ /* utter any per-message Received information we need here */
{
- char *sp, *tp;
-
- for (sp = tp = headers; *sp; sp++)
- if (*sp != '\r')
- *tp++ = *sp;
- *tp = '\0';
-
+ time_t now;
+
+ /* write a line describing fetchmail's processing of the message */
+ sprintf(buf,
+ "Received: from %s\r\n\tby %s (fetchmail-%s %s run by %s)\r\n",
+ ctl->server.truename,
+ fetchmailhost,
+ RELEASE_ID,
+ protocol->name,
+ ctl->remotename);
+
+ if (!good_addresses)
+ sprintf(buf + strlen(buf),
+ "\tfor <%s@%s> (by default); ",
+ user, desthost);
+ if (good_addresses == 1)
+ {
+ for (idp = xmit_names; idp; idp = idp->next)
+ if (idp->val.num == XMIT_ACCEPT)
+ {
+ sprintf(buf + strlen(buf), "\tfor <%s@%s> (%s); ",
+ idp->id, desthost,
+ MULTIDROP(ctl) ? "multi-drop" : "single-drop");
+ break; /* only report first address */
+ }
+ }
+ time(&now);
+ strcat(buf, ctime(&now));
+ strcpy(buf + strlen(buf) - 1, "\r\n");
}
- /* write all the headers */
- n = 0;
- if (ctl->mda && sinkfp)
- n = fwrite(headers, 1, strlen(headers), sinkfp);
- else if (ctl->smtp_socket != -1)
- n = SockWrite(ctl->smtp_socket, headers, strlen(headers));
- free(headers);
-
- if (n < 0)
+ /* ship out the synthetic Received line and the headers */
+ if (stuffline(ctl, buf) < 0 || stuffline(ctl, headers) < 0)
{
error(0, errno, "writing RFC822 headers");
if (ctl->mda)
}
- if (ctl->mda && !ctl->forcecr)
- strcat(errmsg, "\n");
- else
- strcat(errmsg, "\r\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';
- }
+ strcat(errmsg, "\n");
/* ship out the error line */
if (sinkfp)
- {
- if (ctl->mda)
- fwrite(errmsg, sizeof(char), strlen(errmsg), sinkfp);
- else
- SockWrite(ctl->smtp_socket, errmsg, strlen(errmsg));
- }
+ stuffline(ctl, errmsg);
}
free_str_list(&xmit_names);
/* issue the delimiter line */
- if (sinkfp && ctl->mda)
- fputc('\n', sinkfp);
- else if (ctl->smtp_socket != -1)
- {
- if (ctl->stripcr)
- SockWrite(ctl->smtp_socket, "\n", 1);
- else
- SockWrite(ctl->smtp_socket, "\r\n", 2);
- }
+ cp = buf;
+ *cp++ = '\r';
+ *cp++ = '\n';
+ *cp++ = '\0';
+ stuffline(ctl, buf);
return(PS_SUCCESS);
}
-static int readbody(sock, ctl, forward, len, delimited)
+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 */
-flag delimited; /* does the protocol use a message delimiter? */
{
int linelen;
char buf[MSGBUFSIZE+1], *cp;
/* pass through the text lines */
- while (delimited || len > 0)
+ while (protocol->delimited || len > 0)
{
if ((linelen = SockRead(sock, buf, sizeof(buf)-1)) == -1)
+ {
+ if (ctl->mda)
+ {
+ pclose(sinkfp);
+ signal(SIGCHLD, sigchld);
+ }
return(PS_SOCKET);
+ }
set_timeout(ctl->server.timeout);
/* write the message size dots */
}
}
len -= linelen;
-
- /* fix messages that have only \n line-termination (for qmail) */
- if (ctl->forcecr)
- {
- cp = buf + strlen(buf) - 1;
- if (*cp == '\n' && (cp == buf || cp[-1] != '\r'))
- {
- *cp++ = '\r';
- *cp++ = '\n';
- *cp++ = '\0';
- }
- }
+#ifdef MSGLEN
+ msglen += linelen;
+#endif /* MSGLEN */
/* 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;
/* ship out the text line */
if (forward)
{
- int n;
-
- /*
- * 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 (!delimited && *buf == '.')
- if (sinkfp && ctl->mda)
- fputs(".", sinkfp);
- else if (ctl->smtp_socket != -1)
- SockWrite(ctl->smtp_socket, buf, 1);
-
- /* 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';
- }
-
- 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));
+ int n = stuffline(ctl, buf);
if (n < 0)
{
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;
(void) sprintf(buf, "%s@%s", ctl->remotename, realname);
if (outlevel > O_SILENT)
if (count == -1) /* only used for ETRN */
- error(0, 0, "Polling %s", buf);
+ error(0, 0, "Polling %s", realname);
else if (count == 0)
- error(0, 0, "No mail at %s", buf);
+ {
+ /* these are pointless in normal daemon mode */
+ if (poll_interval == 0 || outlevel == O_VERBOSE )
+ error(0, 0, "No mail at %s", buf);
+ }
else
{
if (new != -1 && (count - new) > 0)
force_retrieval = !peek_capable && (ctl->errcount > 0);
/*
- * We may need to get sizes in order to check message
- * limits. Or it may be forced because the fetch methods
- * don't return reliable sizes.
+ * We need the size of each method 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.
*/
- msgsizes = (int *)NULL;
- if (proto->getsizes && (proto->force_getsizes || ctl->limit > 0))
+ if (proto->getsizes)
{
msgsizes = (int *)alloca(sizeof(int) * count);
&& (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;
+ }
/* we may want to reject this message if it's old */
if (!fetch_it)
* Read the message headers and ship them to the
* output sink.
*/
- ok = readheaders(sock, len, ctl, realname);
- if (ok == PS_TRANSIENT)
- suppress_delete = TRUE;
+ ok = readheaders(sock, len, ctl, realname, 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)
{
if ((ok=(protocol->fetch_body)(sock,ctl,num,&len)))
goto cleanUp;
- if (outlevel > O_SILENT && !msgsizes)
+ if (outlevel > O_SILENT && !wholesize)
error_build(" (%d body bytes) ", len);
set_timeout(ctl->server.timeout);
}
ok = readbody(sock,
ctl,
!suppress_forward,
- len,
- protocol->delimited);
+ len);
if (ok == PS_TRANSIENT)
- suppress_delete = TRUE;
+ suppress_delete = suppress_forward = TRUE;
else if (ok)
goto cleanUp;
set_timeout(ctl->server.timeout);
}
}
+#ifdef MSGLEN
+ /* check to see if the numbers matched? */
+ if (msgsizes && msglen != msgsizes[num-1])
+ error(0, 0, "size of message %d (%d) was not what was expected (%d)", num, msglen, msgsizes[num-1]);
+#endif /* MSGLEN */
+
/* end-of-message processing starts here */
if (outlevel == O_VERBOSE)
fputc('\n', stderr);
*/
/* maybe we delete this message now? */
- if (protocol->delete
+ if (retained)
+ {
+ if (outlevel > O_SILENT)
+ error_complete(0, 0, " retained");
+ }
+ else if (protocol->delete
&& !suppress_delete
&& (fetch_it ? !ctl->keep : ctl->flush))
{
case PS_SMTP:
msg = "SMTP transaction";
break;
+ case PS_DNS:
+ msg = "DNS lookup";
+ break;
case PS_UNDEFINED:
error(0, 0, "undefined");
break;
error(0,-1, "%s error while fetching from %s", msg, ctl->server.pollname);
closeUp:
+ /* 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);
}
projects / ~andy / fetchmail / blobdiff