xalloca(parsed_host, char *, strlen(idp->id) + 1);
ctl->smtphost = idp->id; /* remember last host tried. */
+ if(ctl->smtphost[0]=='/')
+ ctl->listener = LMTP_MODE;
strcpy(parsed_host, idp->id);
if ((cp = strrchr(parsed_host, '/')))
#endif /* INET6_ENABLE */
}
+ if (ctl->smtphost[0]=='/'){
+ if((ctl->smtp_socket = UnixOpen(ctl->smtphost))==-1)
+ continue;
+ } else
if ((ctl->smtp_socket = SockOpen(parsed_host,portnum,NULL,
ctl->server.plugout)) == -1)
continue;
* enforce this. Now that we have the actual hostname,
* compute what we should canonicalize with.
*/
- ctl->destaddr = ctl->smtpaddress ? ctl->smtpaddress : ( ctl->smtphost ? ctl->smtphost : "localhost");
+ ctl->destaddr = ctl->smtpaddress ? ctl->smtpaddress : ( ctl->smtphost && ctl->smtphost[0] != '/' ? ctl->smtphost : "localhost");
if (outlevel >= O_DEBUG && ctl->smtp_socket != -1)
report(stdout, _("forwarding to %s\n"), ctl->smtphost);
/* these are shared by open_sink and stuffline */
static FILE *sinkfp;
+#ifndef HAVE_SIGACTION
static RETSIGTYPE (*sigchld)(int);
+#else
+static struct sigaction sa_old;
+#endif /* HAVE_SIGACTION */
int stuffline(struct query *ctl, char *buf)
/* ship a line to the given control block's output sink (SMTP server or MDA) */
/* bounce back an error report a la RFC 1892 */
{
char daemon_name[18 + HOSTLEN] = "FETCHMAIL-DAEMON@";
- char boundary[BUFSIZ], *ts, *bounce_to;
+ char boundary[BUFSIZ], *bounce_to;
int sock;
/* don't bounce in reply to undeliverable bounces */
"foo-mani-padme-hum-%d-%d-%ld",
(int)getpid(), (int)getppid(), time((time_t *)NULL));
- ts = rfc822timestamp();
-
if (outlevel >= O_VERBOSE)
- report(stdout, "SMTP: (bounce-message body)\n");
+ report(stdout, _("SMTP: (bounce-message body)\n"));
else
/* this will usually go to sylog... */
- report(stderr, "mail from %s bounced to %s\n",
+ report(stderr, _("mail from %s bounced to %s\n"),
daemon_name, bounce_to);
/* bouncemail headers */
/* Minimum RFC1894 compliance + Diagnostic-Code field */
SockPrintf(sock, "\r\n");
SockPrintf(sock, "Final-Recipient: rfc822; %s\r\n", idp->id);
- SockPrintf(sock, "Last-Attempt-Date: %s\r\n", ts);
+ SockPrintf(sock, "Last-Attempt-Date: %s\r\n", rfc822timestamp());
SockPrintf(sock, "Action: failed\r\n");
if (nerrors == 1)
xalloca(responses[0], char *, strlen(smtp_response)+1);
strcpy(responses[0], smtp_response);
- SMTP_rset(ctl->smtp_socket); /* stay on the safe site */
+ SMTP_rset(ctl->smtp_socket); /* stay on the safe side */
if (outlevel >= O_DEBUG)
- report(stdout, "Saved error is still %d\n", smtperr);
+ report(stdout, _("Saved error is still %d\n"), smtperr);
/*
* Note: send_bouncemail message strings are not made subject
* coming from this address, probably due to an
* anti-spam domain exclusion. Respect this. Don't
* try to ship the message, and don't prevent it from
- * being deleted. Default values:
+ * being deleted. There's no point in bouncing the
+ * email either since most spammers don't put their
+ * real return email address anywhere in the headers
+ * (unless the user insists with the SET SPAMBOUNCE
+ * config option).
+ *
+ * Default values:
*
* 571 = sendmail's "unsolicited email refused"
* 550 = exim's new antispam response (temporary)
* 554 = Postfix antispam response.
*
*/
- send_bouncemail(ctl, msg, XMIT_ACCEPT,
+ if (run.spambounce)
+ send_bouncemail(ctl, msg, XMIT_ACCEPT,
"Our spam filter rejected this transaction.\r\n",
1, responses);
return(PS_REFUSED);
if (smtperr >= 400)
report(stderr, _("%cMTP error: %s\n"),
ctl->listener,
- smtp_response);
+ responses[0]);
switch (smtperr)
{
/* set up sinkfp to be an input sink we can ship a message to */
{
struct idlist *idp;
+#ifdef HAVE_SIGACTION
+ struct sigaction sa_new;
+#endif /* HAVE_SIGACTION */
*bad_addresses = *good_addresses = 0;
return(PS_BSMTP);
}
}
- else if (ctl->mda) /* we have a declared MDA */
- {
- int length = 0, fromlen = 0, nameslen = 0;
- char *names = NULL, *before, *after, *from = NULL;
-
- ctl->destaddr = "localhost";
-
- for (idp = msg->recipients; idp; idp = idp->next)
- if (idp->val.status.mark == XMIT_ACCEPT)
- (*good_addresses)++;
-
- length = strlen(ctl->mda);
- before = xstrdup(ctl->mda);
-
- /* get user addresses for %T (or %s for backward compatibility) */
- if (strstr(before, "%s") || strstr(before, "%T"))
- {
- /*
- * We go through this in order to be able to handle very
- * long lists of users and (re)implement %s.
- */
- nameslen = 0;
- for (idp = msg->recipients; idp; idp = idp->next)
- if ((idp->val.status.mark == XMIT_ACCEPT))
- nameslen += (strlen(idp->id) + 1); /* string + ' ' */
- if ((*good_addresses == 0))
- nameslen = strlen(run.postmaster);
-
- names = (char *)xmalloc(nameslen + 1); /* account for '\0' */
- if (*good_addresses == 0)
- strcpy(names, run.postmaster);
- else
- {
- names[0] = '\0';
- for (idp = msg->recipients; idp; idp = idp->next)
- if (idp->val.status.mark == XMIT_ACCEPT)
- {
- strcat(names, idp->id);
- strcat(names, " ");
- }
- names[--nameslen] = '\0'; /* chop trailing space */
- }
-
- /* sanitize names in order to contain only harmless shell chars */
- sanitize(names);
- }
-
- /* get From address for %F */
- if (strstr(before, "%F"))
- {
- from = xstrdup(msg->return_path);
-
- /* sanitize from in order to contain *only* harmless shell chars */
- sanitize(from);
-
- fromlen = strlen(from);
- }
- /* do we have to build an mda string? */
- if (names || from)
- {
- char *sp, *dp;
-
- /* find length of resulting mda string */
- sp = before;
- while ((sp = strstr(sp, "%s"))) {
- length += nameslen - 2; /* subtract %s */
- sp += 2;
- }
- sp = before;
- while ((sp = strstr(sp, "%T"))) {
- length += nameslen - 2; /* subtract %T */
- sp += 2;
- }
- sp = before;
- while ((sp = strstr(sp, "%F"))) {
- length += fromlen - 2; /* subtract %F */
- sp += 2;
- }
-
- after = xmalloc(length + 1);
-
- /* copy mda source string to after, while expanding %[sTF] */
- for (dp = after, sp = before; (*dp = *sp); dp++, sp++) {
- if (sp[0] != '%') continue;
-
- /* need to expand? BTW, no here overflow, because in
- ** the worst case (end of string) sp[1] == '\0' */
- if (sp[1] == 's' || sp[1] == 'T') {
- strcpy(dp, names);
- dp += nameslen;
- sp++; /* position sp over [sT] */
- dp--; /* adjust dp */
- } else if (sp[1] == 'F') {
- strcpy(dp, from);
- dp += fromlen;
- sp++; /* position sp over F */
- dp--; /* adjust dp */
- }
- }
-
- if (names) {
- free(names);
- names = NULL;
- }
- if (from) {
- free(from);
- from = NULL;
- }
-
- free(before);
-
- before = after;
- }
-
-
- if (outlevel >= O_DEBUG)
- report(stdout, _("about to deliver with: %s\n"), before);
-
-#ifdef HAVE_SETEUID
- /*
- * Arrange to run with user's permissions if we're root.
- * This will initialize the ownership of any files the
- * MDA creates properly. (The seteuid call is available
- * under all BSDs and Linux)
- */
- seteuid(ctl->uid);
-#endif /* HAVE_SETEUID */
-
- sinkfp = popen(before, "w");
- free(before);
- before = NULL;
-
-#ifdef HAVE_SETEUID
- /* this will fail quietly if we didn't start as root */
- seteuid(0);
-#endif /* HAVE_SETEUID */
-
- if (!sinkfp)
- {
- report(stderr, _("MDA open failed\n"));
- return(PS_IOERR);
- }
-
- sigchld = signal(SIGCHLD, SIG_DFL);
- }
- else /* forward to an SMTP or LMTP listener */
+ /*
+ * Try to forward to an SMTP or LMTP listener. If the attempt to
+ * open a socket fails, fall through to attempt delivery via
+ * local MDA.
+ */
+ else if (!ctl->mda && smtp_open(ctl) != -1)
{
const char *ap;
char options[MSGBUFSIZE];
char **from_responses;
int total_addresses;
- /* build a connection to the SMTP listener */
- if ((smtp_open(ctl) == -1))
- {
- report(stderr, _("%cMTP connect to %s failed\n"),
- ctl->listener,
- ctl->smtphost ? ctl->smtphost : "localhost");
- return(PS_SMTP);
- }
-
/*
* Compute ESMTP options.
*/
else
{
char errbuf[POPBUFSIZE];
+ int res;
+
+ if ((res = handle_smtp_report(ctl, msg))==PS_REFUSED)
+ return(PS_REFUSED);
strcpy(errbuf, idp->id);
strcat(errbuf, ": ");
return(handle_smtp_report(ctl, msg));
}
+ /*
+ * Awkward case. User didn't specify an MDA. Our attempt to get a
+ * listener socket failed. Try to cope anyway -- initial configuration
+ * may have found procmail.
+ */
+ else if (!ctl->mda)
+ {
+ report(stderr, _("%cMTP connect to %s failed\n"),
+ ctl->listener,
+ ctl->smtphost ? ctl->smtphost : "localhost");
+
+#ifndef FALLBACK_MDA
+ /* No fallback MDA declared. Bail out. */
+ return(PS_SMTP);
+#else
+ /*
+ * If user had things set up to forward offsite, no way
+ * we want to deliver locally!
+ */
+ if (ctl->smtphost && strcmp(ctl->smtphost, "localhost"))
+ return(PS_SMTP);
+
+ /*
+ * User was delivering locally. We have a fallback MDA.
+ * Latch it in place, logging the error, and fall through.
+ */
+ ctl->mda = FALLBACK_MDA;
+
+ report(stderr, _("can't raise the listener; falling back to " FALLBACK_MDA));
+#endif
+ }
+
+ if (ctl->mda) /* must deliver through an MDA */
+ {
+ int length = 0, fromlen = 0, nameslen = 0;
+ char *names = NULL, *before, *after, *from = NULL;
+
+ ctl->destaddr = "localhost";
+
+ for (idp = msg->recipients; idp; idp = idp->next)
+ if (idp->val.status.mark == XMIT_ACCEPT)
+ (*good_addresses)++;
+
+ length = strlen(ctl->mda);
+ before = xstrdup(ctl->mda);
+
+ /* get user addresses for %T (or %s for backward compatibility) */
+ if (strstr(before, "%s") || strstr(before, "%T"))
+ {
+ /*
+ * We go through this in order to be able to handle very
+ * long lists of users and (re)implement %s.
+ */
+ nameslen = 0;
+ for (idp = msg->recipients; idp; idp = idp->next)
+ if ((idp->val.status.mark == XMIT_ACCEPT))
+ nameslen += (strlen(idp->id) + 1); /* string + ' ' */
+ if ((*good_addresses == 0))
+ nameslen = strlen(run.postmaster);
+
+ names = (char *)xmalloc(nameslen + 1); /* account for '\0' */
+ if (*good_addresses == 0)
+ strcpy(names, run.postmaster);
+ else
+ {
+ names[0] = '\0';
+ for (idp = msg->recipients; idp; idp = idp->next)
+ if (idp->val.status.mark == XMIT_ACCEPT)
+ {
+ strcat(names, idp->id);
+ strcat(names, " ");
+ }
+ names[--nameslen] = '\0'; /* chop trailing space */
+ }
+
+ /* sanitize names in order to contain only harmless shell chars */
+ sanitize(names);
+ }
+
+ /* get From address for %F */
+ if (strstr(before, "%F"))
+ {
+ from = xstrdup(msg->return_path);
+
+ /* sanitize from in order to contain *only* harmless shell chars */
+ sanitize(from);
+
+ fromlen = strlen(from);
+ }
+
+ /* do we have to build an mda string? */
+ if (names || from)
+ {
+ char *sp, *dp;
+
+ /* find length of resulting mda string */
+ sp = before;
+ while ((sp = strstr(sp, "%s"))) {
+ length += nameslen - 2; /* subtract %s */
+ sp += 2;
+ }
+ sp = before;
+ while ((sp = strstr(sp, "%T"))) {
+ length += nameslen - 2; /* subtract %T */
+ sp += 2;
+ }
+ sp = before;
+ while ((sp = strstr(sp, "%F"))) {
+ length += fromlen - 2; /* subtract %F */
+ sp += 2;
+ }
+
+ after = xmalloc(length + 1);
+
+ /* copy mda source string to after, while expanding %[sTF] */
+ for (dp = after, sp = before; (*dp = *sp); dp++, sp++) {
+ if (sp[0] != '%') continue;
+
+ /* need to expand? BTW, no here overflow, because in
+ ** the worst case (end of string) sp[1] == '\0' */
+ if (sp[1] == 's' || sp[1] == 'T') {
+ strcpy(dp, names);
+ dp += nameslen;
+ sp++; /* position sp over [sT] */
+ dp--; /* adjust dp */
+ } else if (sp[1] == 'F') {
+ strcpy(dp, from);
+ dp += fromlen;
+ sp++; /* position sp over F */
+ dp--; /* adjust dp */
+ }
+ }
+
+ if (names) {
+ free(names);
+ names = NULL;
+ }
+ if (from) {
+ free(from);
+ from = NULL;
+ }
+
+ free(before);
+
+ before = after;
+ }
+
+
+ if (outlevel >= O_DEBUG)
+ report(stdout, _("about to deliver with: %s\n"), before);
+
+#ifdef HAVE_SETEUID
+ /*
+ * Arrange to run with user's permissions if we're root.
+ * This will initialize the ownership of any files the
+ * MDA creates properly. (The seteuid call is available
+ * under all BSDs and Linux)
+ */
+ seteuid(ctl->uid);
+#endif /* HAVE_SETEUID */
+
+ sinkfp = popen(before, "w");
+ free(before);
+ before = NULL;
+
+#ifdef HAVE_SETEUID
+ /* this will fail quietly if we didn't start as root */
+ seteuid(0);
+#endif /* HAVE_SETEUID */
+
+ if (!sinkfp)
+ {
+ report(stderr, _("MDA open failed\n"));
+ return(PS_IOERR);
+ }
+
+#ifndef HAVE_SIGACTION
+ sigchld = signal(SIGCHLD, SIG_DFL);
+#else
+ memset (&sa_new, 0, sizeof sa_new);
+ sigemptyset (&sa_new.sa_mask);
+ sa_new.sa_handler = SIG_DFL;
+ sigaction (SIGCHLD, &sa_new, &sa_old);
+#endif /* HAVE_SIGACTION */
+ }
+
/*
* We need to stash this away in order to know how many
* response lines to expect after the LMTP end-of-message.
pclose(sinkfp);
sinkfp = (FILE *)NULL;
}
+#ifndef HAVE_SIGACTION
signal(SIGCHLD, sigchld);
+#else
+ sigaction (SIGCHLD, &sa_old, NULL);
+#endif /* HAVE_SIGACTION */
}
}
}
else
rc = 0;
+#ifndef HAVE_SIGACTION
signal(SIGCHLD, sigchld);
+#else
+ sigaction (SIGCHLD, &sa_old, NULL);
+#endif /* HAVE_SIGACTION */
if (rc)
{
report(stderr,
void close_warning_by_mail(struct query *ctl, struct msgblk *msg)
/* sign and send mailed warnings */
{
- stuff_warning(ctl, "--\r\n\t\t\t\tThe Fetchmail Daemon\r\n");
+ stuff_warning(ctl, _("--\r\n\t\t\t\tThe Fetchmail Daemon\r\n"));
close_sink(ctl, msg, TRUE);
}
projects / ~andy / fetchmail / blobdiff