#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 "tunable.h"
#include "smtp.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 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__
/* drop SGID kmem privileage until we need it */
static void dropprivs(void)
netrc_entry *netrc_list;
char *netrc_file, *tmpbuf;
pid_t pid;
+ int lastsig = 0;
#ifdef __FreeBSD__
dropprivs();
}
#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);
/* 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);
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
+ && ctl->server.protocol != P_ETRN
+ && ctl->server.protocol != P_IMAP_K4
#ifdef GSSAPI
- && ctl->server.protocol != P_IMAP_GSS
+ && ctl->server.protocol != P_IMAP_GSS
#endif /* GSSAPI */
- && !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));
- }
+ && !ctl->password)
+ 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 (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__)
- /* interface_approve() does its own error logging */
- if (!interface_approve(&ctl->server))
+ /*
+ * 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__) */
switch(querystatus)
{
case PS_SUCCESS:
- report(stdout, "Query status=SUCCESS\n"); break ;
+ report(stdout, "Query status=0 (SUCCESS)\n"); break ;
case PS_NOMAIL:
- report(stdout, "Query status=NOMAIL\n"); break ;
+ report(stdout, "Query status=1 (NOMAIL)\n"); break ;
case PS_SOCKET:
- report(stdout, "Query status=SOCKET\n"); break ;
+ report(stdout, "Query status=2 (SOCKET)\n"); break ;
case PS_AUTHFAIL:
- report(stdout, "Query status=AUTHFAIL\n"); break ;
+ report(stdout, "Query status=3 (AUTHFAIL)\n"); break ;
case PS_PROTOCOL:
- report(stdout, "Query status=PROTOCOL\n"); break ;
+ report(stdout, "Query status=4 (PROTOCOL)\n"); break ;
case PS_SYNTAX:
- report(stdout, "Query status=SYNTAX\n"); break ;
+ report(stdout, "Query status=5 (SYNTAX)\n"); break ;
case PS_IOERR:
- report(stdout, "Query status=IOERR\n"); break ;
+ report(stdout, "Query status=6 (IOERR)\n"); break ;
case PS_ERROR:
- report(stdout, "Query status=ERROR\n"); break ;
+ report(stdout, "Query status=7 (ERROR)\n"); break ;
case PS_EXCLUDE:
- report(stdout, "Query status=EXCLUDE\n"); break ;
+ report(stdout, "Query status=8 (EXCLUDE)\n"); break ;
case PS_LOCKBUSY:
- report(stdout, "Query status=LOCKBUSY\n"); break ;
+ report(stdout, "Query status=9 (LOCKBUSY)\n"); break ;
case PS_SMTP:
- report(stdout, "Query status=SMTP\n"); break ;
+ report(stdout, "Query status=10 (SMTP)\n"); break ;
case PS_DNS:
- report(stdout, "Query status=DNS\n"); break ;
+ report(stdout, "Query status=11 (DNS)\n"); break ;
case PS_BSMTP:
- report(stdout, "Query status=BSMTP\n"); break ;
+ report(stdout, "Query status=12 (BSMTP)\n"); break ;
case PS_MAXFETCH:
- report(stdout, "Query status=MAXFETCH\n"); break ;
- case PS_UNDEFINED:
- report(stdout, "Query status=UNDEFINED\n"); break ;
- case PS_TRANSIENT:
- report(stdout, "Query status=TRANSIENT\n"); break ;
- case PS_REFUSED:
- report(stdout, "Query status=REFUSED\n"); break ;
- case PS_RETAINED:
- report(stdout, "Query status=RETAINED\n"); break ;
- case PS_TRUNCATED:
- report(stdout, "Query status=TRUNCATED\n"); break ;
+ report(stdout, "Query status=13 (MAXFETCH)\n"); break ;
default:
report(stdout, _("Query status=%d\n"), querystatus); break;
}
_("fetchmail: sleeping at %s\n"), rfc822timestamp());
/*
- * 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());
}
exit(successes ? PS_SUCCESS : 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(bsmtp);
FLAG_MERGE(listener);
FLAG_MERGE(smtpaddress);
+ FLAG_MERGE(smtpname);
FLAG_MERGE(preconnect);
FLAG_MERGE(postconnect);
FLAG_MERGE(pass8bits);
FLAG_MERGE(dropstatus);
FLAG_MERGE(mimedecode);
+ FLAG_MERGE(idle);
FLAG_MERGE(limit);
FLAG_MERGE(warnings);
FLAG_MERGE(fetchlimit);
DEFAULT(ctl->pass8bits, FALSE);
DEFAULT(ctl->dropstatus, FALSE);
DEFAULT(ctl->mimedecode, FALSE);
+ DEFAULT(ctl->idle, FALSE);
DEFAULT(ctl->server.dns, TRUE);
DEFAULT(ctl->server.uidl, FALSE);
#ifdef SSL_ENABLE
ctl->server.truename = xstrdup(leadname);
}
#ifdef HAVE_GETHOSTBYNAME
- else if (ctl->server.preauthenticate==A_KERBEROS_V4 ||
+ else if (!configdump && (ctl->server.preauthenticate==A_KERBEROS_V4 ||
ctl->server.preauthenticate==A_KERBEROS_V5 ||
- (ctl->server.dns && MULTIDROP(ctl)))
+ (ctl->server.dns && MULTIDROP(ctl))))
{
struct hostent *namerec;
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);
+ }
+#endif /* HAVE_GETHOSTBYNAME */
+ ctl->server.truename = xstrdup(ctl->server.queryname);
+ }
/* if no folders were specified, set up the null one as default */
if (!ctl->mailboxes)
}
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
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");
#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"));
projects / ~andy / fetchmail / blobdiff