#include <errno.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 */
flag configdump; /* dump control blocks for configurator */
char *fetchmailhost; /* either `localhost' or the host's FQDN */
-#if NET_SECURITY
+#ifdef NET_SECURITY
void *request = NULL;
int requestlen = 0;
#endif /* NET_SECURITY */
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);
+static RETSIGTYPE terminate_run(int);
+static RETSIGTYPE terminate_poll(int);
#if defined(__FreeBSD__) && defined(__FreeBSD_USE_KVM)
/* drop SGID kmem privileage until we need it */
#endif
#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS) && defined(HAVE_STRFTIME)
-#include <time.h>
#include <locale.h>
static char *timestamp (void)
{
static RETSIGTYPE donothing(int sig)
{
extern volatile int lastsig; /* declared in idle.c */
- signal(sig, donothing); lastsig = sig;
+ set_signal_handler(sig, donothing);
+ lastsig = sig;
}
int main(int argc, char **argv)
#ifdef SSL_ENABLE
printf("+SSL");
#endif
-#if OPIE_ENABLE
+#ifdef OPIE_ENABLE
printf("+OPIE");
#endif /* OPIE_ENABLE */
-#if INET6_ENABLE
+#ifdef INET6_ENABLE
printf("+INET6");
#endif /* INET6_ENABLE */
-#if NET_SECURITY
+#ifdef HAVE_PKG_hesiod
+ printf("+HESIOD");
+#endif
+#ifdef NET_SECURITY
printf("+NETSEC");
#endif /* NET_SECURITY */
#ifdef HAVE_SOCKS
printf("+SOCKS");
#endif /* HAVE_SOCKS */
-#if ENABLE_NLS
+#ifdef ENABLE_NLS
printf("+NLS");
#endif /* ENABLE_NLS */
putchar('\n');
if (argc == 2)
exit(PS_EXCLUDE);
}
+ else if (getpid() == pid)
+ {
+ /* this test enables re-execing on a changed rcfile */
+ if (argc == 2)
+ {
+ fprintf(stderr,GT_("fetchmail: no other fetchmail is running\n"));
+ exit(PS_EXCLUDE);
+ }
+ }
else if (kill(pid, SIGTERM) < 0)
{
fprintf(stderr,GT_("fetchmail: error killing %s fetchmail at %d; bailing out.\n"),
* We'll set up a handler for these when we're sleeping,
* but ignore them otherwise so as not to interrupt a poll.
*/
- signal(SIGUSR1, SIG_IGN);
+ set_signal_handler(SIGUSR1, SIG_IGN);
if (run.poll_interval && getuid() == ROOT_UID)
- signal(SIGHUP, SIG_IGN);
+ set_signal_handler(SIGHUP, SIG_IGN);
}
else
{
- if (run.logfile && access(run.logfile, F_OK) == 0)
+ if (run.logfile && !nodetach && access(run.logfile, F_OK) == 0)
{
if (!freopen(run.logfile, "a", stdout))
report(stderr, GT_("could not open %s to append logs to \n"), run.logfile);
/* beyond here we don't want more than one fetchmail running per user */
umask(0077);
- signal(SIGABRT, terminate_run);
- signal(SIGINT, terminate_run);
- signal(SIGTERM, terminate_run);
- signal(SIGALRM, terminate_run);
- signal(SIGPIPE, terminate_run);
- signal(SIGQUIT, terminate_run);
+ set_signal_handler(SIGABRT, terminate_run);
+ set_signal_handler(SIGINT, terminate_run);
+ set_signal_handler(SIGTERM, terminate_run);
+ set_signal_handler(SIGALRM, terminate_run);
+ set_signal_handler(SIGPIPE, terminate_run);
+ set_signal_handler(SIGQUIT, terminate_run);
/* here's the exclusion lock */
lock_or_die();
}
}
-#if (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__)
+#if (defined(linux) && !defined(INET6_ENABLE)) || defined(__FreeBSD__)
/*
* Don't do monitoring if we were woken by a signal.
* Note that interface_approve() does its own error logging.
continue;
#endif /* (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__) */
+ dofastuidl = 0; /* this is reset in the driver if required */
+
querystatus = query_host(ctl);
+ if (NUM_NONZERO(ctl->fastuidl))
+ ctl->fastuidlcount = (ctl->fastuidlcount + 1) % ctl->fastuidl;
#ifdef POP3_ENABLE
/* 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);
+ else
+ uid_discard_new_list(ctl);
+ uid_reset_num(ctl);
#endif /* POP3_ENABLE */
if (querystatus == PS_SUCCESS)
break;
}
-#if (defined(linux) && !INET6_ENABLE) || defined (__FreeBSD__)
+#if (defined(linux) && !defined(INET6_ENABLE)) || defined (__FreeBSD__)
if (ctl->server.monitor)
{
/*
* forcing fetchmail to re-poll its hosts. The second line is
* for people who think all system daemons wake up on SIGHUP.
*/
- signal(SIGUSR1, donothing);
+ set_signal_handler(SIGUSR1, donothing);
if (getuid() != ROOT_UID)
- signal(SIGHUP, donothing);
+ set_signal_handler(SIGHUP, donothing);
/*
* OK, now pause until it's time for the next poll cycle.
ctl->wedged = FALSE;
}
- if (outlevel >= O_VERBOSE)
+ if (outlevel > O_SILENT)
report(stdout, GT_("awakened at %s\n"), timestamp());
}
} while
#define FLAG_MERGE(fld) if (force ? !!h1->fld : !h2->fld) h2->fld = h1->fld
FLAG_MERGE(server.via);
FLAG_MERGE(server.protocol);
-#if INET6_ENABLE
+#ifdef INET6_ENABLE
FLAG_MERGE(server.service);
FLAG_MERGE(server.netsec);
#else /* INET6_ENABLE */
FLAG_MERGE(limit);
FLAG_MERGE(warnings);
FLAG_MERGE(fetchlimit);
+ FLAG_MERGE(fetchsizelimit);
+ FLAG_MERGE(fastuidl);
FLAG_MERGE(batchlimit);
#ifdef SSL_ENABLE
FLAG_MERGE(use_ssl);
def_opts.warnings = WARNING_INTERVAL;
def_opts.remotename = user;
def_opts.listener = SMTP_MODE;
+ def_opts.fetchsizelimit = 100;
+ def_opts.fastuidl = 10;
/* get the location of rcfile */
rcfiledir[0] = 0;
exit(PS_SYNTAX);
}
#endif /* SSL_ENABLE */
+ /* one global gets treated specially */
+ DEFAULT(run.showdots, run.poll_interval==0 || nodetach);
#undef DEFAULT
/*
if (ctl->server.timeout == -1)
ctl->server.timeout = CLIENT_TIMEOUT;
-#if !INET6_ENABLE
+#ifndef INET6_ENABLE
/* sanity checks */
if (ctl->server.port < 0)
{
return(implicitmode);
}
-static void terminate_poll(int sig)
+static RETSIGTYPE terminate_poll(int sig)
/* to be executed at the end of a poll cycle */
{
/*
#endif /* POP3_ENABLE */
}
-static void terminate_run(int sig)
+static RETSIGTYPE terminate_run(int sig)
/* to be executed on normal or signal-induced termination */
{
struct query *ctl;
break;
case P_IMAP:
#ifdef IMAP_ENABLE
- st = doIMAP(ctl);
+ do {
+ st = doIMAP(ctl);
+ } while (st == PS_REPOLL);
#else
report(stderr, GT_("IMAP support is not configured.\n"));
st = PS_PROTOCOL;
}
if (ctl->server.protocol == P_POP3
-#if INET6_ENABLE
+#ifdef INET6_ENABLE
&& ctl->server.service && !strcmp(ctl->server.service, KPOP_PORT)
#else /* INET6_ENABLE */
&& ctl->server.port == KPOP_PORT
ctl->server.authenticate == A_KERBEROS_V5 ? "V" : "IV");
else
printf(GT_(" Protocol is %s"), showproto(ctl->server.protocol));
-#if INET6_ENABLE
+#ifdef INET6_ENABLE
if (ctl->server.service)
printf(GT_(" (using service %s)"), ctl->server.service);
if (ctl->server.netsec)
#ifdef SSL_ENABLE
if (ctl->use_ssl)
printf(GT_(" SSL encrypted sessions enabled.\n"));
+ if (ctl->sslproto)
+ printf(GT_(" SSL protocol: %s.\n"), ctl->sslproto);
if (ctl->sslcertck) {
printf(GT_(" SSL server certificate checking enabled.\n"));
if (ctl->sslcertpath != NULL)
printf(GT_(" Selected mailboxes are:"));
for (idp = ctl->mailboxes; idp; idp = idp->next)
- printf(" %s", idp->id);
+ printf(" %s", (char *)idp->id);
printf("\n");
}
printf(GT_(" %s messages will be retrieved (--all %s).\n"),
ctl->fetchlimit, ctl->fetchlimit);
else if (outlevel >= O_VERBOSE)
printf(GT_(" No received-message limit (--fetchlimit 0).\n"));
+ if (NUM_NONZERO(ctl->fetchsizelimit))
+ printf(GT_(" Fetch message size limit is %d (--fetchsizelimit %d).\n"),
+ ctl->fetchsizelimit, ctl->fetchsizelimit);
+ else if (outlevel >= O_VERBOSE)
+ printf(GT_(" No fetch message size limit (--fetchsizelimit 0).\n"));
+ if (NUM_NONZERO(ctl->fastuidl) && MAILBOX_PROTOCOL(ctl))
+ {
+ if (ctl->fastuidl == 1)
+ printf(GT_(" Do binary search of UIDs during each poll (--fastuidl 1).\n"));
+ else
+ printf(GT_(" Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"), ctl->fastuidl - 1, ctl->fastuidl, ctl->fastuidl);
+ }
+ else if (outlevel >= O_VERBOSE)
+ printf(GT_(" Do linear search of UIDs during each poll (--fastuidl 0).\n"));
if (NUM_NONZERO(ctl->batchlimit))
printf(GT_(" SMTP message batch limit is %d.\n"), ctl->batchlimit);
else if (outlevel >= O_VERBOSE)
printf(GT_(" Domains for which mail will be fetched are:"));
for (idp = ctl->domainlist; idp; idp = idp->next)
{
- printf(" %s", idp->id);
+ printf(" %s", (char *)idp->id);
if (!idp->val.status.mark)
printf(GT_(" (default)"));
}
ctl->listener);
for (idp = ctl->smtphunt; idp; idp = idp->next)
{
- printf(" %s", idp->id);
+ printf(" %s", (char *)idp->id);
if (!idp->val.status.mark)
printf(GT_(" (default)"));
}
{
for (idp = ctl->localnames; idp; idp = idp->next)
if (idp->val.id2)
- printf("\t%s -> %s\n", idp->id, idp->val.id2);
+ printf("\t%s -> %s\n", (char *)idp->id, (char *)idp->val.id2);
else
- printf("\t%s\n", idp->id);
+ printf("\t%s\n", (char *)idp->id);
if (ctl->wildcard)
fputs("\t*\n", stdout);
}
printf(GT_(" Predeclared mailserver aliases:"));
for (idp = ctl->server.akalist; idp; idp = idp->next)
- printf(" %s", idp->id);
+ printf(" %s", (char *)idp->id);
putchar('\n');
}
if (ctl->server.localdomains)
printf(GT_(" Local domains:"));
for (idp = ctl->server.localdomains; idp; idp = idp->next)
- printf(" %s", idp->id);
+ printf(" %s", (char *)idp->id);
putchar('\n');
}
}
printf(GT_(" %d UIDs saved.\n"), count);
if (outlevel >= O_VERBOSE)
for (idp = ctl->oldsaved; idp; idp = idp->next)
- printf("\t%s\n", idp->id);
+ printf("\t%s\n", (char *)idp->id);
}
}