X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fetchmail.c;h=6456ed284906c68952bc805fc2eff9a9b4f2fda5;hb=e75c62b234a699557c023970466a8accd0b5a7b2;hp=918ef93ca3b4aba7e50e1188e3511e175b34e75b;hpb=c4432b4997d1819dbfd289ba42050e20927bde08;p=~andy%2Ffetchmail diff --git a/fetchmail.c b/fetchmail.c index 918ef93c..6456ed28 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -25,30 +25,30 @@ #include #include #include -#include /* needed for Sun 4.1.2 */ #ifdef HAVE_SETRLIMIT #include #endif /* HAVE_SETRLIMIT */ -#include -#ifdef HAVE_NET_SOCKET_H -#include -#endif -#ifdef HAVE_GETHOSTBYNAME -#include -#endif /* HAVE_GETHOSTBYNAME */ +#ifdef HAVE_SOCKS +#include /* SOCKSinit() */ +#endif /* HAVE_SOCKS */ -#ifdef HESIOD -#include +#ifdef HAVE_LANGINFO_H +#include #endif -#include "getopt.h" #include "fetchmail.h" #include "socket.h" #include "tunable.h" #include "smtp.h" #include "netrc.h" #include "i18n.h" +#include "lock.h" + +/* need these (and sys/types.h) for res_init() */ +#include +#include +#include #ifndef ENETUNREACH #define ENETUNREACH 128 /* Interactive doesn't know this */ @@ -66,41 +66,26 @@ int outlevel; /* see the O_.* constants above */ struct runctl run; /* global controls for this run */ flag nodetach; /* if TRUE, don't detach daemon process */ flag quitmode; /* if --quit was set */ +int quitind; /* optind after position of last --quit option */ flag check_only; /* if --probe was set */ 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 */ +const 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 */ -#if NET_SECURITY -void *request = NULL; -int requestlen = 0; -#endif /* NET_SECURITY */ +static int quitonly; /* if we should quit after killing the running daemon */ -static char *lockfile; /* name of lockfile */ -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 HAVE_ON_EXIT -static void unlockit(int n, void *p) -#else -static void unlockit(void) -#endif -/* must-do actions for exit (but we can't count on being able to do malloc) */ -{ - if (lockfile && lock_acquired) - unlink(lockfile); -} +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 */ @@ -124,12 +109,13 @@ static void dropprivs(void) #endif #if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS) && defined(HAVE_STRFTIME) -#include #include +/** 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, ""); @@ -141,11 +127,34 @@ static char *timestamp (void) #define timestamp rfc822timestamp #endif +static RETSIGTYPE donothing(int sig) +{ + set_signal_handler(sig, donothing); + lastsig = sig; +} + +static void printcopyright(FILE *fp) { + fprintf(fp, GT_("Copyright (C) 2002, 2003 Eric S. Raymond\n" + "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n" + " Robert M. Funk, Graham Wilson\n" + "Copyright (C) 2005 - 2006, 2010 - 2011 Sunil Shetye\n" + "Copyright (C) 2005 - 2011 Matthias Andree\n" + )); + fprintf(fp, GT_("Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" + "are welcome to redistribute it under certain conditions. For details,\n" + "please see the file COPYING in the source or documentation directory.\n")); +#ifdef SSL_ENABLE + /* Do not translate this */ + fprintf(fp, "This product includes software developed by the OpenSSL Project\nfor use in the OpenSSL Toolkit. (http://www.openssl.org/)\n"); +#endif +} + +const char *iana_charset; + int main(int argc, char **argv) { - int st, bkgd = FALSE; - int parsestatus, implicitmode = FALSE; - FILE *lockfp; + int bkgd = FALSE; + int implicitmode = FALSE; struct query *ctl; netrc_entry *netrc_list; char *netrc_file, *tmpbuf; @@ -158,10 +167,20 @@ int main(int argc, char **argv) envquery(argc, argv); #ifdef ENABLE_NLS + 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 @@ -171,94 +190,128 @@ int main(int argc, char **argv) { int i; - report(stdout, _("fetchmail: invoked with")); + report(stdout, GT_("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(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; /* - * We used to arrange for the lockfile to be removed on exit close + * We used to arrange for the lock to be removed on exit close * to where the lock was asserted. Now we need to do it here, because - * we might have re-executed in background with an existing lockfile + * we might have re-executed in background with an existing lock * as the result of a changed rcfile (see the code near the execvp(3) * call near the beginning of the polling loop for details). We want - * to be sure the lockfile gets nuked on any error exit, basically. + * to be sure the lock gets nuked on any error exit, basically. */ -#ifdef HAVE_ATEXIT - atexit(unlockit); -#endif -#ifdef HAVE_ON_EXIT - on_exit(unlockit, (char *)NULL); + fm_lock_dispose(); + +#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 ((parsestatus = parsecmdline(argc,argv, &cmd_run, &cmd_opts)) < 0) - exit(PS_SYNTAX); + { + int i; + + i = parsecmdline(argc, argv, &cmd_run, &cmd_opts); + if (i < 0) + exit(PS_SYNTAX); + + if (quitmode && quitind == argc) + quitonly = 1; + } if (versioninfo) { - printf(_("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"); + "+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 + "-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 */ +#ifdef KERBEROS_V4 + "+KRB4" +#endif /* KERBEROS_V4 */ +#ifdef KERBEROS_V5 + "+KRB5" +#endif /* KERBEROS_V5 */ +#ifndef HAVE_RES_SEARCH + "-DNS" +#endif + ".\n"; + printf(GT_("This is fetchmail release %s"), VERSION); + fputs(features, stdout); + puts(""); + printcopyright(stdout); + puts(""); + fputs("Fallback MDA: ", stdout); +#ifdef FALLBACK_MDA + fputs(FALLBACK_MDA, stdout); +#else + fputs("(none)", stdout); +#endif putchar('\n'); fflush(stdout); /* this is an attempt to help remote debugging */ - system("uname -a"); + if (system("uname -a")) { /* NOOP to quench GCC complaint */ } } - /* avoid parsing the config file if all we're doing is killing a daemon */ - if (!(quitmode && argc == 2)) + /* avoid parsing the config file if all we're doing is killing a daemon */ + if (!quitonly) implicitmode = load_params(argc, argv, optind); + /* precedence: logfile (if effective) overrides syslog. */ + if (run.logfile && run.poll_interval && !nodetach) { + run.use_syslog = 0; + } + #if defined(HAVE_SYSLOG) /* logging should be set up early in case we were restarted from exec */ if (run.use_syslog) @@ -275,21 +328,20 @@ int main(int argc, char **argv) #endif report_init((run.poll_interval == 0 || nodetach) && !run.logfile); - /* set up to do lock protocol */ -#define FETCHMAIL_PIDFILE "fetchmail.pid" - if (!getuid()) { - xalloca(tmpbuf, char *, - sizeof(PID_DIR) + sizeof(FETCHMAIL_PIDFILE)); - sprintf(tmpbuf, "%s/%s", PID_DIR, FETCHMAIL_PIDFILE); - } else { - xalloca(tmpbuf, char *, strlen(fmhome) + sizeof(FETCHMAIL_PIDFILE) + 2); - strcpy(tmpbuf, fmhome); - strcat(tmpbuf, "/"); - if (fmhome == home) - strcat(tmpbuf, "."); - strcat(tmpbuf, FETCHMAIL_PIDFILE); +#ifdef POP3_ENABLE + /* initialize UID handling */ + { + int st; + + if (!versioninfo && (st = prc_filecheck(run.idfile, !versioninfo)) != 0) + exit(st); + else + initialize_saved_lists(querylist, run.idfile); } -#undef FETCHMAIL_PIDFILE +#endif /* POP3_ENABLE */ + + /* construct the lockfile */ + fm_lock_setup(&run); #ifdef HAVE_SETRLIMIT /* @@ -308,11 +360,9 @@ int main(int argc, char **argv) #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 */ @@ -320,13 +370,7 @@ int main(int argc, char **argv) { if (ctl->active && !(implicitmode && ctl->server.skip)&&!ctl->password) { - if (ctl->server.preauthenticate == A_KERBEROS_V4 || - ctl->server.preauthenticate == A_KERBEROS_V5 || - ctl->server.preauthenticate == A_SSH || -#ifdef GSSAPI - ctl->server.protocol == P_IMAP_GSS || -#endif /* GSSAPI */ - ctl->server.protocol == P_IMAP_K4) + if (NO_PASSWORD(ctl)) /* Server won't care what the password is, but there must be some non-null string here. */ ctl->password = ctl->remotename; @@ -353,21 +397,21 @@ int main(int argc, char **argv) } } + free_netrc(netrc_list); + netrc_list = 0; + /* perhaps we just want to check options? */ if (versioninfo) { int havercfile = access(rcfile, 0); - printf(_("Taking options from command line%s%s\n"), - havercfile ? "" : _(" and "), + printf(GT_("Taking options from command line%s%s\n"), + havercfile ? "" : GT_(" and "), havercfile ? "" : rcfile); - if (outlevel >= O_VERBOSE) - printf(_("Lockfile at %s\n"), tmpbuf); - if (querylist == NULL) fprintf(stderr, - _("No mailservers set up -- perhaps %s is missing?\n"), + GT_("No mailservers set up -- perhaps %s is missing?\n"), rcfile); else dump_params(&run, querylist, implicitmode); @@ -382,100 +426,93 @@ int main(int argc, char **argv) } /* check for another fetchmail running concurrently */ - pid = -1; - if ((lockfile = (char *) malloc(strlen(tmpbuf) + 1)) == NULL) - { - report(stderr,_("fetchmail: cannot allocate memory for lock name.\n")); - exit(PS_EXCLUDE); - } - else - (void) strcpy(lockfile, tmpbuf); - if ((lockfp = fopen(lockfile, "r")) != NULL ) - { - bkgd = (fscanf(lockfp,"%d %d", &pid, &st) == 2); - - if (kill(pid, 0) == -1) { - fprintf(stderr,_("fetchmail: removing stale lockfile\n")); - pid = -1; - bkgd = FALSE; - unlink(lockfile); - } - fclose(lockfp); /* not checking should be safe, file mode was "r" */ - } + pid = fm_lock_state(); + bkgd = (pid < 0); + pid = bkgd ? -pid : pid; /* if no mail servers listed and nothing in background, we're done */ - if (!(quitmode && argc == 2) && pid == -1 && querylist == NULL) { - (void)fputs(_("fetchmail: no mailservers have been specified.\n"),stderr); + if (!quitonly && pid == 0 && querylist == NULL) { + (void)fputs(GT_("fetchmail: no mailservers have been specified.\n"),stderr); exit(PS_SYNTAX); } /* perhaps user asked us to kill the other fetchmail */ if (quitmode) { - if (pid == -1) + if (pid == 0 || pid == getpid()) + /* this test enables re-execing on a changed rcfile + * for pid == getpid() */ { - fprintf(stderr,_("fetchmail: no other fetchmail is running\n")); - if (argc == 2) + if (quitonly) { + fprintf(stderr,GT_("fetchmail: no other fetchmail is running\n")); exit(PS_EXCLUDE); + } } else if (kill(pid, SIGTERM) < 0) { - fprintf(stderr,_("fetchmail: error killing %s fetchmail at %d; bailing out.\n"), - bkgd ? _("background") : _("foreground"), pid); + fprintf(stderr,GT_("fetchmail: error killing %s fetchmail at %ld; bailing out.\n"), + bkgd ? GT_("background") : GT_("foreground"), (long)pid); exit(PS_EXCLUDE); } else { - fprintf(stderr,_("fetchmail: %s fetchmail at %d killed.\n"), - bkgd ? _("background") : _("foreground"), pid); - unlink(lockfile); - if (argc == 2) + int maxwait; + + if (outlevel > O_SILENT) + fprintf(stderr,GT_("fetchmail: %s fetchmail at %ld killed.\n"), + bkgd ? GT_("background") : GT_("foreground"), (long)pid); + /* We used to nuke the other process's lock here, with + * fm_lock_release(), which is broken. The other process + * needs to clear its lock by itself. */ + if (quitonly) exit(0); - else - pid = -1; + + /* wait for other process to exit */ + maxwait = 10; /* seconds */ + while (kill(pid, 0) == 0 && --maxwait >= 0) { + sleep(1); + } + pid = 0; } } /* another fetchmail is running -- wake it up or die */ - if (pid != -1) + if (pid != 0) { if (check_only) { fprintf(stderr, - _("fetchmail: can't check mail while another fetchmail to same host is running.\n")); + GT_("fetchmail: can't check mail while another fetchmail to same host is running.\n")); return(PS_EXCLUDE); } else if (!implicitmode) { fprintf(stderr, - _("fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"), - pid); + GT_("fetchmail: can't poll specified hosts with another fetchmail running at %ld.\n"), + (long)pid); return(PS_EXCLUDE); } else if (!bkgd) { fprintf(stderr, - _("fetchmail: another foreground fetchmail is running at %d.\n"), - pid); + GT_("fetchmail: another foreground fetchmail is running at %ld.\n"), + (long)pid); return(PS_EXCLUDE); } + else if (getpid() == pid) + /* this test enables re-execing on a changed rcfile */ + fm_lock_assert(); else if (argc > 1) { - /* this test enables re-execing on a changed rcfile */ - if (getpid() == pid) - lock_acquired = TRUE; - else - { - fprintf(stderr, - _("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) { fprintf(stderr, - _("fetchmail: background fetchmail at %d awakened.\n"), - pid); + GT_("fetchmail: background fetchmail at %ld awakened.\n"), + (long)pid); return(0); } else @@ -486,8 +523,8 @@ int main(int argc, char **argv) * SIGUSR1/SIGHUP transmission. */ fprintf(stderr, - _("fetchmail: elder sibling at %d died mysteriously.\n"), - pid); + GT_("fetchmail: elder sibling at %ld died mysteriously.\n"), + (long)pid); return(PS_UNDEFINED); } } @@ -496,30 +533,23 @@ int main(int argc, char **argv) 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) + && !NO_PASSWORD(ctl) && !ctl->password) { if (!isatty(0)) { fprintf(stderr, - _("fetchmail: can't find a password for %s@%s.\n"), + GT_("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: "); + } 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 = (char *)xmalloc(pplen); + snprintf(tmpbuf, pplen, password_prompt, + ctl->remotename, ctl->server.pollname); ctl->password = xstrdup((char *)fm_getpassword(tmpbuf)); + free(tmpbuf); } } } @@ -533,63 +563,71 @@ int main(int argc, char **argv) SOCKSinit("fetchmail"); #endif /* HAVE_SOCKS */ + /* avoid zombies from plugins */ + deal_with_sigchld(); + + /* Fix up log destination - if the if() is true, the precedence rule + * above hasn't killed off the syslog option, because the logfile + * option is ineffective (because we're not detached or not in + * deamon mode), so kill it for the benefit of other parts of the + * code. */ + if (run.logfile && run.use_syslog) + run.logfile = 0; + /* * Maybe time to go to demon mode... */ if (run.poll_interval) { - if (!nodetach) - daemonize(run.logfile, terminate_run); - report(stdout, _("starting fetchmail %s daemon \n"), VERSION); + if (!nodetach) { + int rc; + + rc = daemonize(run.logfile); + if (rc) { + report(stderr, GT_("fetchmail: Cannot detach into background. Aborting.\n")); + exit(rc); + } + } + report(stdout, GT_("starting fetchmail %s daemon\n"), VERSION); /* * 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) + else { - freopen(run.logfile, "a", stdout); - freopen(run.logfile, "a", stderr); + /* not in daemon mode */ + 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); + if (!freopen(run.logfile, "a", stderr)) + report(stdout, GT_("could not open %s to append logs to\n"), run.logfile); + if (run.use_syslog) + report(stdout, GT_("fetchmail: Warning: syslog and logfile are set. Check both for logs!\n")); + } } - -#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, SIG_IGN); + set_signal_handler(SIGQUIT, terminate_run); /* here's the exclusion lock */ -#ifndef O_SYNC -#define O_SYNC 0 /* use it if we have it */ -#endif - 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); + fm_lock_or_die(); + + if (check_only && outlevel >= O_VERBOSE) { + report(stdout, GT_("--check mode enabled, not fetching mail\n")); } /* @@ -606,33 +644,66 @@ int main(int argc, char **argv) */ struct stat rcstat; - if (stat(rcfile, &rcstat) == -1) - { + if (strcmp(rcfile, "-") == 0) { + /* do nothing */ + } else if (stat(rcfile, &rcstat) == -1) { if (errno != ENOENT) report(stderr, - _("couldn't time-check %s (error %d)\n"), + GT_("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); - report(stderr, _("attempt to re-exec fetchmail failed\n")); + 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 + * 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, GT_("attempt to re-exec fetchmail failed\n")); } -#if defined(HAVE_RES_SEARCH) && defined(USE_TCPIP_FOR_DNS) - /* - * This was an efficiency hack that backfired. The theory - * was that using TCP/IP for DNS queries would get us better - * 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 - * 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 */ +#ifdef HAVE_RES_SEARCH + /* Boldly assume that we also have res_init() if we have + * res_search(), and call res_init() to re-read the resolv.conf + * file, so that we can pick up changes to that file that are + * written by dhpccd, dhclient, pppd, openvpn and similar. */ + + /* NOTE: This assumes that /etc/resolv.conf is written + * atomically (i. e. a temporary file is written, flushed and + * then renamed into place). To fix Debian Bug#389270. */ + + /* NOTE: If this leaks memory or doesn't re-read + * /etc/resolv.conf, we're in trouble. The res_init() interface + * is only lightly documented :-( */ + res_init(); +#endif activecount = 0; batchcount = 0; @@ -645,7 +716,7 @@ int main(int argc, char **argv) if (ctl->wedged) { report(stderr, - _("poll of %s skipped (failed authentication or too many timeouts)\n"), + GT_("poll of %s skipped (failed authentication or too many timeouts)\n"), ctl->server.pollname); continue; } @@ -657,28 +728,35 @@ int main(int argc, char **argv) { if (outlevel >= O_VERBOSE) report(stdout, - _("interval not reached, not querying %s\n"), + GT_("interval not reached, not querying %s\n"), ctl->server.pollname); continue; } } -#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) @@ -688,39 +766,39 @@ int main(int argc, char **argv) switch(querystatus) { case PS_SUCCESS: - report(stdout,_("Query status=0 (SUCCESS)\n"));break; + report(stdout,GT_("Query status=0 (SUCCESS)\n"));break; case PS_NOMAIL: - report(stdout,_("Query status=1 (NOMAIL)\n")); break; + report(stdout,GT_("Query status=1 (NOMAIL)\n")); break; case PS_SOCKET: - report(stdout,_("Query status=2 (SOCKET)\n")); break; + report(stdout,GT_("Query status=2 (SOCKET)\n")); break; case PS_AUTHFAIL: - report(stdout,_("Query status=3 (AUTHFAIL)\n"));break; + report(stdout,GT_("Query status=3 (AUTHFAIL)\n"));break; case PS_PROTOCOL: - report(stdout,_("Query status=4 (PROTOCOL)\n"));break; + report(stdout,GT_("Query status=4 (PROTOCOL)\n"));break; case PS_SYNTAX: - report(stdout,_("Query status=5 (SYNTAX)\n")); break; + report(stdout,GT_("Query status=5 (SYNTAX)\n")); break; case PS_IOERR: - report(stdout,_("Query status=6 (IOERR)\n")); break; + report(stdout,GT_("Query status=6 (IOERR)\n")); break; case PS_ERROR: - report(stdout,_("Query status=7 (ERROR)\n")); break; + report(stdout,GT_("Query status=7 (ERROR)\n")); break; case PS_EXCLUDE: - report(stdout,_("Query status=8 (EXCLUDE)\n")); break; + report(stdout,GT_("Query status=8 (EXCLUDE)\n")); break; case PS_LOCKBUSY: - report(stdout,_("Query status=9 (LOCKBUSY)\n"));break; + report(stdout,GT_("Query status=9 (LOCKBUSY)\n"));break; case PS_SMTP: - report(stdout,_("Query status=10 (SMTP)\n")); break; + report(stdout,GT_("Query status=10 (SMTP)\n")); break; case PS_DNS: - report(stdout,_("Query status=11 (DNS)\n")); break; + report(stdout,GT_("Query status=11 (DNS)\n")); break; case PS_BSMTP: - report(stdout,_("Query status=12 (BSMTP)\n")); break; + report(stdout,GT_("Query status=12 (BSMTP)\n")); break; case PS_MAXFETCH: - report(stdout,_("Query status=13 (MAXFETCH)\n"));break; + report(stdout,GT_("Query status=13 (MAXFETCH)\n"));break; default: - report(stdout,_("Query status=%d\n"),querystatus); + report(stdout,GT_("Query status=%d\n"),querystatus); break; } -#if (defined(linux) && !INET6_ENABLE) || defined (__FreeBSD__) +#ifdef CAN_MONITOR if (ctl->server.monitor) { /* @@ -731,14 +809,10 @@ int main(int argc, char **argv) sleep(3); interface_note_activity(&ctl->server); } -#endif /* (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__) */ +#endif /* CAN_MONITOR */ } } -#if defined(HAVE_RES_SEARCH) && defined(USE_TCPIP_FOR_DNS) - endhostent(); /* release TCP/IP connection to nameserver */ -#endif /* HAVE_RES_SEARCH */ - /* close connections cleanly */ terminate_poll(0); @@ -762,46 +836,66 @@ int main(int argc, char **argv) unwedged++; if (!unwedged) { - report(stderr, _("All connections are wedged. Exiting.\n")); + report(stderr, GT_("All connections are wedged. Exiting.\n")); /* FIXME: someday, send notification mail */ exit(PS_AUTHFAIL); } - if (outlevel >= O_VERBOSE) - report(stdout, - _("fetchmail: sleeping at %s\n"), timestamp()); + if ((outlevel > O_SILENT && !run.use_syslog && isatty(1)) + || outlevel > O_NORMAL) + report(stdout, + GT_("sleeping at %s for %d seconds\n"), timestamp(), run.poll_interval); + + /* + * 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 util it's time for the next poll cycle. + * OK, now pause until 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. */ if ((lastsig = interruptible_idle(run.poll_interval))) { + if (outlevel > O_SILENT) #ifdef SYS_SIGLIST_DECLARED - report(stdout, - _("awakened by %s\n"), sys_siglist[lastsig]); + report(stdout, + GT_("awakened by %s\n"), sys_siglist[lastsig]); #else - report(stdout, - _("awakened by signal %d\n"), lastsig); + report(stdout, + GT_("awakened by signal %d\n"), lastsig); #endif for (ctl = querylist; ctl; ctl = ctl->next) ctl->wedged = FALSE; } - if (outlevel >= O_VERBOSE) - report(stdout, _("awakened at %s\n"), timestamp()); + if ((outlevel > O_SILENT && !run.use_syslog && isatty(1)) + || outlevel > O_NORMAL) + report(stdout, GT_("awakened at %s\n"), timestamp()); } - } while - (run.poll_interval); + } while (run.poll_interval); if (outlevel >= O_VERBOSE) - report(stdout, _("normal termination, status %d\n"), + report(stdout, GT_("normal termination, status %d\n"), 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); } static void list_merge(struct idlist **dstl, struct idlist **srcl, int force) @@ -826,19 +920,15 @@ static void optmerge(struct query *h2, struct query *h1, int 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->domainlist, &h1->domainlist, 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.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.preauthenticate); + FLAG_MERGE(server.authenticate); FLAG_MERGE(server.timeout); FLAG_MERGE(server.envelope); FLAG_MERGE(server.envskip); @@ -849,14 +939,16 @@ static void optmerge(struct query *h2, struct query *h1, int force) 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(server.badheader); FLAG_MERGE(wildcard); FLAG_MERGE(remotename); @@ -871,6 +963,7 @@ static void optmerge(struct query *h2, struct query *h1, int force) FLAG_MERGE(keep); FLAG_MERGE(flush); + FLAG_MERGE(limitflush); FLAG_MERGE(fetchall); FLAG_MERGE(rewrite); FLAG_MERGE(forcecr); @@ -883,11 +976,19 @@ static void optmerge(struct query *h2, struct query *h1, int force) 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); FLAG_MERGE(sslkey); FLAG_MERGE(sslcert); + FLAG_MERGE(sslproto); + FLAG_MERGE(sslcertck); + FLAG_MERGE(sslcertfile); + FLAG_MERGE(sslcertpath); + FLAG_MERGE(sslcommonname); + FLAG_MERGE(sslfingerprint); #endif FLAG_MERGE(expunge); @@ -895,39 +996,55 @@ static void optmerge(struct query *h2, struct query *h1, int force) #undef FLAG_MERGE } +/** Load configuration files. + * \return - true if no servers found on the command line + * - false if servers found on the command line */ static int load_params(int argc, char **argv, int optind) { int implicitmode, st; struct passwd *pw; struct query def_opts, *ctl; struct stat rcstat; + char *p; run.bouncemail = TRUE; + run.softbounce = TRUE; /* treat permanent errors as temporary */ 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 */ - 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.server.badheader = BHREJECT; def_opts.warnings = WARNING_INTERVAL; def_opts.remotename = user; def_opts.listener = SMTP_MODE; + def_opts.fetchsizelimit = 100; + def_opts.fastuidl = 4; + + /* get the location of rcfile */ + rcfiledir[0] = 0; + p = strrchr (rcfile, '/'); + if (p && (size_t)(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 (stat(rcfile, &rcstat) != -1) - parsetime = rcstat.st_mtime; - else if (errno != ENOENT) - report(stderr, _("couldn't time-check the run-control file\n")); + if (strcmp(rcfile, "-") == 0) + parsetime = time(NULL); + else { + if (stat(rcfile, &rcstat) != -1) + parsetime = rcstat.st_mtime; + else if (errno != ENOENT) + report(stderr, GT_("couldn't time-check the run-control file\n")); + } /* this builds the host list */ if ((st = prc_parse_file(rcfile, !versioninfo)) != 0) @@ -942,7 +1059,7 @@ static int load_params(int argc, char **argv, int optind) if ((implicitmode = (optind >= argc))) { for (ctl = querylist; ctl; ctl = ctl->next) - ctl->active = TRUE; + ctl->active = !ctl->server.skip; } else for (; optind < argc; optind++) @@ -959,8 +1076,8 @@ static int load_params(int argc, char **argv, int optind) || str_in_list(&ctl->server.akalist, argv[optind], TRUE)) { /* Is this correct? */ - if (predeclared && outlevel == O_VERBOSE) - fprintf(stderr,_("Warning: multiple mentions of host %s in config file\n"),argv[optind]); + if (predeclared && outlevel >= O_VERBOSE) + fprintf(stderr,GT_("Warning: multiple mentions of host %s in config file\n"),argv[optind]); ctl->active = TRUE; predeclared = TRUE; } @@ -982,18 +1099,27 @@ static int load_params(int argc, char **argv, int optind) /* * If there's a defaults record, merge it and lose it. + * FIXME: we don't currently free all entries that might be in struct query. */ if (querylist && strcmp(querylist->server.pollname, "defaults") == 0) { + struct query *tmpq; + for (ctl = querylist->next; ctl; ctl = ctl->next) optmerge(ctl, querylist, FALSE); + tmpq = querylist; querylist = querylist->next; + free(tmpq->server.pollname); + free(tmpq); } /* don't allow a defaults record after the first */ - for (ctl = querylist; ctl; ctl = ctl->next) - if (ctl != querylist && strcmp(ctl->server.pollname, "defaults") == 0) + for (ctl = querylist; ctl; ctl = ctl->next) { + if (ctl != querylist && strcmp(ctl->server.pollname, "defaults") == 0) { + fprintf(stderr, GT_("fetchmail: Error: multiple \"defaults\" records in config file.\n")); exit(PS_SYNTAX); + } + } /* use localhost if we never fetch the FQDN of this host */ fetchmailhost = "localhost"; @@ -1003,47 +1129,95 @@ static int load_params(int argc, char **argv, int optind) run.logfile = cmd_run.logfile; if (cmd_run.idfile) run.idfile = cmd_run.idfile; + if (cmd_run.pidfile) + run.pidfile = cmd_run.pidfile; /* 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; + run.invisible = (cmd_run.invisible == FLAG_TRUE); if (cmd_run.showdots) - run.showdots = cmd_run.showdots; + run.showdots = (cmd_run.showdots == FLAG_TRUE); 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; + run.bouncemail = (cmd_run.bouncemail == FLAG_TRUE); + if (cmd_run.softbounce) + run.softbounce = (cmd_run.softbounce == FLAG_TRUE); /* 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 */ + /* + * DNS support is required for some protocols. We used to + * do this unconditionally, but it made fetchmail excessively + * vulnerable to misconfigured DNS setups. + * + * 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. + */ for (ctl = querylist; ctl; ctl = ctl->next) - { - ctl->wedged = FALSE; - - if (configdump || ctl->active ) + 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)) { - /* merge in defaults */ - optmerge(ctl, &def_opts, FALSE); + fetchmailhost = host_fqdn(1); + break; + } - /* force command-line options */ - optmerge(ctl, &cmd_opts, TRUE); + if (!ctl) /* list exhausted */ + fetchmailhost = host_fqdn(0); - /* 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) + + /* 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); @@ -1054,36 +1228,51 @@ static int load_params(int argc, char **argv, int optind) DEFAULT(ctl->idle, FALSE); DEFAULT(ctl->server.dns, TRUE); DEFAULT(ctl->server.uidl, FALSE); -#ifdef SSL_ENABLE DEFAULT(ctl->use_ssl, FALSE); -#endif + DEFAULT(ctl->sslcertck, FALSE); DEFAULT(ctl->server.checkalias, FALSE); -#undef DEFAULT - +#ifndef SSL_ENABLE /* - * DNS support is required for some protocols. We used to - * 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 Kerberos for authentication, we need - * the FQDN in order to generate capability keys. + * XXX FIXME: do we need this check or can we rely on the .y + * parser handling this? */ - if (ctl->server.protocol == P_ETRN - || ctl->server.preauthenticate == A_KERBEROS_V4 - || ctl->server.preauthenticate == A_KERBEROS_V5) - if (strcmp(fetchmailhost, "localhost") == 0) - fetchmailhost = host_fqdn(); + if (ctl->use_ssl) + { + report(stderr, GT_("SSL support is not compiled in.\n")); + exit(PS_SYNTAX); + } +#endif /* SSL_ENABLE */ +#undef DEFAULT +#ifndef KERBEROS_V4 + if (ctl->server.authenticate == A_KERBEROS_V4) { + report(stderr, GT_("KERBEROS v4 support is configured, but not compiled in.\n")); + exit(PS_SYNTAX); + } +#endif +#ifndef KERBEROS_V5 + if (ctl->server.authenticate == A_KERBEROS_V5) { + report(stderr, GT_("KERBEROS v5 support is configured, but not compiled in.\n")); + exit(PS_SYNTAX); + } +#endif +#ifndef GSSAPI + if (ctl->server.authenticate == A_GSSAPI) { + report(stderr, GT_("GSSAPI support is configured, but not compiled in.\n")); + exit(PS_SYNTAX); + } +#endif /* * Make sure we have a nonempty host list to forward to. */ if (!ctl->smtphunt) - save_str(&ctl->smtphunt, fetchmailhost, FALSE); + save_str(&ctl->smtphunt, "localhost", FALSE); + + /* + * Make sure we have a nonempty list of domains to fetch from. + */ + if ((ctl->server.protocol==P_ETRN || ctl->server.protocol==P_ODMR) && !ctl->domainlist) + save_str(&ctl->domainlist, fetchmailhost, FALSE); /* if `user' doesn't name a real local user, try to run as root */ if ((pw = getpwnam(user)) == (struct passwd *)NULL) @@ -1093,134 +1282,24 @@ static int load_params(int argc, char **argv, int optind) 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, _("fetchmail: warning: no DNS available to check multidrop fetches from %s\n"), ctl->server.pollname); + report(stderr, GT_("fetchmail: warning: no DNS available to check multidrop fetches from %s\n"), ctl->server.pollname); } -#endif /* !HAVE_GETHOSTBYNAME || !HAVE_RES_SEARCH */ - - /* - * - * Compute the true name of the mailserver host. - * There are two clashing cases here: - * - * (1) The poll name is a label, possibly on one of several - * poll configurations for the same host. In this case - * the `via' option will be present and give the true name. - * - * (2) The poll name is the true one, the via name is - * localhost. This is going to be typical for ssh-using - * configurations. - * - * We're going to assume the via name is true unless it's - * localhost. - */ - if (ctl->server.via && strcmp(ctl->server.via, "localhost")) - ctl->server.queryname = xstrdup(ctl->server.via); - else - ctl->server.queryname = xstrdup(ctl->server.pollname); - -#ifdef HESIOD - /* If either the pollname or vianame are "hesiod" we want to - lookup the user's hesiod pobox host */ - - if (!strcasecmp(ctl->server.queryname, "hesiod")) { - struct hes_postoffice *hes_p; - hes_p = hes_getmailhost(ctl->remotename); - if (hes_p != NULL && strcmp(hes_p->po_type, "POP") == 0) { - free(ctl->server.queryname); - ctl->server.queryname = xstrdup(hes_p->po_host); - if (ctl->server.via) - free(ctl->server.via); - ctl->server.via = xstrdup(hes_p->po_host); - } else { - report(stderr, - _("couldn't find HESIOD pobox for %s\n"), - ctl->remotename); - } - } -#endif /* HESIOD */ +#endif /* !HAVE_RES_SEARCH */ /* - * We may have to canonicalize the server truename for later use. - * Do this just once for each lead server, if necessary, in order - * to minimize DNS round trips. + * can't handle multidrop mailboxes without "envelope" + * option, this causes truckloads full of support complaints + * "all mail forwarded to postmaster" */ - if (ctl->server.lead_server) - { - char *leadname = ctl->server.lead_server->truename; - - /* prevent core dump from ill-formed or duplicate entry */ - if (!leadname) - { - report(stderr, _("Lead server has no name.\n")); - exit(PS_SYNTAX); - } - - ctl->server.truename = xstrdup(leadname); - } -#ifdef HAVE_GETHOSTBYNAME - else if (!configdump) + if (MULTIDROP(ctl) && !ctl->server.envelope) { - if (ctl->server.preauthenticate==A_KERBEROS_V4 || - ctl->server.preauthenticate==A_KERBEROS_V5 || - (ctl->server.dns && MULTIDROP(ctl))) - { - 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); - } -#endif /* HAVE_GETHOSTBYNAME */ - else { -#ifdef HAVE_GETHOSTBYNAME - struct hostent *namerec; - - /* - 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 */ - } + 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 */ @@ -1228,24 +1307,26 @@ static int load_params(int argc, char **argv, int optind) 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, - _("%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, - _("%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_("fetchmail: %s configuration invalid, specify positive port number for service or port\n"), + ctl->server.pollname); + exit(PS_SYNTAX); + } + if (ctl->server.protocol == P_RPOP && port >= 1024) + { + (void) fprintf(stderr, + GT_("fetchmail: %s configuration invalid, RPOP requires a privileged port\n"), + ctl->server.pollname); + exit(PS_SYNTAX); + } } if (ctl->listener == LMTP_MODE) { @@ -1255,46 +1336,37 @@ static int load_params(int argc, char **argv, int optind) { char *cp; - if (!(cp = strrchr(idp->id, '/')) || - (atoi(++cp) == SMTP_PORT)) + if (!(cp = strrchr(idp->id, '/')) + || (0 == strcmp(cp + 1, SMTP_PORT)) + || servport(cp + 1) == SMTP_PORT_NUM) { (void) fprintf(stderr, - _("%s configuration invalid, LMTP can't use default SMTP port\n"), + GT_("%s configuration invalid, LMTP can't use default SMTP port\n"), ctl->server.pollname); exit(PS_SYNTAX); } } } -#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 (ctl->fetchall && ctl->keep && (run.poll_interval || ctl->idle) && !nodetach && !configdump) { (void) fprintf(stderr, - _("Both fetchall and keep on in daemon mode is a mistake!\n")); - exit(PS_SYNTAX); + GT_("Both fetchall and keep on in daemon or idle mode is a mistake!\n")); } } } -#ifdef POP3_ENABLE - /* initialize UID handling */ - if (!versioninfo && (st = prc_filecheck(run.idfile, !versioninfo)) != 0) - exit(st); - else - initialize_saved_lists(querylist, run.idfile); -#endif /* POP3_ENABLE */ - /* * If the user didn't set a last-resort user to get misaddressed * multidrop mail, set an appropriate default here. */ if (!run.postmaster) { - if (getuid()) /* ordinary user */ + if (getuid() != ROOT_UID) /* ordinary user */ run.postmaster = user; else /* root */ run.postmaster = "postmaster"; @@ -1303,41 +1375,12 @@ static int load_params(int argc, char **argv, int optind) return(implicitmode); } -static void terminate_poll(int sig) +static RETSIGTYPE terminate_poll(int sig) /* to be executed at the end of a poll cycle */ { - /* - * Close all SMTP delivery sockets. For optimum performance - * we'd like to hold them open til end of run, but (1) this - * loses if our poll interval is longer than the MTA's inactivity - * timeout, and (2) some MTAs (like smail) don't deliver after - * each message, but rather queue up mail and wait to actually - * deliver it until the input socket is closed. - * - * Sending SMTP QUIT on signal is theoretically nice, but led to a - * subtle bug. If fetchmail was terminated by signal while it was - * shipping message text, it would hang forever waiting for a - * command acknowledge. In theory we could enable the QUIT - * only outside of the message send. In practice, we don't - * care. All mailservers hang up on a dropped TCP/IP connection - * anyway. - */ if (sig != 0) - report(stdout, _("terminated with signal %d\n"), sig); - else - { - struct query *ctl; - - /* terminate all SMTP connections cleanly */ - for (ctl = querylist; ctl; ctl = ctl->next) - if (ctl->smtp_socket != -1) - { - SMTP_quit(ctl->smtp_socket); - SockClose(ctl->smtp_socket); - ctl->smtp_socket = -1; - } - } + report(stdout, GT_("terminated with signal %d\n"), sig); #ifdef POP3_ENABLE /* @@ -1350,7 +1393,7 @@ static void terminate_poll(int sig) #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; @@ -1372,8 +1415,8 @@ static void terminate_run(int sig) if (ctl->password) memset(ctl->password, '\0', strlen(ctl->password)); -#if !defined(HAVE_ATEXIT) && !defined(HAVE_ON_EXIT) - unlockit(); +#if !defined(HAVE_ATEXIT) + fm_lock_release(); #endif if (activecount == 0) @@ -1401,77 +1444,101 @@ static const int autoprobe[] = static int query_host(struct query *ctl) /* perform fetch transaction with single host */ { - int i, st; + size_t i; + int st = 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, _("%s querying %s (protocol %s) at %s\n"), + report(stdout, GT_("%s querying %s (protocol %s) at %s: poll started\n"), VERSION, ctl->server.pollname, showproto(ctl->server.protocol), timestamp()); } + switch (ctl->server.protocol) { case P_AUTO: for (i = 0; i < sizeof(autoprobe)/sizeof(autoprobe[0]); i++) { ctl->server.protocol = autoprobe[i]; - if ((st = query_host(ctl)) == PS_SUCCESS || st == PS_NOMAIL || st == PS_AUTHFAIL || st == PS_LOCKBUSY || st == PS_SMTP) + 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; - return(st); + break; case P_POP2: #ifdef POP2_ENABLE - return(doPOP2(ctl)); + st = doPOP2(ctl); #else - report(stderr, _("POP2 support is not configured.\n")); - return(PS_PROTOCOL); + report(stderr, GT_("POP2 support is not configured.\n")); + st = PS_PROTOCOL; #endif /* POP2_ENABLE */ break; case P_POP3: case P_APOP: case P_RPOP: #ifdef POP3_ENABLE - return(doPOP3(ctl)); + do { + st = doPOP3(ctl); + } while (st == PS_REPOLL); #else - report(stderr, _("POP3 support is not configured.\n")); - return(PS_PROTOCOL); + report(stderr, GT_("POP3 support is not configured.\n")); + st = PS_PROTOCOL; #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 */ #ifdef IMAP_ENABLE - return(doIMAP(ctl)); + do { + st = doIMAP(ctl); + } while (st == PS_REPOLL); #else - report(stderr, _("IMAP support is not configured.\n")); - return(PS_PROTOCOL); + report(stderr, GT_("IMAP support is not configured.\n")); + st = PS_PROTOCOL; #endif /* IMAP_ENABLE */ + break; case P_ETRN: #ifndef ETRN_ENABLE - report(stderr, _("ETRN support is not configured.\n")); - return(PS_PROTOCOL); + report(stderr, GT_("ETRN support is not configured.\n")); + st = PS_PROTOCOL; #else -#ifdef HAVE_GETHOSTBYNAME - return(doETRN(ctl)); -#else - report(stderr, _("Cannot support ETRN without gethostbyname(2).\n")); - return(PS_PROTOCOL); -#endif /* HAVE_GETHOSTBYNAME */ + st = doETRN(ctl); + break; #endif /* ETRN_ENABLE */ + case P_ODMR: +#ifndef ODMR_ENABLE + report(stderr, GT_("ODMR support is not configured.\n")); + st = PS_PROTOCOL; +#else + st = doODMR(ctl); +#endif /* ODMR_ENABLE */ + break; default: - report(stderr, _("unsupported protocol selected.\n")); - return(PS_PROTOCOL); + report(stderr, GT_("unsupported protocol selected.\n")); + st = PS_PROTOCOL; + } + + /* + * If we're syslogging the progress messages are automatically timestamped. + * Force timestamping if we're going to a logfile. + */ + if (outlevel >= O_VERBOSE) + { + report(stdout, GT_("%s querying %s (protocol %s) at %s: poll completed\n"), + VERSION, + ctl->server.pollname, + showproto(ctl->server.protocol), + timestamp()); } + + return(st); } static void dump_params (struct runctl *runp, @@ -1481,245 +1548,307 @@ static void dump_params (struct runctl *runp, struct query *ctl; if (runp->poll_interval) - printf(_("Poll interval is %d seconds\n"), runp->poll_interval); + printf(GT_("Poll interval is %d seconds\n"), runp->poll_interval); if (runp->logfile) - printf(_("Logfile is %s\n"), runp->logfile); + printf(GT_("Logfile is %s\n"), runp->logfile); if (strcmp(runp->idfile, IDFILE_NAME)) - printf(_("Idfile is %s\n"), runp->idfile); + printf(GT_("Idfile is %s\n"), runp->idfile); #if defined(HAVE_SYSLOG) if (runp->use_syslog) - printf(_("Progress messages will be logged via syslog\n")); + printf(GT_("Progress messages will be logged via syslog\n")); #endif if (runp->invisible) - printf(_("Fetchmail will masquerade and will not generate Received\n")); + printf(GT_("Fetchmail will masquerade and will not generate Received\n")); if (runp->showdots) - printf(_("Fetchmail will show progress dots even in logfiles.\n")); + printf(GT_("Fetchmail will show progress dots even in logfiles.\n")); if (runp->postmaster) - printf(_("Fetchmail will forward misaddressed multidrop messages to %s.\n"), + printf(GT_("Fetchmail will forward misaddressed multidrop messages to %s.\n"), runp->postmaster); if (!runp->bouncemail) - printf(_("Fetchmail will direct error mail to the postmaster.\n")); + printf(GT_("Fetchmail will direct error mail to the postmaster.\n")); else if (outlevel >= O_VERBOSE) - printf(_("Fetchmail will direct error mail to the sender.\n")); + printf(GT_("Fetchmail will direct error mail to the sender.\n")); + + if (!runp->softbounce) + printf(GT_("Fetchmail will treat permanent errors as permanent (drop messages).\n")); + else if (outlevel >= O_VERBOSE) + printf(GT_("Fetchmail will treat permanent errors as temporary (keep messages).\n")); for (ctl = querylist; ctl; ctl = ctl->next) { if (!ctl->active || (implicit && ctl->server.skip)) continue; - printf(_("Options for retrieving from %s@%s:\n"), + printf(GT_("Options for retrieving from %s@%s:\n"), ctl->remotename, visbuf(ctl->server.pollname)); - if (ctl->server.via && (ctl->server.protocol != P_ETRN)) - printf(_(" Mail will be retrieved via %s\n"), ctl->server.via); + if (ctl->server.via && MAILBOX_PROTOCOL(ctl)) + printf(GT_(" Mail will be retrieved via %s\n"), ctl->server.via); if (ctl->server.interval) - printf(_(" 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(_(" True name of server is %s.\n"), ctl->server.truename); + printf(GT_(" True name of server is %s.\n"), ctl->server.truename); 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"), + 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) + printf(GT_(" Password will be prompted for.\n")); + else if (outlevel >= O_VERBOSE) + { + if (ctl->server.protocol == P_APOP) + printf(GT_(" APOP secret = \"%s\".\n"), + visbuf(ctl->password)); + else if (ctl->server.protocol == P_RPOP) + printf(GT_(" RPOP id = \"%s\".\n"), + visbuf(ctl->password)); + else + printf(GT_(" Password = \"%s\".\n"), visbuf(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.preauthenticate == A_KERBEROS_V4 || - ctl->server.preauthenticate == A_KERBEROS_V5)) - printf(_(" Protocol is KPOP with Kerberos %s authentication"), - ctl->server.preauthenticate == A_KERBEROS_V5 ? "V" : "IV"); + && (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(_(" Protocol is %s"), showproto(ctl->server.protocol)); -#if INET6_ENABLE + printf(GT_(" Protocol is %s"), showproto(ctl->server.protocol)); if (ctl->server.service) - printf(_(" (using service %s)"), ctl->server.service); - if (ctl->server.netsec) - printf(_(" (using network security options %s)"), ctl->server.netsec); -#else /* INET6_ENABLE */ - if (ctl->server.port) - printf(_(" (using port %d)"), ctl->server.port); -#endif /* INET6_ENABLE */ + printf(GT_(" (using service %s)"), ctl->server.service); else if (outlevel >= O_VERBOSE) - printf(_(" (using default port)")); - if (ctl->server.uidl && (ctl->server.protocol != P_ETRN)) - printf(_(" (forcing UIDL use)")); + printf(GT_(" (using default port)")); + if (ctl->server.uidl && MAILBOX_PROTOCOL(ctl)) + printf(GT_(" (forcing UIDL use)")); putchar('.'); putchar('\n'); - if (ctl->server.preauthenticate == A_KERBEROS_V4) - printf(_(" Kerberos V4 preauthentication enabled.\n")); - else if (ctl->server.preauthenticate == A_KERBEROS_V5) - printf(_(" Kerberos V5 preauthentication enabled.\n")); - else if (ctl->server.preauthenticate == A_SSH) - printf(_(" End-to-end encryption assumed.\n")); - if (ctl->server.principal != (char *) NULL) { - printf(_(" Mail service principal is: %s\n"), ctl->server.principal); + switch (ctl->server.authenticate) + { + case A_ANY: + printf(GT_(" All available authentication methods will be tried.\n")); + break; + case A_PASSWORD: + printf(GT_(" Password authentication will be forced.\n")); + break; + case A_MSN: + printf(GT_(" MSN authentication will be forced.\n")); + break; + case A_NTLM: + printf(GT_(" NTLM authentication will be forced.\n")); + break; + case A_OTP: + printf(GT_(" OTP authentication will be forced.\n")); + break; + case A_CRAM_MD5: + printf(GT_(" CRAM-MD5 authentication will be forced.\n")); + break; + case A_GSSAPI: + printf(GT_(" GSSAPI authentication will be forced.\n")); + break; + case A_KERBEROS_V4: + printf(GT_(" Kerberos V4 authentication will be forced.\n")); + break; + case A_KERBEROS_V5: + printf(GT_(" Kerberos V5 authentication will be forced.\n")); + break; + case A_SSH: + printf(GT_(" End-to-end encryption assumed.\n")); + break; } + if (ctl->server.principal != (char *) NULL) + printf(GT_(" Mail service principal is: %s\n"), ctl->server.principal); #ifdef SSL_ENABLE if (ctl->use_ssl) - printf(" SSL encrypted sessions enabled.\n"); + 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->sslcertfile != NULL) + printf(GT_(" SSL trusted certificate file: %s\n"), ctl->sslcertfile); + if (ctl->sslcertpath != NULL) + printf(GT_(" SSL trusted certificate directory: %s\n"), ctl->sslcertpath); + if (ctl->sslcommonname != NULL) + printf(GT_(" SSL server CommonName: %s\n"), ctl->sslcommonname); + if (ctl->sslfingerprint != NULL) + printf(GT_(" SSL key fingerprint (checked against the server key): %s\n"), ctl->sslfingerprint); #endif if (ctl->server.timeout > 0) - printf(_(" Server nonresponse timeout is %d seconds"), ctl->server.timeout); + printf(GT_(" Server nonresponse timeout is %d seconds"), ctl->server.timeout); if (ctl->server.timeout == CLIENT_TIMEOUT) - printf(_(" (default).\n")); + printf(GT_(" (default).\n")); else printf(".\n"); - if (ctl->server.protocol != P_ETRN) { - if (!ctl->mailboxes->id) - printf(_(" Default mailbox selected.\n")); - else - { - struct idlist *idp; + if (MAILBOX_PROTOCOL(ctl)) + { + if (!ctl->mailboxes->id) + printf(GT_(" Default mailbox selected.\n")); + else + { + struct idlist *idp; - printf(_(" Selected mailboxes are:")); - for (idp = ctl->mailboxes; idp; idp = idp->next) - printf(" %s", idp->id); - printf("\n"); - } - printf(_(" %s messages will be retrieved (--all %s).\n"), - ctl->fetchall ? _("All") : _("Only new"), - ctl->fetchall ? "on" : "off"); - printf(_(" Fetched messages %s be kept on the server (--keep %s).\n"), - ctl->keep ? _("will") : _("will not"), - ctl->keep ? "on" : "off"); - printf(_(" Old messages %s be flushed before message retrieval (--flush %s).\n"), - ctl->flush ? _("will") : _("will not"), - ctl->flush ? "on" : "off"); - printf(_(" Rewrite of server-local addresses is %s (--norewrite %s).\n"), - ctl->rewrite ? _("enabled") : _("disabled"), - ctl->rewrite ? "off" : "on"); - printf(_(" Carriage-return stripping is %s (stripcr %s).\n"), - ctl->stripcr ? _("enabled") : _("disabled"), - ctl->stripcr ? "on" : "off"); - printf(_(" Carriage-return forcing is %s (forcecr %s).\n"), - ctl->forcecr ? _("enabled") : _("disabled"), - ctl->forcecr ? "on" : "off"); - printf(_(" Interpretation of Content-Transfer-Encoding is %s (pass8bits %s).\n"), - ctl->pass8bits ? _("disabled") : _("enabled"), - ctl->pass8bits ? "on" : "off"); - 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"); + printf(GT_(" Selected mailboxes are:")); + for (idp = ctl->mailboxes; idp; idp = idp->next) + printf(" %s", idp->id); + printf("\n"); + } + 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)) - { - if (NUM_NONZERO(ctl->limit)) - printf(_(" Message size limit is %d octets (--limit %d).\n"), - ctl->limit, ctl->limit); - else if (outlevel >= O_VERBOSE) - printf(_(" No message size limit (--limit 0).\n")); - if (run.poll_interval > 0) - printf(_(" Message size warning interval is %d seconds (--warnings %d).\n"), - ctl->warnings, ctl->warnings); - else if (outlevel >= O_VERBOSE) - printf(_(" Size warnings on every poll (--warnings 0).\n")); - } - if (NUM_NONZERO(ctl->fetchlimit)) - printf(_(" Received-message limit is %d (--fetchlimit %d).\n"), - ctl->fetchlimit, ctl->fetchlimit); + printf(GT_(" Message size limit is %d octets (--limit %d).\n"), + ctl->limit, ctl->limit); else if (outlevel >= O_VERBOSE) - printf(_(" No received-message limit (--fetchlimit 0).\n")); - if (NUM_NONZERO(ctl->batchlimit)) - printf(_(" SMTP message batch limit is %d.\n"), ctl->batchlimit); + printf(GT_(" No message size limit (--limit 0).\n")); + if (run.poll_interval > 0) + printf(GT_(" Message size warning interval is %d seconds (--warnings %d).\n"), + ctl->warnings, ctl->warnings); else if (outlevel >= O_VERBOSE) - printf(_(" No SMTP message batch limit (--batchlimit 0).\n")); - 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); - else if (outlevel >= O_VERBOSE) - printf(_(" No forced expunges (--expunge 0).\n")); - } + printf(GT_(" Size warnings on every poll (--warnings 0).\n")); + } + if (NUM_NONZERO(ctl->fetchlimit)) + printf(GT_(" Received-message limit is %d (--fetchlimit %d).\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_(" No SMTP message batch limit (--batchlimit 0).\n")); + if (MAILBOX_PROTOCOL(ctl)) + { + if (NUM_NONZERO(ctl->expunge)) + printf(GT_(" Deletion interval between expunges forced to %d (--expunge %d).\n"), ctl->expunge, ctl->expunge); + else if (outlevel >= O_VERBOSE) + printf(GT_(" No forced expunges (--expunge 0).\n")); + } } - 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)) - printf(_(" Messages will be delivered with \"%s\".\n"), visbuf(ctl->mda)); - else + else /* ODMR or ETRN */ { struct idlist *idp; - printf(_(" Messages will be %cMTP-forwarded to:"), ctl->listener); - for (idp = ctl->smtphunt; idp; idp = idp->next) + printf(GT_(" Domains for which mail will be fetched are:")); + for (idp = ctl->domainlist; idp; idp = idp->next) { - printf(" %s", idp->id); + printf(" %s", idp->id); if (!idp->val.status.mark) - printf(_(" (default)")); + printf(GT_(" (default)")); } printf("\n"); + } + if (ctl->bsmtp) + printf(GT_(" Messages will be appended to %s as BSMTP\n"), visbuf(ctl->bsmtp)); + else if (ctl->mda && MAILBOX_PROTOCOL(ctl)) + printf(GT_(" Messages will be delivered with \"%s\".\n"), visbuf(ctl->mda)); + else + { + struct idlist *idp; + + if (ctl->smtphunt) + { + printf(GT_(" Messages will be %cMTP-forwarded to:"), + ctl->listener); + for (idp = ctl->smtphunt; idp; idp = idp->next) + { + printf(" %s", idp->id); + if (!idp->val.status.mark) + printf(GT_(" (default)")); + } + printf("\n"); + } if (ctl->smtpaddress) - printf(_(" Host part of MAIL FROM line will be %s\n"), + printf(GT_(" 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"), + printf(GT_(" Address to be put in RCPT TO lines shipped to SMTP will be %s\n"), ctl->smtpname); } - if (ctl->server.protocol != P_ETRN) + if (MAILBOX_PROTOCOL(ctl)) { if (ctl->antispam != (struct idlist *)NULL) { struct idlist *idp; - printf(_(" Recognized listener spam block responses are:")); + printf(GT_(" Recognized listener spam block responses are:")); for (idp = ctl->antispam; idp; idp = idp->next) printf(" %d", idp->val.status.num); printf("\n"); } else if (outlevel >= O_VERBOSE) - printf(_(" Spam-blocking disabled\n")); + printf(GT_(" Spam-blocking disabled\n")); } if (ctl->preconnect) - printf(_(" Server connection will be brought up with \"%s\".\n"), + printf(GT_(" Server connection will be brought up with \"%s\".\n"), visbuf(ctl->preconnect)); else if (outlevel >= O_VERBOSE) - printf(_(" No pre-connection command.\n")); + printf(GT_(" No pre-connection command.\n")); if (ctl->postconnect) - printf(_(" Server connection will be taken down with \"%s\".\n"), + printf(GT_(" Server connection will be taken down with \"%s\".\n"), visbuf(ctl->postconnect)); else if (outlevel >= O_VERBOSE) - printf(_(" No post-connection command.\n")); - if (ctl->server.protocol != P_ETRN) { + printf(GT_(" No post-connection command.\n")); + if (MAILBOX_PROTOCOL(ctl)) { if (!ctl->localnames) - printf(_(" No localnames declared for this host.\n")); + printf(GT_(" No localnames declared for this host.\n")); else { struct idlist *idp; @@ -1729,11 +1858,11 @@ static void dump_params (struct runctl *runp, ++count; if (count > 1 || ctl->wildcard) - printf(_(" Multi-drop mode: ")); + printf(GT_(" Multi-drop mode: ")); else - printf(_(" Single-drop mode: ")); + printf(GT_(" Single-drop mode: ")); - printf(_("%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) @@ -1747,46 +1876,43 @@ static void dump_params (struct runctl *runp, if (count > 1 || ctl->wildcard) { - printf(_(" DNS lookup for multidrop addresses is %s.\n"), - ctl->server.dns ? _("enabled") : _("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(_(" Server aliases will be compared with multidrop addresses by ")); if (ctl->server.checkalias) - printf(_("IP address.\n")); + printf(GT_(" Server aliases will be compared with multidrop addresses by IP address.\n")); else - printf(_("name.\n")); + printf(GT_(" Server aliases will be compared with multidrop addresses by name.\n")); } if (ctl->server.envelope == STRING_DISABLED) - printf(_(" Envelope-address routing is disabled\n")); + printf(GT_(" Envelope-address routing is disabled\n")); else { - printf(_(" Envelope header is assumed to be: %s\n"), - ctl->server.envelope ? ctl->server.envelope:_("Received")); - if (ctl->server.envskip > 1 || outlevel >= O_VERBOSE) - printf(_(" Number of envelope header to be parsed: %d\n"), + printf(GT_(" Envelope header is assumed to be: %s\n"), + ctl->server.envelope ? ctl->server.envelope : "Received"); + if (ctl->server.envskip || outlevel >= O_VERBOSE) + printf(GT_(" Number of envelope headers to be skipped over: %d\n"), ctl->server.envskip); if (ctl->server.qvirtual) - printf(_(" Prefix %s will be removed from user id\n"), + printf(GT_(" Prefix %s will be removed from user id\n"), ctl->server.qvirtual); else if (outlevel >= O_VERBOSE) - printf(_(" No prefix stripping\n")); + printf(GT_(" No prefix stripping\n")); } if (ctl->server.akalist) { - struct idlist *idp; - - printf(_(" Predeclared mailserver aliases:")); + printf(GT_(" Predeclared mailserver aliases:")); for (idp = ctl->server.akalist; idp; idp = idp->next) printf(" %s", idp->id); putchar('\n'); } + if (ctl->server.localdomains) { - struct idlist *idp; - - printf(_(" Local domains:")); + printf(GT_(" Local domains:")); for (idp = ctl->server.localdomains; idp; idp = idp->next) printf(" %s", idp->id); putchar('\n'); @@ -1794,30 +1920,30 @@ static void dump_params (struct runctl *runp, } } } -#if defined(linux) || defined(__FreeBSD__) +#ifdef CAN_MONITOR if (ctl->server.interface) - printf(_(" Connection must be through interface %s.\n"), ctl->server.interface); + printf(GT_(" Connection must be through interface %s.\n"), ctl->server.interface); else if (outlevel >= O_VERBOSE) - printf(_(" No interface requirement specified.\n")); + printf(GT_(" No interface requirement specified.\n")); if (ctl->server.monitor) - printf(_(" Polling loop will monitor %s.\n"), ctl->server.monitor); + printf(GT_(" Polling loop will monitor %s.\n"), ctl->server.monitor); else if (outlevel >= O_VERBOSE) - printf(_(" No monitor interface specified.\n")); + printf(GT_(" No monitor interface specified.\n")); #endif if (ctl->server.plugin) - printf(_(" Server connections will be made via plugin %s (--plugin %s).\n"), ctl->server.plugin, ctl->server.plugin); + printf(GT_(" 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")); + printf(GT_(" No plugin command specified.\n")); if (ctl->server.plugout) - printf(_(" Listener connections will be made via plugout %s (--plugout %s).\n"), ctl->server.plugout, ctl->server.plugout); + printf(GT_(" 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")); + printf(GT_(" No plugout command specified.\n")); - if (ctl->server.protocol > P_POP2 && (ctl->server.protocol != P_ETRN)) + if (ctl->server.protocol > P_POP2 && MAILBOX_PROTOCOL(ctl)) { if (!ctl->oldsaved) - printf(_(" No UIDs saved from this host.\n")); + printf(GT_(" No UIDs saved from this host.\n")); else { struct idlist *idp; @@ -1826,15 +1952,30 @@ static void dump_params (struct runctl *runp, for (idp = ctl->oldsaved; idp; idp = idp->next) ++count; - printf(_(" %d UIDs saved.\n"), count); + 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); } } + 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")); + + switch (ctl->server.badheader) { + case BHREJECT: + if (outlevel >= O_VERBOSE) + printf(GT_(" Messages with bad headers will be rejected.\n")); + break; + case BHACCEPT: + printf(GT_(" Messages with bad headers will be passed on.\n")); + break; + } + if (ctl->properties) - printf(_(" Pass-through properties \"%s\".\n"), + printf(GT_(" Pass-through properties \"%s\".\n"), visbuf(ctl->properties)); } }