#include "config.h"
#include <stdio.h>
-#include <ctype.h>
#if defined(STDC_HEADERS)
#include <stdlib.h>
#endif
#include <fcntl.h>
#include <string.h>
#include <signal.h>
-#include <getopt.h>
#if defined(HAVE_SYSLOG)
#include <syslog.h>
#endif
#include <grp.h>
#endif
#include <errno.h>
-#include <sys/time.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/time.h> /* needed for Sun 4.1.2 */
#ifdef HAVE_SETRLIMIT
#include <sys/resource.h>
#endif /* HAVE_SETRLIMIT */
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif /* HAVE_SYS_WAIT_H */
#include <sys/utsname.h>
+#ifdef HAVE_NET_SOCKET_H
+#include <net/socket.h>
+#endif
#ifdef HAVE_GETHOSTBYNAME
#include <netdb.h>
#endif /* HAVE_GETHOSTBYNAME */
#include <hesiod.h>
#endif
+#include "getopt.h"
#include "fetchmail.h"
+#include "socket.h"
#include "tunable.h"
#include "smtp.h"
#include "netrc.h"
flag versioninfo; /* emit only version info */
char *user; /* the name of the invoking user */
char *home; /* invoking user's home directory */
+char *fmhome; /* fetchmail's home directory */
char *program_name; /* the name to prefix error messages with */
flag configdump; /* dump control blocks for configurator */
const char *fetchmailhost; /* either `localhost' or the host's FQDN */
-volatile int lastsig; /* last signal received */
#if NET_SECURITY
void *request = NULL;
static int lock_acquired; /* have we acquired a lock */
static int querystatus; /* status of query */
static int successes; /* count number of successful polls */
+static int activecount; /* count number of active entries */
static struct runctl cmd_run; /* global options set from command line */
static time_t parsetime; /* time of last parse */
static void terminate_run(int);
static void terminate_poll(int);
-#ifdef SLEEP_WITH_ALARM
-/*
- * The function of this variable is to remove the window during which a
- * SIGALRM can hose the code (ALARM is triggered *before* pause() is called).
- * This is a bit of a kluge; the real right thing would use sigprocmask(),
- * sigsuspend(). This workaround lets the interval timer trigger the first
- * alarm after the required interval and will then generate alarms all 5
- * seconds, until it is certain, that the critical section (ie., the window)
- * is left.
- */
-#if defined(STDC_HEADERS)
-static sig_atomic_t alarm_latch = FALSE;
-#else
-/* assume int can be written in one atomic operation on non ANSI-C systems */
-static int alarm_latch = FALSE;
-#endif
-
-RETSIGTYPE gotsigalrm(sig)
-int sig;
-{
- signal(sig, gotsigalrm);
- lastsig = sig;
- alarm_latch = TRUE;
-}
-#endif /* SLEEP_WITH_ALARM */
-
-RETSIGTYPE donothing(int sig) {signal(sig, donothing); lastsig = sig;}
-
#ifdef HAVE_ON_EXIT
static void unlockit(int n, void *p)
#else
unlink(lockfile);
}
-#ifdef __EMX__
-/* Various EMX-specific definitions */
-int itimerflag;
-void itimerthread(void* dummy) {
- if (outlevel >= O_VERBOSE)
- report(stderr, _("fetchmail: thread sleeping for %d sec.\n"), poll_interval);
- while(1) {
- _sleep2(poll_interval*1000);
- kill((getpid()), SIGALRM);
- }
-}
-#endif
-
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(__FreeBSD_USE_KVM)
/* drop SGID kmem privileage until we need it */
static void dropprivs(void)
{
}
#endif
+#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS) && defined(HAVE_STRFTIME)
+#include <time.h>
+#include <locale.h>
+static char *timestamp (void)
+{
+ time_t now;
+ static char buf[60];
+
+ time (&now);
+ setlocale (LC_TIME, "");
+ strftime (buf, sizeof (buf), "%c", localtime(&now));
+ setlocale (LC_TIME, "C");
+ return (buf);
+}
+#else
+#define timestamp rfc822timestamp
+#endif
+
int main(int argc, char **argv)
{
int st, bkgd = FALSE;
netrc_entry *netrc_list;
char *netrc_file, *tmpbuf;
pid_t pid;
+ int lastsig = 0;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && defined(__FreeBSD_USE_KVM)
dropprivs();
#endif
{
int i;
- report(stdout, "fetchmail: invoked with");
+ report(stdout, _("fetchmail: invoked with"));
for (i = 0; i < argc; i++)
report(stdout, " %s", argv[i]);
report(stdout, "\n");
}
#define IDFILE_NAME ".fetchids"
- run.idfile = (char *) xmalloc(strlen(home)+sizeof(IDFILE_NAME)+1);
- strcpy(run.idfile, home);
+ run.idfile = (char *) xmalloc(strlen(fmhome)+sizeof(IDFILE_NAME)+2);
+ strcpy(run.idfile, fmhome);
strcat(run.idfile, "/");
strcat(run.idfile, IDFILE_NAME);
#ifndef ETRN_ENABLE
printf("-ETRN");
#endif /* ETRN_ENABLE */
+#ifndef ODMR_ENABLE
+ printf("-ODMR");
+#endif /* ODMR_ENABLE */
#ifdef SSL_ENABLE
printf("+SSL");
#endif
/* logging should be set up early in case we were restarted from exec */
if (run.use_syslog)
{
+#if defined(LOG_MAIL)
openlog(program_name, LOG_PID, LOG_MAIL);
+#else
+ /* Assume BSD4.2 openlog with two arguments */
+ openlog(program_name, LOG_PID);
+#endif
report_init(-1);
}
else
sizeof(PID_DIR) + sizeof(FETCHMAIL_PIDFILE));
sprintf(tmpbuf, "%s/%s", PID_DIR, FETCHMAIL_PIDFILE);
} else {
- xalloca(tmpbuf, char *, strlen(home) + sizeof(FETCHMAIL_PIDFILE) + 2);
- strcpy(tmpbuf, home);
- strcat(tmpbuf, "/.");
+ xalloca(tmpbuf, char *, strlen(fmhome) + sizeof(FETCHMAIL_PIDFILE) + 2);
+ strcpy(tmpbuf, fmhome);
+ strcat(tmpbuf, "/");
+ if (fmhome == home)
+ strcat(tmpbuf, ".");
strcat(tmpbuf, FETCHMAIL_PIDFILE);
}
#undef FETCHMAIL_PIDFILE
#define NETRC_FILE ".netrc"
/* parse the ~/.netrc file (if present) for future password lookups. */
- xalloca(netrc_file, char *, strlen (home) + sizeof(NETRC_FILE) + 1);
+ xalloca(netrc_file, char *, strlen(home) + sizeof(NETRC_FILE) + 2);
strcpy (netrc_file, home);
strcat (netrc_file, "/");
strcat (netrc_file, NETRC_FILE);
{
if (ctl->active && !(implicitmode && ctl->server.skip)&&!ctl->password)
{
- if (ctl->server.preauthenticate == A_KERBEROS_V4 ||
- ctl->server.preauthenticate == A_KERBEROS_V5 ||
-#ifdef GSSAPI
- ctl->server.protocol == P_IMAP_GSS ||
-#endif /* GSSAPI */
- ctl->server.protocol == P_IMAP_K4)
+ if (ctl->server.preauthenticate > A_PASSWORD)
/* Server won't care what the password is, but there
must be some non-null string here. */
ctl->password = ctl->remotename;
for (ctl = querylist; ctl; ctl = ctl->next)
{
if (ctl->active && !(implicitmode && ctl->server.skip)
- && ctl->server.protocol != P_ETRN
- && ctl->server.protocol != P_IMAP_K4
-#ifdef GSSAPI
- && ctl->server.protocol != P_IMAP_GSS
-#endif /* GSSAPI */
- && !ctl->password)
+ && ctl->server.preauthenticate <= A_PASSWORD
+ && !ctl->password)
{
- char* password_prompt = _("Enter password for %s@%s: ");
-
- xalloca(tmpbuf, char *, strlen(password_prompt) +
- strlen(ctl->remotename) +
- strlen(ctl->server.pollname) + 1);
- (void) sprintf(tmpbuf, password_prompt,
- ctl->remotename, ctl->server.pollname);
- ctl->password = xstrdup((char *)getpassword(tmpbuf));
+ if (!isatty(0))
+ {
+ fprintf(stderr,
+ _("fetchmail: can't find a password for %s@%s.\n"),
+ ctl->remotename, ctl->server.pollname);
+ return(PS_AUTHFAIL);
+ }
+ else
+ {
+ char* password_prompt = _("Enter password for %s@%s: ");
+
+ xalloca(tmpbuf, char *, strlen(password_prompt) +
+ strlen(ctl->remotename) +
+ strlen(ctl->server.pollname) + 1);
+ (void) sprintf(tmpbuf, password_prompt,
+ ctl->remotename, ctl->server.pollname);
+ ctl->password = xstrdup((char *)fm_getpassword(tmpbuf));
+ }
}
}
*/
if (run.poll_interval)
{
- if (!nodetach)
+ if (nodetach)
+ deal_with_sigchld();
+ else
daemonize(run.logfile, terminate_run);
report(stdout, _("starting fetchmail %s daemon \n"), VERSION);
signal(SIGQUIT, terminate_run);
/* here's the exclusion lock */
- if ((st = open(lockfile, O_WRONLY | O_CREAT | O_EXCL, 0666)) != -1) {
- sprintf(tmpbuf,"%d", getpid());
- write(st, tmpbuf, strlen(tmpbuf));
- if (run.poll_interval)
- {
- sprintf(tmpbuf," %d", run.poll_interval);
- write(st, tmpbuf, strlen(tmpbuf));
- }
- close(st); /* should be safe, previous write was atomic */
- lock_acquired = TRUE;
+#ifndef O_SYNC
+#define O_SYNC 0 /* use it if we have it */
+#endif
+ if (!lock_acquired)
+ {
+ if ((st = open(lockfile, O_WRONLY|O_CREAT|O_EXCL|O_SYNC, 0666)) != -1)
+ {
+ sprintf(tmpbuf,"%d", getpid());
+ write(st, tmpbuf, strlen(tmpbuf));
+ if (run.poll_interval)
+ {
+ sprintf(tmpbuf," %d", run.poll_interval);
+ write(st, tmpbuf, strlen(tmpbuf));
+ }
+ close(st); /* should be safe, fd was opened with O_SYNC */
+ lock_acquired = TRUE;
+ }
+ else
+ {
+ fprintf(stderr, _("fetchmail: lock creation failed.\n"));
+ return(PS_EXCLUDE);
+ }
}
/*
struct stat rcstat;
if (stat(rcfile, &rcstat) == -1)
- report(stderr, _("couldn't time-check %s\n"), rcfile);
+ {
+ if (errno != ENOENT)
+ report(stderr,
+ _("couldn't time-check %s (error %d)\n"),
+ rcfile, errno);
+ }
else if (rcstat.st_mtime > parsetime)
{
report(stdout, _("restarting fetchmail (%s changed)\n"), rcfile);
- execvp("fetchmail", argv);
+ /*
+ * Matthias Andree: Isn't this prone to introduction of
+ * "false" programs by interfering with PATH? Those
+ * path-searching execs might not be the best ideas for
+ * this reason.
+ *
+ * Rob Funk: But is there any way for someone to modify
+ * the PATH variable of a running fetchmail? I don't know
+ * of a way.
+ *
+ * Dave's change makes fetchmail restart itself in exactly
+ * the way it was started from the shell (or shell script)
+ * in the first place. If you're concerned about PATH
+ * contamination, call fetchmail initially with a full
+ * path, and use Dave's patch.
+ *
+ * Not using a -p variant of exec means that the restart
+ * will break if both (a) the user depended on PATH to
+ * call fetchmail in the first place, and (b) the system
+ * doesn't save the whole path in argv[0] if the whole
+ * path wasn't used in the initial call. (If I recall
+ * correctly, Linux saves it but many other Unices don't.)
+ */
+ execvp(argv[0], argv);
report(stderr, _("attempt to re-exec fetchmail failed\n"));
}
* reliability and shave off some per-UDP-packet costs.
* Unfortunately it interacted badly with diald, which effectively
* filters out DNS queries over TCP/IP for reasons having to do
- * with some obscure kernel problem involving bootstrapping of
+ * with some obscure Linux kernel problem involving bootstrapping of
* dynamically-addressed links. I don't understand this mess
* and don't want to, so it's "See ya!" to this hack.
*/
sethostent(TRUE); /* use TCP/IP for mailserver queries */
#endif /* HAVE_RES_SEARCH */
+ activecount = 0;
batchcount = 0;
for (ctl = querylist; ctl; ctl = ctl->next)
- {
- if (ctl->active && !(implicitmode && ctl->server.skip))
+ if (ctl->active)
{
- if (ctl->wedged)
- {
- report(stderr,
- _("poll of %s skipped (failed authentication or too many timeouts)\n"),
- ctl->server.pollname);
- continue;
- }
-
- /* check skip interval first so that it counts all polls */
- if (run.poll_interval && ctl->server.interval)
+ activecount++;
+ if (!(implicitmode && ctl->server.skip))
{
- if (ctl->server.poll_count++ % ctl->server.interval)
+ if (ctl->wedged)
{
- if (outlevel >= O_VERBOSE)
- report(stdout,
- _("interval not reached, not querying %s\n"),
- ctl->server.pollname);
+ report(stderr,
+ _("poll of %s skipped (failed authentication or too many timeouts)\n"),
+ ctl->server.pollname);
continue;
}
- }
+
+ /* check skip interval first so that it counts all polls */
+ if (run.poll_interval && ctl->server.interval)
+ {
+ if (ctl->server.poll_count++ % ctl->server.interval)
+ {
+ if (outlevel >= O_VERBOSE)
+ report(stdout,
+ _("interval not reached, not querying %s\n"),
+ ctl->server.pollname);
+ continue;
+ }
+ }
#if (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__)
- /* interface_approve() does its own error logging */
- if (!interface_approve(&ctl->server))
- continue;
+ /*
+ * Don't do monitoring if we were woken by a signal.
+ * Note that interface_approve() does its own error logging.
+ */
+ if (!interface_approve(&ctl->server, !lastsig))
+ continue;
#endif /* (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__) */
- querystatus = query_host(ctl);
+ querystatus = query_host(ctl);
#ifdef POP3_ENABLE
- if (!check_only)
- uid_end_query(ctl);
+ /* leave the UIDL state alone if there have been any errors */
+ if (!check_only &&
+ ((querystatus==PS_SUCCESS) || (querystatus==PS_NOMAIL) || (querystatus==PS_MAXFETCH)))
+ uid_swap_lists(ctl);
#endif /* POP3_ENABLE */
- if (querystatus == PS_SUCCESS)
- successes++;
- else if (!check_only &&
- ((querystatus!=PS_NOMAIL) || (outlevel==O_DEBUG)))
- report(stdout, _("Query status=%d\n"), querystatus);
+ if (querystatus == PS_SUCCESS)
+ successes++;
+ else if (!check_only &&
+ ((querystatus!=PS_NOMAIL) || (outlevel==O_DEBUG)))
+ switch(querystatus)
+ {
+ case PS_SUCCESS:
+ report(stdout,_("Query status=0 (SUCCESS)\n"));break;
+ case PS_NOMAIL:
+ report(stdout,_("Query status=1 (NOMAIL)\n")); break;
+ case PS_SOCKET:
+ report(stdout,_("Query status=2 (SOCKET)\n")); break;
+ case PS_AUTHFAIL:
+ report(stdout,_("Query status=3 (AUTHFAIL)\n"));break;
+ case PS_PROTOCOL:
+ report(stdout,_("Query status=4 (PROTOCOL)\n"));break;
+ case PS_SYNTAX:
+ report(stdout,_("Query status=5 (SYNTAX)\n")); break;
+ case PS_IOERR:
+ report(stdout,_("Query status=6 (IOERR)\n")); break;
+ case PS_ERROR:
+ report(stdout,_("Query status=7 (ERROR)\n")); break;
+ case PS_EXCLUDE:
+ report(stdout,_("Query status=8 (EXCLUDE)\n")); break;
+ case PS_LOCKBUSY:
+ report(stdout,_("Query status=9 (LOCKBUSY)\n"));break;
+ case PS_SMTP:
+ report(stdout,_("Query status=10 (SMTP)\n")); break;
+ case PS_DNS:
+ report(stdout,_("Query status=11 (DNS)\n")); break;
+ case PS_BSMTP:
+ report(stdout,_("Query status=12 (BSMTP)\n")); break;
+ case PS_MAXFETCH:
+ report(stdout,_("Query status=13 (MAXFETCH)\n"));break;
+ default:
+ report(stdout,_("Query status=%d\n"),querystatus);
+ break;
+ }
#if (defined(linux) && !INET6_ENABLE) || defined (__FreeBSD__)
- if (ctl->server.monitor)
- {
- /*
- * Allow some time for the link to quiesce. One
- * second is usually sufficient, three is safe.
- * Note: this delay is important - don't remove!
- */
- sleep(3);
- interface_note_activity(&ctl->server);
- }
+ if (ctl->server.monitor)
+ {
+ /*
+ * Allow some time for the link to quiesce. One
+ * second is usually sufficient, three is safe.
+ * Note: this delay is important - don't remove!
+ */
+ sleep(3);
+ interface_note_activity(&ctl->server);
+ }
#endif /* (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__) */
+ }
}
- }
#if defined(HAVE_RES_SEARCH) && defined(USE_TCPIP_FOR_DNS)
endhostent(); /* release TCP/IP connection to nameserver */
if (outlevel >= O_VERBOSE)
report(stdout,
- _("fetchmail: sleeping at %s\n"), rfc822timestamp());
+ _("fetchmail: sleeping at %s\n"), timestamp());
/*
- * With this simple hack, we make it possible for a foreground
- * fetchmail to wake up one in daemon mode. What we want is the
- * side effect of interrupting any sleep that may be going on,
- * forcing fetchmail to re-poll its hosts. The second line is
- * for people who think all system daemons wake up on SIGHUP.
+ * OK, now pause util it's time for the next poll cycle.
+ * A nonzero return indicates we received a wakeup signal;
+ * unwedge all servers in case the problem has been
+ * manually repaired.
*/
- signal(SIGUSR1, donothing);
- if (!getuid())
- signal(SIGHUP, donothing);
-
- /* time for a pause in the action... */
+ if ((lastsig = interruptible_idle(run.poll_interval)))
{
-#ifndef __EMX__
-#ifdef SLEEP_WITH_ALARM /* not normally on */
- /*
- * We can't use sleep(3) here because we need an alarm(3)
- * equivalent in order to implement server nonresponse timeout.
- * We'll just assume setitimer(2) is available since fetchmail
- * has to have a BSDoid socket layer to work at all.
- */
- /*
- * This code stopped working under glibc-2, apparently due
- * to the change in signal(2) semantics. (The siginterrupt
- * line, added later, should fix this problem.) John Stracke
- * <francis@netscape.com> wrote:
- *
- * The problem seems to be that, after hitting the interval
- * timer while talking to the server, the process no longer
- * responds to SIGALRM. I put in printf()s to see when it
- * reached the pause() for the poll interval, and I checked
- * the return from setitimer(), and everything seemed to be
- * working fine, except that the pause() just ignored SIGALRM.
- * I thought maybe the itimer wasn't being fired, so I hit
- * it with a SIGALRM from the command line, and it ignored
- * that, too. SIGUSR1 woke it up just fine, and it proceeded
- * to repoll--but, when the dummy server didn't respond, it
- * never timed out, and SIGALRM wouldn't make it.
- *
- * (continued below...)
- */
- struct itimerval ntimeout;
-
- ntimeout.it_interval.tv_sec = 5; /* repeat alarm every 5 secs */
- ntimeout.it_interval.tv_usec = 0;
- ntimeout.it_value.tv_sec = run.poll_interval;
- ntimeout.it_value.tv_usec = 0;
-
- siginterrupt(SIGALRM, 1);
- alarm_latch = FALSE;
- signal(SIGALRM, gotsigalrm); /* first trap signals */
- setitimer(ITIMER_REAL,&ntimeout,NULL); /* then start timer */
- /* there is a very small window between the next two lines */
- /* which could result in a deadlock. But this will now be */
- /* caught by periodical alarms (see it_interval) */
- if (!alarm_latch)
- pause();
- /* stop timer */
- ntimeout.it_interval.tv_sec = ntimeout.it_interval.tv_usec = 0;
- ntimeout.it_value.tv_sec = ntimeout.it_value.tv_usec = 0;
- setitimer(ITIMER_REAL,&ntimeout,NULL); /* now stop timer */
- signal(SIGALRM, SIG_IGN);
-#else
- /*
- * So the workaround I used is to make it sleep by using
- * select() instead of setitimer()/pause(). select() is
- * perfectly happy being called with a timeout and
- * no file descriptors; it just sleeps until it hits the
- * timeout. The only concern I had was that it might
- * implement its timeout with SIGALRM--there are some
- * Unices where this is done, because select() is a library
- * function--but apparently not.
- */
- struct timeval timeout;
-
- timeout.tv_sec = run.poll_interval;
- timeout.tv_usec = 0;
- do {
- lastsig = 0;
- select(0,0,0,0, &timeout);
- } while (lastsig == SIGCHLD);
-#endif
-#else /* EMX */
- alarm_latch = FALSE;
- signal(SIGALRM, gotsigalrm);
- _beginthread(itimerthread, NULL, 32768, NULL);
- /* see similar code above */
- if (!alarm_latch)
- pause();
- signal(SIGALRM, SIG_IGN);
-#endif /* ! EMX */
- if (lastsig == SIGUSR1
- || ((run.poll_interval && !getuid()) && lastsig == SIGHUP))
- {
#ifdef SYS_SIGLIST_DECLARED
- report(stdout,
- _("awakened by %s\n"), sys_siglist[lastsig]);
+ report(stdout,
+ _("awakened by %s\n"), sys_siglist[lastsig]);
#else
- report(stdout,
- _("awakened by signal %d\n"), lastsig);
+ report(stdout,
+ _("awakened by signal %d\n"), lastsig);
#endif
- /* received a wakeup - unwedge all servers in case */
- /* the problem has been manually repaired */
- for (ctl = querylist; ctl; ctl = ctl->next)
- ctl->wedged = FALSE;
- }
+ for (ctl = querylist; ctl; ctl = ctl->next)
+ ctl->wedged = FALSE;
}
- /* now lock out interrupts again */
- signal(SIGUSR1, SIG_IGN);
- if (!getuid())
- signal(SIGHUP, SIG_IGN);
-
if (outlevel >= O_VERBOSE)
- report(stdout, _("awakened at %s\n"), rfc822timestamp());
+ report(stdout, _("awakened at %s\n"), timestamp());
}
} while
(run.poll_interval);
successes ? PS_SUCCESS : querystatus);
terminate_run(0);
- exit(successes ? PS_SUCCESS : querystatus);
+
+ if (successes)
+ exit(PS_SUCCESS);
+ else if (querystatus)
+ exit(querystatus);
+ else
+ /* in case we interrupted before a successful fetch */
+ exit(PS_NOMAIL);
+
+ exit(successes ? : querystatus);
}
-static void optmerge(struct query *h2, struct query *h1, int force)
-/* merge two options records */
+static void list_merge(struct idlist **dstl, struct idlist **srcl, int force)
{
/*
- * If force is off, modify h2 fields only when they're empty (treat h1
- * as defaults). If force is on, modify each h2 field whenever h1
- * is nonempty (treat h1 as an override).
+ * If force is off, modify dstl fields only when they're empty (treat srcl
+ * as defaults). If force is on, modify each dstl field whenever scrcl
+ * is nonempty (treat srcl as an override).
*/
-#define LIST_MERGE(dstl, srcl) if (force ? !!srcl : !dstl) \
- free_str_list(&dstl), \
- append_str_list(&dstl, &srcl)
- LIST_MERGE(h2->server.localdomains, h1->server.localdomains);
- LIST_MERGE(h2->localnames, h1->localnames);
- LIST_MERGE(h2->mailboxes, h1->mailboxes);
- LIST_MERGE(h2->smtphunt, h1->smtphunt);
- LIST_MERGE(h2->antispam, h1->antispam);
-#undef LIST_MERGE
+ if (force ? !!*srcl : !*dstl)
+ {
+ struct idlist *cpl = copy_str_list(*srcl);
+
+ append_str_list(dstl, &cpl);
+ }
+}
+
+static void optmerge(struct query *h2, struct query *h1, int force)
+/* merge two options records */
+{
+ list_merge(&h2->server.localdomains, &h1->server.localdomains, force);
+ list_merge(&h2->localnames, &h1->localnames, force);
+ list_merge(&h2->mailboxes, &h1->mailboxes, force);
+ list_merge(&h2->smtphunt, &h1->smtphunt, force);
+ list_merge(&h2->antispam, &h1->antispam, force);
#define FLAG_MERGE(fld) if (force ? !!h1->fld : !h2->fld) h2->fld = h1->fld
FLAG_MERGE(server.via);
FLAG_MERGE(server.dns);
FLAG_MERGE(server.checkalias);
FLAG_MERGE(server.uidl);
+ FLAG_MERGE(server.principal);
#if defined(linux) || defined(__FreeBSD__)
FLAG_MERGE(server.interface);
FLAG_MERGE(bsmtp);
FLAG_MERGE(listener);
FLAG_MERGE(smtpaddress);
+ FLAG_MERGE(smtpname);
FLAG_MERGE(preconnect);
FLAG_MERGE(postconnect);
FLAG_MERGE(stripcr);
FLAG_MERGE(pass8bits);
FLAG_MERGE(dropstatus);
+ FLAG_MERGE(dropdelivered);
FLAG_MERGE(mimedecode);
+ FLAG_MERGE(idle);
FLAG_MERGE(limit);
FLAG_MERGE(warnings);
FLAG_MERGE(fetchlimit);
struct stat rcstat;
run.bouncemail = TRUE;
+ run.spambounce = FALSE; /* don't bounce back to innocent bystanders */
memset(&def_opts, '\0', sizeof(struct query));
def_opts.smtp_socket = -1;
def_opts.smtpaddress = (char *)0;
+ def_opts.smtpname = (char *)0;
#define ANTISPAM(n) save_str(&def_opts.antispam, STRING_DUMMY, 0)->val.status.num = (n)
ANTISPAM(571); /* sendmail */
ANTISPAM(550); /* old exim */
def_opts.listener = SMTP_MODE;
/* note the parse time, so we can pick up on modifications */
- if (stat(rcfile, &rcstat) == -1)
- report(stderr, _("couldn't time-check the run-control file\n"));
- else
+ parsetime = 0; /* foil compiler warnings */
+ if (stat(rcfile, &rcstat) != -1)
parsetime = rcstat.st_mtime;
+ else if (errno != ENOENT)
+ report(stderr, _("couldn't time-check the run-control file\n"));
/* this builds the host list */
if ((st = prc_parse_file(rcfile, !versioninfo)) != 0)
|| str_in_list(&ctl->server.akalist, argv[optind], TRUE))
{
/* Is this correct? */
- if(predeclared)
+ if (predeclared && outlevel == O_VERBOSE)
fprintf(stderr,_("Warning: multiple mentions of host %s in config file\n"),argv[optind]);
ctl->active = TRUE;
predeclared = TRUE;
/* use localhost if we never fetch the FQDN of this host */
fetchmailhost = "localhost";
+ /* here's where we override globals */
+ if (cmd_run.logfile)
+ run.logfile = cmd_run.logfile;
+ if (cmd_run.idfile)
+ run.idfile = cmd_run.idfile;
+ /* do this before the keep/fetchall test below, otherwise -d0 may fail */
+ if (cmd_run.poll_interval >= 0)
+ run.poll_interval = cmd_run.poll_interval;
+ if (cmd_run.invisible)
+ run.invisible = cmd_run.invisible;
+ if (cmd_run.showdots)
+ run.showdots = cmd_run.showdots;
+ if (cmd_run.use_syslog)
+ run.use_syslog = (cmd_run.use_syslog == FLAG_TRUE);
+ if (cmd_run.postmaster)
+ run.postmaster = cmd_run.postmaster;
+ if (cmd_run.bouncemail)
+ run.bouncemail = cmd_run.bouncemail;
+
+ /* check and daemon options are not compatible */
+ if (check_only && run.poll_interval)
+ run.poll_interval = 0;
+
/* merge in wired defaults, do sanity checks and prepare internal fields */
for (ctl = querylist; ctl; ctl = ctl->next)
{
ctl->wedged = FALSE;
- if (configdump || (ctl->active && !(implicitmode && ctl->server.skip)))
+ if (configdump || ctl->active )
{
/* merge in defaults */
optmerge(ctl, &def_opts, FALSE);
DEFAULT(ctl->forcecr, FALSE);
DEFAULT(ctl->pass8bits, FALSE);
DEFAULT(ctl->dropstatus, FALSE);
+ DEFAULT(ctl->dropdelivered, FALSE);
DEFAULT(ctl->mimedecode, FALSE);
+ DEFAULT(ctl->idle, FALSE);
DEFAULT(ctl->server.dns, TRUE);
DEFAULT(ctl->server.uidl, FALSE);
#ifdef SSL_ENABLE
* do this unconditionally, but it made fetchmail excessively
* vulnerable to misconfigured DNS setups.
*
- * If we're using ETRN, the smtp hunt list is the list of
- * systems we're polling on behalf of; these have to be
- * fully-qualified domain names. The default for this list
- * should be the FQDN of localhost.
+ * If we're using ETRN or ODMR, the smtp hunt list is the
+ * list of systems we're polling on behalf of; these have
+ * to be fully-qualified domain names. The default for
+ * this list should be the FQDN of localhost.
*
* If we're using Kerberos for authentication, we need
- * the FQDN in order to generate capability keys.
- */
- if (ctl->server.protocol == P_ETRN
- || ctl->server.preauthenticate == A_KERBEROS_V4
- || ctl->server.preauthenticate == A_KERBEROS_V5)
+ * the FQDN in order to generate capability keys. */
+ if (ctl->server.protocol==P_ETRN || ctl->server.protocol==P_ODMR
+ || ctl->server.preauthenticate == A_KERBEROS_V4
+ || ctl->server.preauthenticate == A_KERBEROS_V5)
if (strcmp(fetchmailhost, "localhost") == 0)
fetchmailhost = host_fqdn();
/* prevent core dump from ill-formed or duplicate entry */
if (!leadname)
{
- report(stderr,
- _("Lead server has no name.\n"));
+ report(stderr, _("Lead server has no name.\n"));
exit(PS_SYNTAX);
}
ctl->server.truename = xstrdup(leadname);
}
#ifdef HAVE_GETHOSTBYNAME
- else if (ctl->server.preauthenticate==A_KERBEROS_V4 ||
- ctl->server.preauthenticate==A_KERBEROS_V5 ||
- (ctl->server.dns && MULTIDROP(ctl)))
+ else if (!configdump)
{
- struct hostent *namerec;
-
- /* compute the canonical name of the host */
- errno = 0;
- namerec = gethostbyname(ctl->server.queryname);
- if (namerec == (struct hostent *)NULL)
+ if (ctl->server.preauthenticate==A_KERBEROS_V4 ||
+ ctl->server.preauthenticate==A_KERBEROS_V5 ||
+ (ctl->server.dns && MULTIDROP(ctl)))
{
- report(stderr,
- _("couldn't find canonical DNS name of %s\n"),
- ctl->server.pollname);
- exit(PS_DNS);
+ struct hostent *namerec;
+
+ /* compute the canonical name of the host */
+ errno = 0;
+ namerec = gethostbyname(ctl->server.queryname);
+ if (namerec == (struct hostent *)NULL)
+ {
+ report(stderr,
+ _("couldn't find canonical DNS name of %s\n"),
+ ctl->server.pollname);
+ ctl->server.truename = xstrdup(ctl->server.queryname);
+ ctl->server.trueaddr = NULL;
+ }
+ else
+ ctl->server.truename=xstrdup((char *)namerec->h_name);
}
- else
- ctl->server.truename=xstrdup((char *)namerec->h_name);
- }
#endif /* HAVE_GETHOSTBYNAME */
- else
- ctl->server.truename = xstrdup(ctl->server.queryname);
+ else {
+#ifdef HAVE_GETHOSTBYNAME
+ struct hostent *namerec;
+
+ /* <fetchmail@mail.julianhaight.com>
+ Get the host's IP, so we can report it like this:
+
+ Received: from hostname [10.0.0.1]
+
+ do we actually need to gethostbyname to find the IP?
+ it seems like it would be faster to do this later, when
+ we are actually resolving the hostname for a connection,
+ but I ain't that smart, so I don't know where to make
+ the change later..
+ */
+ errno = 0;
+ namerec = gethostbyname(ctl->server.queryname);
+ if (namerec == (struct hostent *)NULL)
+ {
+ report(stderr,
+ _("couldn't find canonical DNS name of %s\n"),
+ ctl->server.pollname);
+ exit(PS_DNS);
+ }
+ else {
+ ctl->server.truename=xstrdup((char *)namerec->h_name);
+ ctl->server.trueaddr=xmalloc(namerec->h_length);
+ memcpy(ctl->server.trueaddr,
+ namerec->h_addr_list[0],
+ namerec->h_length);
+ }
+#else
+ ctl->server.truename = xstrdup(ctl->server.queryname);
+#endif /* HAVE_GETHOSTBYNAME */
+ }
+ }
/* if no folders were specified, set up the null one as default */
if (!ctl->mailboxes)
}
}
- /* here's where we override globals */
- if (cmd_run.logfile)
- run.logfile = cmd_run.logfile;
- if (cmd_run.idfile)
- run.idfile = cmd_run.idfile;
- if (cmd_run.poll_interval >= 0)
- run.poll_interval = cmd_run.poll_interval;
- if (cmd_run.invisible)
- run.invisible = cmd_run.invisible;
- if (cmd_run.use_syslog)
- run.use_syslog = (cmd_run.use_syslog == FLAG_TRUE);
- if (cmd_run.postmaster)
- run.postmaster = cmd_run.postmaster;
- if (cmd_run.bouncemail)
- run.bouncemail = cmd_run.bouncemail;
-
- /* check and daemon options are not compatible */
- if (check_only && run.poll_interval)
- run.poll_interval = 0;
-
#ifdef POP3_ENABLE
/* initialize UID handling */
if (!versioninfo && (st = prc_filecheck(run.idfile, !versioninfo)) != 0)
}
static void terminate_poll(int sig)
-/* to be executed at the nd of a poll cycle */
+/* to be executed at the end of a poll cycle */
{
/*
* Close all SMTP delivery sockets. For optimum performance
unlockit();
#endif
- exit(successes ? PS_SUCCESS : querystatus);
+ if (activecount == 0)
+ exit(PS_NOMAIL);
+ else
+ exit(successes ? PS_SUCCESS : querystatus);
}
/*
VERSION,
ctl->server.pollname,
showproto(ctl->server.protocol),
- rfc822timestamp());
+ timestamp());
}
switch (ctl->server.protocol) {
case P_AUTO:
#endif /* POP3_ENABLE */
break;
case P_IMAP:
- case P_IMAP_K4:
- case P_IMAP_CRAM_MD5:
- case P_IMAP_LOGIN:
#ifdef GSSAPI
case P_IMAP_GSS:
#endif /* GSSAPI */
return(PS_PROTOCOL);
#endif /* HAVE_GETHOSTBYNAME */
#endif /* ETRN_ENABLE */
+ case P_ODMR:
+#ifndef ODMR_ENABLE
+ report(stderr, _("ODMR support is not configured.\n"));
+ return(PS_PROTOCOL);
+#else
+#ifdef HAVE_GETHOSTBYNAME
+ return(doODMR(ctl));
+#else
+ report(stderr, _("Cannot support ODMR without gethostbyname(2).\n"));
+ return(PS_PROTOCOL);
+#endif /* HAVE_GETHOSTBYNAME */
+#endif /* ODMR_ENABLE */
default:
report(stderr, _("unsupported protocol selected.\n"));
return(PS_PROTOCOL);
#endif
if (runp->invisible)
printf(_("Fetchmail will masquerade and will not generate Received\n"));
+ if (runp->showdots)
+ printf(_("Fetchmail will show progress dots even in logfiles.\n"));
if (runp->postmaster)
printf(_("Fetchmail will forward misaddressed multidrop messages to %s.\n"),
runp->postmaster);
printf(_("Options for retrieving from %s@%s:\n"),
ctl->remotename, visbuf(ctl->server.pollname));
- if (ctl->server.via && (ctl->server.protocol != P_ETRN))
+ if (ctl->server.via && (ctl->server.protocol < P_ETRN))
printf(_(" Mail will be retrieved via %s\n"), ctl->server.via);
if (ctl->server.interval)
if (ctl->server.skip || outlevel >= O_VERBOSE)
printf(_(" This host %s be queried when no host is specified.\n"),
ctl->server.skip ? _("will not") : _("will"));
- /*
- * Don't poll for password when there is one or when using the ETRN
- * or IMAP-GSS protocol
- */
- /* ETRN, IMAP_GSS, and IMAP_K4 do not need a password, so skip this */
- if ( (ctl->server.protocol != P_ETRN)
-#ifdef GSSAPI
- && (ctl->server.protocol != P_IMAP_GSS)
-#endif /* GSSAPI */
- && (ctl->server.protocol != P_IMAP_K4) ) {
- if (!ctl->password)
- printf(_(" Password will be prompted for.\n"));
- else if (outlevel >= O_VERBOSE)
- {
- if (ctl->server.protocol == P_APOP)
- printf(_(" APOP secret = \"%s\".\n"),
- visbuf(ctl->password));
- else if (ctl->server.protocol == P_RPOP)
- printf(_(" RPOP id = \"%s\".\n"),
- visbuf(ctl->password));
- else
- printf(_(" Password = \"%s\".\n"),
+ if (ctl->server.preauthenticate <= A_PASSWORD)
+ {
+ if (!ctl->password)
+ printf(_(" Password will be prompted for.\n"));
+ else if (outlevel >= O_VERBOSE)
+ {
+ if (ctl->server.protocol == P_APOP)
+ printf(_(" APOP secret = \"%s\".\n"),
+ visbuf(ctl->password));
+ else if (ctl->server.protocol == P_RPOP)
+ printf(_(" RPOP id = \"%s\".\n"),
+ visbuf(ctl->password));
+ else
+ printf(_(" Password = \"%s\".\n"),
visbuf(ctl->password));
- }
+ }
}
if (ctl->server.protocol == P_POP3
#if INET6_ENABLE
- && !strcmp(ctl->server.service, KPOP_PORT)
+ && ctl->server.service && !strcmp(ctl->server.service, KPOP_PORT)
#else /* INET6_ENABLE */
&& ctl->server.port == KPOP_PORT
#endif /* INET6_ENABLE */
#endif /* INET6_ENABLE */
else if (outlevel >= O_VERBOSE)
printf(_(" (using default port)"));
- if (ctl->server.uidl && (ctl->server.protocol != P_ETRN))
+ if (ctl->server.uidl && (ctl->server.protocol < P_ETRN))
printf(_(" (forcing UIDL use)"));
putchar('.');
putchar('\n');
- if (ctl->server.preauthenticate == A_KERBEROS_V4)
- printf(_(" Kerberos V4 preauthentication enabled.\n"));
- if (ctl->server.preauthenticate == A_KERBEROS_V5)
- printf(_(" Kerberos V5 preauthentication enabled.\n"));
+ switch (ctl->server.preauthenticate)
+ {
+ case A_ANY:
+ printf(_(" All authentication methods will be described.\n"));
+ break;
+ case A_PASSWORD:
+ printf(_(" Password authentication will be forced.\n"));
+ break;
+ case A_GSSAPI:
+ printf(_(" GSSAPI preauthentication will be forced.\n"));
+ break;
+ case A_KERBEROS_V4:
+ printf(_(" Kerberos V4 preauthentication will be forced.\n"));
+ break;
+ case A_KERBEROS_V5:
+ printf(_(" Kerberos V5 preauthentication will be forced.\n"));
+ break;
+ case A_SSH:
+ printf(_(" End-to-end encryption assumed.\n"));
+ break;
+ }
+ if (ctl->server.principal != (char *) NULL)
+ printf(_(" Mail service principal is: %s\n"), ctl->server.principal);
#ifdef SSL_ENABLE
if (ctl->use_ssl)
printf(" SSL encrypted sessions enabled.\n");
else
printf(".\n");
- if (ctl->server.protocol != P_ETRN) {
+ if (ctl->server.protocol < P_ETRN) {
if (!ctl->mailboxes->id)
printf(_(" Default mailbox selected.\n"));
else
printf(_(" MIME decoding is %s (mimedecode %s).\n"),
ctl->mimedecode ? _("enabled") : _("disabled"),
ctl->mimedecode ? "on" : "off");
+ printf(_(" Idle after poll is %s (idle %s).\n"),
+ ctl->idle ? _("enabled") : _("disabled"),
+ ctl->idle ? "on" : "off");
printf(_(" Nonempty Status lines will be %s (dropstatus %s)\n"),
ctl->dropstatus ? _("discarded") : _("kept"),
ctl->dropstatus ? "on" : "off");
+ printf(_(" Delivered-To lines will be %s (dropdelivered %s)\n"),
+ ctl->dropdelivered ? _("discarded") : _("kept"),
+ ctl->dropdelivered ? "on" : "off");
if (NUM_NONZERO(ctl->limit))
{
if (NUM_NONZERO(ctl->limit))
printf(_(" SMTP message batch limit is %d.\n"), ctl->batchlimit);
else if (outlevel >= O_VERBOSE)
printf(_(" No SMTP message batch limit (--batchlimit 0).\n"));
- if (ctl->server.protocol == P_IMAP)
+ if (ctl->server.protocol < P_ETRN)
{
if (NUM_NONZERO(ctl->expunge))
printf(_(" Deletion interval between expunges forced to %d (--expunge %d).\n"), ctl->expunge, ctl->expunge);
}
if (ctl->bsmtp)
printf(_(" Messages will be appended to %s as BSMTP\n"), visbuf(ctl->bsmtp));
- else if (ctl->mda && (ctl->server.protocol != P_ETRN))
+ else if (ctl->mda && (ctl->server.protocol < P_ETRN))
printf(_(" Messages will be delivered with \"%s\".\n"), visbuf(ctl->mda));
else
{
if (ctl->smtpaddress)
printf(_(" Host part of MAIL FROM line will be %s\n"),
ctl->smtpaddress);
+ if (ctl->smtpname)
+ printf(_(" Address to be put in RCPT TO lines shipped to SMTP will be %s\n"),
+ ctl->smtpname);
}
- if (ctl->server.protocol != P_ETRN)
+ if (ctl->server.protocol < P_ETRN)
{
if (ctl->antispam != (struct idlist *)NULL)
{
visbuf(ctl->postconnect));
else if (outlevel >= O_VERBOSE)
printf(_(" No post-connection command.\n"));
- if (ctl->server.protocol != P_ETRN) {
+ if (ctl->server.protocol < P_ETRN) {
if (!ctl->localnames)
printf(_(" No localnames declared for this host.\n"));
else
#endif
if (ctl->server.plugin)
- printf(_(" Server connections will be mode via plugin %s (--plugin %s).\n"), ctl->server.plugin, ctl->server.plugin);
+ printf(_(" Server connections will be made via plugin %s (--plugin %s).\n"), ctl->server.plugin, ctl->server.plugin);
else if (outlevel >= O_VERBOSE)
printf(_(" No plugin command specified.\n"));
if (ctl->server.plugout)
- printf(_(" Listener connections will be mode via plugout %s (--plugout %s).\n"), ctl->server.plugout, ctl->server.plugout);
+ printf(_(" Listener connections will be made via plugout %s (--plugout %s).\n"), ctl->server.plugout, ctl->server.plugout);
else if (outlevel >= O_VERBOSE)
printf(_(" No plugout command specified.\n"));
- if (ctl->server.protocol > P_POP2 && (ctl->server.protocol != P_ETRN))
+ if (ctl->server.protocol > P_POP2 && (ctl->server.protocol < P_ETRN))
{
if (!ctl->oldsaved)
printf(_(" No UIDs saved from this host.\n"));