#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 */
-#include <sys/utsname.h>
-#include "getopt.h"
+#ifdef HAVE_SOCKS
+#include <socks.h> /* SOCKSinit() */
+#endif /* HAVE_SOCKS */
+
+#ifdef HAVE_LANGINFO_H
+#include <langinfo.h>
+#endif
+
#include "fetchmail.h"
#include "socket.h"
#include "tunable.h"
flag configdump; /* dump control blocks for configurator */
char *fetchmailhost; /* either `localhost' or the host's FQDN */
-#if NET_SECURITY
-void *request = NULL;
-int requestlen = 0;
-#endif /* NET_SECURITY */
-
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);
+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>
+/** returns timestamp in current locale,
+ * and resets LC_TIME locale to POSIX. */
static char *timestamp (void)
{
time_t now;
- static char buf[60];
+ static char buf[60]; /* RATS: ignore */
time (&now);
setlocale (LC_TIME, "");
#define timestamp rfc822timestamp
#endif
+static RETSIGTYPE donothing(int sig)
+{
+ set_signal_handler(sig, donothing);
+ lastsig = sig;
+}
+
+const char *iana_charset;
+
int main(int argc, char **argv)
{
int bkgd = FALSE;
- int parsestatus, implicitmode = FALSE;
+ int implicitmode = FALSE;
struct query *ctl;
netrc_entry *netrc_list;
char *netrc_file, *tmpbuf;
setlocale (LC_ALL, "");
bindtextdomain(PACKAGE, LOCALEDIR);
textdomain(PACKAGE);
+ iana_charset = norm_charmap(nl_langinfo(CODESET)); /* normalize local
+ charset to
+ IANA charset. */
+#else
+ iana_charset = "US-ASCII";
#endif
+ if (getuid() == 0) {
+ report(stderr, GT_("WARNING: Running as root is discouraged.\n"));
+ }
+
/*
* Note: because we can't initialize reporting before we know whether
* syslog is supposed to be on, this message will go to stdout and
}
#define IDFILE_NAME ".fetchids"
- run.idfile = (char *) xmalloc(strlen(fmhome)+sizeof(IDFILE_NAME)+2);
- strcpy(run.idfile, fmhome);
- strcat(run.idfile, "/");
- strcat(run.idfile, IDFILE_NAME);
+ run.idfile = prependdir (IDFILE_NAME, fmhome);
outlevel = O_NORMAL;
*/
lock_dispose();
- if ((parsestatus = parsecmdline(argc,argv, &cmd_run, &cmd_opts)) < 0)
+#ifdef HAVE_GETCWD
+ /* save the current directory */
+ if (getcwd (currentwd, sizeof (currentwd)) == NULL) {
+ report(stderr, GT_("could not get current working directory\n"));
+ currentwd[0] = 0;
+ }
+#endif
+
+ if ((parsecmdline(argc,argv, &cmd_run, &cmd_opts)) < 0)
exit(PS_SYNTAX);
if (versioninfo)
{
- printf(GT_("This is fetchmail release %s"), VERSION);
+ const char *features =
#ifdef POP2_ENABLE
- printf("+POP2");
+ "+POP2"
#endif /* POP2_ENABLE */
#ifndef POP3_ENABLE
- printf("-POP3");
+ "-POP3"
#endif /* POP3_ENABLE */
#ifndef IMAP_ENABLE
- printf("-IMAP");
+ "-IMAP"
#endif /* IMAP_ENABLE */
#ifdef GSSAPI
- printf("+IMAP-GSS");
+ "+IMAP-GSS"
#endif /* GSSAPI */
#ifdef RPA_ENABLE
- printf("+RPA");
+ "+RPA"
#endif /* RPA_ENABLE */
#ifdef NTLM_ENABLE
- printf("+NTLM");
+ "+NTLM"
#endif /* NTLM_ENABLE */
#ifdef SDPS_ENABLE
- printf("+SDPS");
+ "+SDPS"
#endif /* SDPS_ENABLE */
#ifndef ETRN_ENABLE
- printf("-ETRN");
+ "-ETRN"
#endif /* ETRN_ENABLE */
#ifndef ODMR_ENABLE
- printf("-ODMR");
+ "-ODMR"
#endif /* ODMR_ENABLE */
#ifdef SSL_ENABLE
- printf("+SSL");
+ "+SSL"
#endif
-#if OPIE_ENABLE
- printf("+OPIE");
+#ifdef OPIE_ENABLE
+ "+OPIE"
#endif /* OPIE_ENABLE */
-#if INET6_ENABLE
- printf("+INET6");
-#endif /* INET6_ENABLE */
-#if NET_SECURITY
- printf("+NETSEC");
-#endif /* NET_SECURITY */
+#ifdef HAVE_PKG_hesiod
+ "+HESIOD"
+#endif
#ifdef HAVE_SOCKS
- printf("+SOCKS");
+ "+SOCKS"
#endif /* HAVE_SOCKS */
-#if ENABLE_NLS
- printf("+NLS");
+#ifdef ENABLE_NLS
+ "+NLS"
#endif /* ENABLE_NLS */
+ "\n";
+ printf(GT_("This is fetchmail release %s"), VERSION);
+ fputs(features, stdout);
+ fputs("Fallback MDA: ", stdout);
+#ifdef FALLBACK_MDA
+ fputs(FALLBACK_MDA, stdout);
+#else
+ fputs("(none)", stdout);
+#endif
putchar('\n');
fflush(stdout);
#define NETRC_FILE ".netrc"
/* parse the ~/.netrc file (if present) for future password lookups. */
- xalloca(netrc_file, char *, strlen(home) + sizeof(NETRC_FILE) + 2);
- strcpy (netrc_file, home);
- strcat (netrc_file, "/");
- strcat (netrc_file, NETRC_FILE);
+ netrc_file = prependdir (NETRC_FILE, home);
netrc_list = parse_netrc(netrc_file);
+ free(netrc_file);
#undef NETRC_FILE
/* pick up passwords where we can */
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"),
{
fprintf(stderr,GT_("fetchmail: %s fetchmail at %d killed.\n"),
bkgd ? GT_("background") : GT_("foreground"), pid);
- lock_release();
+ fm_lock_release();
if (argc == 2)
exit(0);
else
pid);
return(PS_EXCLUDE);
}
+ else if (getpid() == pid)
+ /* this test enables re-execing on a changed rcfile */
+ lock_assert();
else if (argc > 1)
{
- /* this test enables re-execing on a changed rcfile */
- if (getpid() == pid)
- lock_assert();
- else
- {
- fprintf(stderr,
- GT_("fetchmail: can't accept options while a background fetchmail is running.\n"));
- return(PS_EXCLUDE);
- }
+ fprintf(stderr,
+ GT_("fetchmail: can't accept options while a background fetchmail is running.\n"));
+ return(PS_EXCLUDE);
}
else if (kill(pid, SIGUSR1) == 0)
{
GT_("fetchmail: can't find a password for %s@%s.\n"),
ctl->remotename, ctl->server.pollname);
return(PS_AUTHFAIL);
- }
- else
- {
- char* password_prompt = GT_("Enter password for %s@%s: ");
+ } else {
+ const char* password_prompt = GT_("Enter password for %s@%s: ");
+ size_t pplen = strlen(password_prompt) + strlen(ctl->remotename) + strlen(ctl->server.pollname) + 1;
- xalloca(tmpbuf, char *, strlen(password_prompt) +
- strlen(ctl->remotename) +
- strlen(ctl->server.pollname) + 1);
- (void) sprintf(tmpbuf, password_prompt,
- ctl->remotename, ctl->server.pollname);
+ tmpbuf = xmalloc(pplen);
+ snprintf(tmpbuf, pplen, password_prompt,
+ ctl->remotename, ctl->server.pollname);
ctl->password = xstrdup((char *)fm_getpassword(tmpbuf));
+ free(tmpbuf);
}
}
}
* 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);
- if (run.poll_interval && !getuid())
- signal(SIGHUP, SIG_IGN);
+ set_signal_handler(SIGUSR1, SIG_IGN);
+ if (run.poll_interval && getuid() == ROOT_UID)
+ 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)
{
- freopen(run.logfile, "a", stdout);
- freopen(run.logfile, "a", stderr);
+ if (!freopen(run.logfile, "a", stdout))
+ report(stderr, GT_("could not open %s to append logs to \n"), run.logfile);
+ if (!freopen(run.logfile, "a", stderr))
+ report(stdout, GT_("could not open %s to append logs to \n"), run.logfile);
}
}
-#ifdef linux
interface_init();
-#endif /* linux */
/* 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();
else if (rcstat.st_mtime > parsetime)
{
report(stdout, GT_("restarting fetchmail (%s changed)\n"), rcfile);
+
+#ifdef HAVE_GETCWD
+ /* restore the startup directory */
+ if (!currentwd[0] || chdir (currentwd) == -1)
+ report(stderr, GT_("attempt to re-exec may fail as directory has not been restored\n"));
+#endif
+
/*
* Matthias Andree: Isn't this prone to introduction of
* "false" programs by interfering with PATH? Those
}
}
-#if (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__)
+#ifdef CAN_MONITOR
/*
* 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__) */
+#endif /* CAN_MONITOR */
+
+ 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__)
+#ifdef CAN_MONITOR
if (ctl->server.monitor)
{
/*
sleep(3);
interface_note_activity(&ctl->server);
}
-#endif /* (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__) */
+#endif /* CAN_MONITOR */
}
}
exit(PS_AUTHFAIL);
}
- if (outlevel >= O_VERBOSE)
+ if (outlevel > O_SILENT)
report(stdout,
- GT_("fetchmail: sleeping at %s\n"), timestamp());
+ GT_("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.
+ */
+ set_signal_handler(SIGUSR1, donothing);
+ if (getuid() != ROOT_UID)
+ set_signal_handler(SIGHUP, donothing);
/*
* OK, now pause until it's time for the next poll cycle.
*/
if ((lastsig = interruptible_idle(run.poll_interval)))
{
+ if (outlevel > O_SILENT)
#ifdef SYS_SIGLIST_DECLARED
- report(stdout,
+ report(stdout,
GT_("awakened by %s\n"), sys_siglist[lastsig]);
#else
- report(stdout,
+ report(stdout,
GT_("awakened by signal %d\n"), lastsig);
#endif
for (ctl = querylist; ctl; ctl = ctl->next)
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
FLAG_MERGE(server.service);
- FLAG_MERGE(server.netsec);
-#else /* INET6_ENABLE */
- FLAG_MERGE(server.port);
-#endif /* INET6_ENABLE */
FLAG_MERGE(server.interval);
FLAG_MERGE(server.authenticate);
FLAG_MERGE(server.timeout);
FLAG_MERGE(server.uidl);
FLAG_MERGE(server.principal);
-#if defined(linux) || defined(__FreeBSD__)
+#ifdef CAN_MONITOR
FLAG_MERGE(server.interface);
- FLAG_MERGE(server.monitor);
FLAG_MERGE(server.interface_pair);
-#endif /* linux || defined(__FreeBSD__) */
+ FLAG_MERGE(server.monitor);
+#endif
FLAG_MERGE(server.plugin);
FLAG_MERGE(server.plugout);
+ FLAG_MERGE(server.tracepolls);
FLAG_MERGE(wildcard);
FLAG_MERGE(remotename);
FLAG_MERGE(keep);
FLAG_MERGE(flush);
+ FLAG_MERGE(limitflush);
FLAG_MERGE(fetchall);
FLAG_MERGE(rewrite);
FLAG_MERGE(forcecr);
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);
#endif
FLAG_MERGE(expunge);
- FLAG_MERGE(tracepolls);
FLAG_MERGE(properties);
#undef FLAG_MERGE
}
struct passwd *pw;
struct query def_opts, *ctl;
struct stat rcstat;
+ char *p;
run.bouncemail = TRUE;
run.spambounce = FALSE; /* don't bounce back to innocent bystanders */
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 */
- ANTISPAM(501); /* new exim */
- ANTISPAM(554); /* Postfix */
-#undef ANTISPAM
-
def_opts.server.protocol = P_AUTO;
def_opts.server.timeout = CLIENT_TIMEOUT;
+ def_opts.server.esmtp_name = user;
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;
+ p = strrchr (rcfile, '/');
+ if (p && (p - rcfile) < sizeof (rcfiledir)) {
+ *p = 0; /* replace '/' by '0' */
+ strlcpy (rcfiledir, rcfile, sizeof(rcfiledir));
+ *p = '/'; /* restore '/' */
+ if (!rcfiledir[0]) /* "/.fetchmailrc" case */
+ strcpy (rcfiledir, "/");
+ }
/* note the parse time, so we can pick up on modifications */
parsetime = 0; /* foil compiler warnings */
* If we're using Kerberos for authentication, we need
* the FQDN in order to generate capability keys.
*/
- if (strcmp(fetchmailhost, "localhost") == 0)
- for (ctl = querylist; ctl; ctl = ctl->next)
- if (ctl->active &&
+ for (ctl = querylist; ctl; ctl = ctl->next)
+ if (ctl->active &&
(ctl->server.protocol==P_ETRN || ctl->server.protocol==P_ODMR
|| ctl->server.authenticate == A_KERBEROS_V4
|| ctl->server.authenticate == A_KERBEROS_V5))
- {
- fetchmailhost = host_fqdn();
- break;
- }
-
- /* 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 )
{
- /* merge in defaults */
- optmerge(ctl, &def_opts, FALSE);
-
- /* force command-line options */
- optmerge(ctl, &cmd_opts, TRUE);
+ fetchmailhost = host_fqdn();
+ break;
+ }
- /* this code enables flags to be turned off */
+ /* this code enables flags to be turned off */
#define DEFAULT(flag, dflt) if (flag == FLAG_TRUE)\
flag = TRUE;\
else if (flag == FLAG_FALSE)\
flag = FALSE;\
else\
flag = (dflt)
+ /* one global gets treated specially */
+ DEFAULT(run.showdots, run.poll_interval==0 || nodetach);
+
+ /* merge in wired defaults, do sanity checks and prepare internal fields */
+ for (ctl = querylist; ctl; ctl = ctl->next)
+ {
+ ctl->wedged = FALSE;
+
+ /* merge in defaults */
+ optmerge(ctl, &def_opts, FALSE);
+
+ /* force command-line options */
+ optmerge(ctl, &cmd_opts, TRUE);
+
+ /*
+ * queryname has to be set up for inactive servers too.
+ * Otherwise the UIDL code core-dumps on startup.
+ */
+ if (ctl->server.via)
+ ctl->server.queryname = xstrdup(ctl->server.via);
+ else
+ ctl->server.queryname = xstrdup(ctl->server.pollname);
+
+ /*
+ * We no longer do DNS lookups at startup.
+ * This is a kluge. It enables users to edit their
+ * configurations when DNS isn't available.
+ */
+ ctl->server.truename = xstrdup(ctl->server.queryname);
+
+ if (configdump || ctl->active )
+ {
DEFAULT(ctl->keep, FALSE);
DEFAULT(ctl->fetchall, FALSE);
DEFAULT(ctl->flush, FALSE);
+ DEFAULT(ctl->limitflush, FALSE);
DEFAULT(ctl->rewrite, TRUE);
DEFAULT(ctl->stripcr, (ctl->mda != (char *)NULL));
DEFAULT(ctl->forcecr, FALSE);
DEFAULT(ctl->idle, FALSE);
DEFAULT(ctl->server.dns, TRUE);
DEFAULT(ctl->server.uidl, FALSE);
-#ifdef SSL_ENABLE
DEFAULT(ctl->use_ssl, FALSE);
DEFAULT(ctl->sslcertck, FALSE);
-#endif
DEFAULT(ctl->server.checkalias, FALSE);
#ifndef SSL_ENABLE
+ /*
+ * XXX FIXME: do we need this check or can we rely on the .y
+ * parser handling this?
+ */
if (ctl->use_ssl)
{
report(stderr, GT_("SSL support is not compiled in.\n"));
if (!ctl->localnames) /* for local delivery via SMTP */
save_str_pair(&ctl->localnames, user, NULL);
-#if !defined(HAVE_GETHOSTBYNAME) || !defined(HAVE_RES_SEARCH)
+#ifndef HAVE_RES_SEARCH
/* can't handle multidrop mailboxes unless we can do DNS lookups */
- if (ctl->localnames && ctl->localnames->next && ctl->server.dns)
+ if (MULTIDROP(ctl) && ctl->server.dns)
{
ctl->server.dns = FALSE;
report(stderr, GT_("fetchmail: warning: no DNS available to check multidrop fetches from %s\n"), ctl->server.pollname);
}
-#endif /* !HAVE_GETHOSTBYNAME || !HAVE_RES_SEARCH */
-
- if (ctl->server.via)
- ctl->server.queryname = xstrdup(ctl->server.via);
- else
- ctl->server.queryname = xstrdup(ctl->server.pollname);
+#endif /* !HAVE_RES_SEARCH */
/*
- * We no longer do DNS lookups at startup.
- * This is a kluge. It enables users to edit their
- * configurations when DNS isn't available.
+ * can't handle multidrop mailboxes without "envelope"
+ * option, this causes truckloads full of support complaints
+ * "all mail forwarded to postmaster"
*/
- ctl->server.truename = xstrdup(ctl->server.queryname);
+ if (MULTIDROP(ctl) && !ctl->server.envelope)
+ {
+ report(stderr, GT_("warning: multidrop for %s requires envelope option!\n"), ctl->server.pollname);
+ report(stderr, GT_("warning: Do not ask for support if all mail goes to postmaster!\n"));
+ }
/* if no folders were specified, set up the null one as default */
if (!ctl->mailboxes)
save_str(&ctl->mailboxes, (char *)NULL, 0);
/* maybe user overrode timeout on command line? */
- if (ctl->server.timeout == -1)
+ if (ctl->server.timeout == -1)
ctl->server.timeout = CLIENT_TIMEOUT;
-#if !INET6_ENABLE
/* sanity checks */
- if (ctl->server.port < 0)
- {
- (void) fprintf(stderr,
- GT_("%s configuration invalid, port number cannot be negative\n"),
- ctl->server.pollname);
- exit(PS_SYNTAX);
- }
- if (ctl->server.protocol == P_RPOP && ctl->server.port >= 1024)
- {
- (void) fprintf(stderr,
- GT_("%s configuration invalid, RPOP requires a privileged port\n"),
- ctl->server.pollname);
- exit(PS_SYNTAX);
+ if (ctl->server.service) {
+ int port = servport(ctl->server.service);
+ if (port < 0)
+ {
+ (void) fprintf(stderr,
+ GT_("%s configuration invalid, port number cannot be negative\n"),
+ ctl->server.pollname);
+ exit(PS_SYNTAX);
+ }
+ if (ctl->server.protocol == P_RPOP && port >= 1024)
+ {
+ (void) fprintf(stderr,
+ GT_("%s configuration invalid, RPOP requires a privileged port\n"),
+ ctl->server.pollname);
+ exit(PS_SYNTAX);
+ }
}
if (ctl->listener == LMTP_MODE)
{
char *cp;
if (!(cp = strrchr(idp->id, '/')) ||
- (atoi(++cp) == SMTP_PORT))
+ ++cp, (0 == strcmp(cp, SMTP_PORT))
+ || servport(cp) == SMTP_PORT_NUM)
{
(void) fprintf(stderr,
GT_("%s configuration invalid, LMTP can't use default SMTP port\n"),
}
}
}
-#endif /* !INET6_ENABLE */
/*
- * "I beg to you, have mercy on the week minds like myself."
+ * "I beg to you, have mercy on the we[a]k minds like myself."
* wrote Pehr Anderson. Your petition is granted.
*/
if (ctl->fetchall && ctl->keep && run.poll_interval && !nodetach)
*/
if (!run.postmaster)
{
- if (getuid()) /* ordinary user */
+ if (getuid() != ROOT_UID) /* ordinary user */
run.postmaster = user;
else /* root */
run.postmaster = "postmaster";
return(implicitmode);
}
-static void terminate_poll(int sig)
+static RETSIGTYPE terminate_poll(int sig)
/* to be executed at the end of a poll cycle */
{
/*
{
/* don't send QUIT for ODMR case because we're acting
as a proxy between the SMTP server and client. */
- if (ctl->server.protocol != P_ODMR)
- SMTP_quit(ctl->smtp_socket);
- SockClose(ctl->smtp_socket);
- ctl->smtp_socket = -1;
+ smtp_close(ctl, ctl->server.protocol != P_ODMR);
}
}
#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;
memset(ctl->password, '\0', strlen(ctl->password));
#if !defined(HAVE_ATEXIT) && !defined(HAVE_ON_EXIT)
- lock_release();
+ fm_lock_release();
#endif
if (activecount == 0)
* If we're syslogging the progress messages are automatically timestamped.
* Force timestamping if we're going to a logfile.
*/
- if (outlevel >= O_VERBOSE || (run.logfile && outlevel > O_SILENT))
+ if (outlevel >= O_VERBOSE)
{
report(stdout, GT_("%s querying %s (protocol %s) at %s: poll started\n"),
VERSION,
for (i = 0; i < sizeof(autoprobe)/sizeof(autoprobe[0]); i++)
{
ctl->server.protocol = autoprobe[i];
- st = query_host(ctl);
- if (st == PS_SUCCESS || st == PS_NOMAIL || st == PS_AUTHFAIL || st == PS_LOCKBUSY || st == PS_SMTP || st == PS_MAXFETCH)
+ do {
+ st = query_host(ctl);
+ } while
+ (st == PS_REPOLL);
+ if (st == PS_SUCCESS || st == PS_NOMAIL || st == PS_AUTHFAIL || st == PS_LOCKBUSY || st == PS_SMTP || st == PS_MAXFETCH || st == PS_DNS)
break;
}
ctl->server.protocol = P_AUTO;
case P_APOP:
case P_RPOP:
#ifdef POP3_ENABLE
- st = doPOP3(ctl);
+ do {
+ st = doPOP3(ctl);
+ } while (st == PS_REPOLL);
#else
report(stderr, GT_("POP3 support is not configured.\n"));
st = PS_PROTOCOL;
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;
report(stderr, GT_("ETRN support is not configured.\n"));
st = PS_PROTOCOL;
#else
-#ifdef HAVE_GETHOSTBYNAME
st = doETRN(ctl);
-#else
- report(stderr, GT_("Cannot support ETRN without gethostbyname(2).\n"));
- st = PS_PROTOCOL;
-#endif /* HAVE_GETHOSTBYNAME */
break;
#endif /* ETRN_ENABLE */
case P_ODMR:
report(stderr, GT_("ODMR support is not configured.\n"));
st = PS_PROTOCOL;
#else
-#ifdef HAVE_GETHOSTBYNAME
st = doODMR(ctl);
-#else
- report(stderr, GT_("Cannot support ODMR without gethostbyname(2).\n"));
- st = PS_PROTOCOL;
-#endif /* HAVE_GETHOSTBYNAME */
#endif /* ODMR_ENABLE */
break;
default:
* If we're syslogging the progress messages are automatically timestamped.
* Force timestamping if we're going to a logfile.
*/
- if (outlevel >= O_VERBOSE || (run.logfile && outlevel > O_SILENT))
+ if (outlevel >= O_VERBOSE)
{
report(stdout, GT_("%s querying %s (protocol %s) at %s: poll completed\n"),
VERSION,
printf(GT_(" Mail will be retrieved via %s\n"), ctl->server.via);
if (ctl->server.interval)
- printf(GT_(" Poll of this server will occur every %d intervals.\n"),
- ctl->server.interval);
+ printf(ngettext(" Poll of this server will occur every %d interval.\n",
+ " Poll of this server will occur every %d intervals.\n",
+ ctl->server.interval), ctl->server.interval);
if (ctl->server.truename)
printf(GT_(" True name of server is %s.\n"), ctl->server.truename);
if (ctl->server.skip || outlevel >= O_VERBOSE)
- printf(GT_(" This host %s be queried when no host is specified.\n"),
- ctl->server.skip ? GT_("will not") : GT_("will"));
+ printf(ctl->server.skip
+ ? GT_(" This host will not be queried when no host is specified.\n")
+ : GT_(" This host will be queried when no host is specified.\n"));
if (!NO_PASSWORD(ctl))
{
if (!ctl->password)
}
if (ctl->server.protocol == P_POP3
-#if INET6_ENABLE
&& ctl->server.service && !strcmp(ctl->server.service, KPOP_PORT)
-#else /* INET6_ENABLE */
- && ctl->server.port == KPOP_PORT
-#endif /* INET6_ENABLE */
&& (ctl->server.authenticate == A_KERBEROS_V4 ||
ctl->server.authenticate == A_KERBEROS_V5))
printf(GT_(" Protocol is KPOP with Kerberos %s authentication"),
ctl->server.authenticate == A_KERBEROS_V5 ? "V" : "IV");
else
printf(GT_(" Protocol is %s"), showproto(ctl->server.protocol));
-#if INET6_ENABLE
if (ctl->server.service)
printf(GT_(" (using service %s)"), ctl->server.service);
- if (ctl->server.netsec)
- printf(GT_(" (using network security options %s)"), ctl->server.netsec);
-#else /* INET6_ENABLE */
- if (ctl->server.port)
- printf(GT_(" (using port %d)"), ctl->server.port);
-#endif /* INET6_ENABLE */
else if (outlevel >= O_VERBOSE)
printf(GT_(" (using default port)"));
if (ctl->server.uidl && MAILBOX_PROTOCOL(ctl))
#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->fetchall ? GT_("All") : GT_("Only new"),
- ctl->fetchall ? "on" : "off");
- printf(GT_(" Fetched messages %s be kept on the server (--keep %s).\n"),
- ctl->keep ? GT_("will") : GT_("will not"),
- ctl->keep ? "on" : "off");
- printf(GT_(" Old messages %s be flushed before message retrieval (--flush %s).\n"),
- ctl->flush ? GT_("will") : GT_("will not"),
- ctl->flush ? "on" : "off");
- printf(GT_(" Rewrite of server-local addresses is %s (--norewrite %s).\n"),
- ctl->rewrite ? GT_("enabled") : GT_("disabled"),
- ctl->rewrite ? "off" : "on");
- printf(GT_(" Carriage-return stripping is %s (stripcr %s).\n"),
- ctl->stripcr ? GT_("enabled") : GT_("disabled"),
- ctl->stripcr ? "on" : "off");
- printf(GT_(" Carriage-return forcing is %s (forcecr %s).\n"),
- ctl->forcecr ? GT_("enabled") : GT_("disabled"),
- ctl->forcecr ? "on" : "off");
- printf(GT_(" Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"),
- ctl->pass8bits ? GT_("disabled") : GT_("enabled"),
- ctl->pass8bits ? "on" : "off");
- printf(GT_(" MIME decoding is %s (mimedecode %s).\n"),
- ctl->mimedecode ? GT_("enabled") : GT_("disabled"),
- ctl->mimedecode ? "on" : "off");
- printf(GT_(" Idle after poll is %s (idle %s).\n"),
- ctl->idle ? GT_("enabled") : GT_("disabled"),
- ctl->idle ? "on" : "off");
- printf(GT_(" Nonempty Status lines will be %s (dropstatus %s)\n"),
- ctl->dropstatus ? GT_("discarded") : GT_("kept"),
- ctl->dropstatus ? "on" : "off");
- printf(GT_(" Delivered-To lines will be %s (dropdelivered %s)\n"),
- ctl->dropdelivered ? GT_("discarded") : GT_("kept"),
- ctl->dropdelivered ? "on" : "off");
+ printf(ctl->fetchall
+ ? GT_(" All messages will be retrieved (--all on).\n")
+ : GT_(" Only new messages will be retrieved (--all off).\n"));
+ printf(ctl->keep
+ ? GT_(" Fetched messages will be kept on the server (--keep on).\n")
+ : GT_(" Fetched messages will not be kept on the server (--keep off).\n"));
+ printf(ctl->flush
+ ? GT_(" Old messages will be flushed before message retrieval (--flush on).\n")
+ : GT_(" Old messages will not be flushed before message retrieval (--flush off).\n"));
+ printf(ctl->limitflush
+ ? GT_(" Oversized messages will be flushed before message retrieval (--limitflush on).\n")
+ : GT_(" Oversized messages will not be flushed before message retrieval (--limitflush off).\n"));
+ printf(ctl->rewrite
+ ? GT_(" Rewrite of server-local addresses is enabled (--norewrite off).\n")
+ : GT_(" Rewrite of server-local addresses is disabled (--norewrite on).\n"));
+ printf(ctl->stripcr
+ ? GT_(" Carriage-return stripping is enabled (stripcr on).\n")
+ : GT_(" Carriage-return stripping is disabled (stripcr off).\n"));
+ printf(ctl->forcecr
+ ? GT_(" Carriage-return forcing is enabled (forcecr on).\n")
+ : GT_(" Carriage-return forcing is disabled (forcecr off).\n"));
+ printf(ctl->pass8bits
+ ? GT_(" Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n")
+ : GT_(" Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"));
+ printf(ctl->mimedecode
+ ? GT_(" MIME decoding is enabled (mimedecode on).\n")
+ : GT_(" MIME decoding is disabled (mimedecode off).\n"));
+ printf(ctl->idle
+ ? GT_(" Idle after poll is enabled (idle on).\n")
+ : GT_(" Idle after poll is disabled (idle off).\n"));
+ printf(ctl->dropstatus
+ ? GT_(" Nonempty Status lines will be discarded (dropstatus on)\n")
+ : GT_(" Nonempty Status lines will be kept (dropstatus off)\n"));
+ printf(ctl->dropdelivered
+ ? GT_(" Delivered-To lines will be discarded (dropdelivered on)\n")
+ : GT_(" Delivered-To lines will be kept (dropdelivered off)\n"));
if (NUM_NONZERO(ctl->limit))
{
if (NUM_NONZERO(ctl->limit))
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)"));
}
else
printf(GT_(" Single-drop mode: "));
- printf(GT_("%d local name(s) recognized.\n"), count);
+ printf(ngettext("%d local name recognized.\n", "%d local names recognized.\n", count), count);
if (outlevel >= O_VERBOSE)
{
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);
}
if (count > 1 || ctl->wildcard)
{
- printf(GT_(" DNS lookup for multidrop addresses is %s.\n"),
- ctl->server.dns ? GT_("enabled") : GT_("disabled"));
+ printf(ctl->server.dns
+ ? GT_(" DNS lookup for multidrop addresses is enabled.\n")
+ : GT_(" DNS lookup for multidrop addresses is disabled.\n"));
if (ctl->server.dns)
{
- printf(GT_(" Server aliases will be compared with multidrop addresses by "));
if (ctl->server.checkalias)
- printf(GT_("IP address.\n"));
+ printf(GT_(" Server aliases will be compared with multidrop addresses by IP address.\n"));
else
- printf(GT_("name.\n"));
+ printf(GT_(" Server aliases will be compared with multidrop addresses by name.\n"));
}
if (ctl->server.envelope == STRING_DISABLED)
printf(GT_(" Envelope-address routing is disabled\n"));
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');
}
}
}
}
-#if defined(linux) || defined(__FreeBSD__)
+#ifdef CAN_MONITOR
if (ctl->server.interface)
printf(GT_(" Connection must be through interface %s.\n"), ctl->server.interface);
else if (outlevel >= O_VERBOSE)
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);
}
}
- if (ctl->tracepolls)
+ if (ctl->server.tracepolls)
printf(GT_(" Poll trace information will be added to the Received header.\n"));
else if (outlevel >= O_VERBOSE)
printf(GT_(" No poll trace information will be added to the Received header.\n.\n"));
projects / ~andy / fetchmail / blobdiff