X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fetchmail.c;h=fa7b4625b60fa995325d7344bb7ee649b0481788;hb=26a916d0536f4048e3379bc7fe663ceb0944ce34;hp=0dfc7e41611c2faec2c66e8be772fab06cde2120;hpb=453cba9d2c57bf23987abace226f279d5d24f1a1;p=~andy%2Ffetchmail diff --git a/fetchmail.c b/fetchmail.c index 0dfc7e41..fa7b4625 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -31,19 +31,9 @@ #endif /* HAVE_SETRLIMIT */ #include -#ifdef HAVE_NET_SOCKET_H -#include -#endif -#ifdef HAVE_GETHOSTBYNAME -#include -#endif /* HAVE_GETHOSTBYNAME */ - -#ifdef HESIOD -#include -#endif - #include "getopt.h" #include "fetchmail.h" +#include "socket.h" #include "tunable.h" #include "smtp.h" #include "netrc.h" @@ -72,35 +62,23 @@ char *home; /* invoking user's home directory */ char *fmhome; /* fetchmail's home directory */ char *program_name; /* the name to prefix error messages with */ flag configdump; /* dump control blocks for configurator */ -const char *fetchmailhost; /* either `localhost' or the host's FQDN */ +char *fetchmailhost; /* either `localhost' or the host's FQDN */ #if NET_SECURITY void *request = NULL; int requestlen = 0; #endif /* NET_SECURITY */ -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); -} - -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) && defined(__FreeBSD_USE_KVM) /* drop SGID kmem privileage until we need it */ static void dropprivs(void) { @@ -121,23 +99,41 @@ static void dropprivs(void) } #endif +#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS) && defined(HAVE_STRFTIME) +#include +#include +static char *timestamp (void) +{ + time_t now; + static char buf[60]; + + time (&now); + setlocale (LC_TIME, ""); + strftime (buf, sizeof (buf), "%c", localtime(&now)); + setlocale (LC_TIME, "C"); + return (buf); +} +#else +#define timestamp rfc822timestamp +#endif + int main(int argc, char **argv) { - int st, bkgd = FALSE; + int bkgd = FALSE; int parsestatus, implicitmode = FALSE; - FILE *lockfp; struct query *ctl; netrc_entry *netrc_list; char *netrc_file, *tmpbuf; pid_t pid; int lastsig = 0; -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) && defined(__FreeBSD_USE_KVM) dropprivs(); #endif envquery(argc, argv); #ifdef ENABLE_NLS + setlocale (LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); #endif @@ -151,7 +147,7 @@ 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"); @@ -166,26 +162,21 @@ int main(int argc, char **argv) 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); -#endif + lock_dispose(); if ((parsestatus = parsecmdline(argc,argv, &cmd_run, &cmd_opts)) < 0) exit(PS_SYNTAX); if (versioninfo) { - printf(_("This is fetchmail release %s"), VERSION); + printf(GT_("This is fetchmail release %s"), VERSION); #ifdef POP2_ENABLE printf("+POP2"); #endif /* POP2_ENABLE */ @@ -210,6 +201,9 @@ int main(int argc, char **argv) #ifndef ETRN_ENABLE printf("-ETRN"); #endif /* ETRN_ENABLE */ +#ifndef ODMR_ENABLE + printf("-ODMR"); +#endif /* ODMR_ENABLE */ #ifdef SSL_ENABLE printf("+SSL"); #endif @@ -255,21 +249,8 @@ 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); - } -#undef FETCHMAIL_PIDFILE + /* construct the lockfile */ + lock_setup(); #ifdef HAVE_SETRLIMIT /* @@ -300,13 +281,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; @@ -338,16 +313,13 @@ int main(int argc, char **argv) { 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); @@ -362,80 +334,63 @@ 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 = 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 (!(quitmode && argc == 2) && 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) { - fprintf(stderr,_("fetchmail: no other fetchmail is running\n")); + fprintf(stderr,GT_("fetchmail: no other fetchmail is running\n")); if (argc == 2) 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 %d; bailing out.\n"), + bkgd ? GT_("background") : GT_("foreground"), pid); exit(PS_EXCLUDE); } else { - fprintf(stderr,_("fetchmail: %s fetchmail at %d killed.\n"), - bkgd ? _("background") : _("foreground"), pid); - unlink(lockfile); + fprintf(stderr,GT_("fetchmail: %s fetchmail at %d killed.\n"), + bkgd ? GT_("background") : GT_("foreground"), pid); + lock_release(); if (argc == 2) exit(0); else - pid = -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"), + GT_("fetchmail: can't poll specified hosts with another fetchmail running at %d.\n"), pid); return(PS_EXCLUDE); } else if (!bkgd) { fprintf(stderr, - _("fetchmail: another foreground fetchmail is running at %d.\n"), + GT_("fetchmail: another foreground fetchmail is running at %d.\n"), pid); return(PS_EXCLUDE); } @@ -443,18 +398,18 @@ int main(int argc, char **argv) { /* this test enables re-execing on a changed rcfile */ if (getpid() == pid) - lock_acquired = TRUE; + lock_assert(); else { fprintf(stderr, - _("fetchmail: can't accept options while a background fetchmail is running.\n")); + 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"), + GT_("fetchmail: background fetchmail at %d awakened.\n"), pid); return(0); } @@ -466,7 +421,7 @@ int main(int argc, char **argv) * SIGUSR1/SIGHUP transmission. */ fprintf(stderr, - _("fetchmail: elder sibling at %d died mysteriously.\n"), + GT_("fetchmail: elder sibling at %d died mysteriously.\n"), pid); return(PS_UNDEFINED); } @@ -476,22 +431,18 @@ 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: "); + char* password_prompt = GT_("Enter password for %s@%s: "); xalloca(tmpbuf, char *, strlen(password_prompt) + strlen(ctl->remotename) + @@ -500,6 +451,7 @@ int main(int argc, char **argv) ctl->remotename, ctl->server.pollname); ctl->password = xstrdup((char *)fm_getpassword(tmpbuf)); } + } } /* @@ -511,6 +463,9 @@ int main(int argc, char **argv) SOCKSinit("fetchmail"); #endif /* HAVE_SOCKS */ + /* avoid zombies from plugins */ + deal_with_sigchld(); + /* * Maybe time to go to demon mode... */ @@ -518,7 +473,7 @@ int main(int argc, char **argv) { if (!nodetach) daemonize(run.logfile, terminate_run); - report(stdout, _("starting fetchmail %s daemon \n"), VERSION); + report(stdout, GT_("starting fetchmail %s daemon \n"), VERSION); /* * We'll set up a handler for these when we're sleeping, @@ -528,13 +483,17 @@ int main(int argc, char **argv) if (run.poll_interval && !getuid()) signal(SIGHUP, SIG_IGN); } - else if (run.logfile && access(run.logfile, F_OK) == 0) + else { - freopen(run.logfile, "a", stdout); - freopen(run.logfile, "a", stderr); + if (run.logfile && 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); + } } - #ifdef linux interface_init(); #endif /* linux */ @@ -549,21 +508,7 @@ int main(int argc, char **argv) signal(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; - } + lock_or_die(); /* * Query all hosts. If there's only one, the error return will @@ -583,14 +528,37 @@ int main(int argc, char **argv) { 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); + /* + * 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) @@ -600,107 +568,113 @@ int main(int argc, char **argv) * reliability and shave off some per-UDP-packet costs. * Unfortunately it interacted badly with diald, which effectively * filters out DNS queries over TCP/IP for reasons having to do - * with some obscure kernel problem involving bootstrapping of + * with some obscure Linux kernel problem involving bootstrapping of * dynamically-addressed links. I don't understand this mess * and don't want to, so it's "See ya!" to this hack. */ sethostent(TRUE); /* use TCP/IP for mailserver queries */ #endif /* HAVE_RES_SEARCH */ + activecount = 0; batchcount = 0; for (ctl = querylist; ctl; ctl = ctl->next) - { - if (ctl->active && !(implicitmode && ctl->server.skip)) + if (ctl->active) { - if (ctl->wedged) - { - report(stderr, - _("poll of %s skipped (failed authentication or too many timeouts)\n"), - ctl->server.pollname); - continue; - } - - /* check skip interval first so that it counts all polls */ - if (run.poll_interval && ctl->server.interval) + activecount++; + if (!(implicitmode && ctl->server.skip)) { - if (ctl->server.poll_count++ % ctl->server.interval) + if (ctl->wedged) { - if (outlevel >= O_VERBOSE) - report(stdout, - _("interval not reached, not querying %s\n"), - ctl->server.pollname); + report(stderr, + GT_("poll of %s skipped (failed authentication or too many timeouts)\n"), + ctl->server.pollname); continue; } - } + + /* check skip interval first so that it counts all polls */ + if (run.poll_interval && ctl->server.interval) + { + if (ctl->server.poll_count++ % ctl->server.interval) + { + if (outlevel >= O_VERBOSE) + report(stdout, + GT_("interval not reached, not querying %s\n"), + ctl->server.pollname); + continue; + } + } #if (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__) - /* - * 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; + /* + * Don't do monitoring if we were woken by a signal. + * Note that interface_approve() does its own error logging. + */ + if (!interface_approve(&ctl->server, !lastsig)) + continue; #endif /* (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__) */ - querystatus = query_host(ctl); + querystatus = query_host(ctl); #ifdef POP3_ENABLE - if (!check_only) - uid_end_query(ctl); + /* leave the UIDL state alone if there have been any errors */ + if (!check_only && + ((querystatus==PS_SUCCESS) || (querystatus==PS_NOMAIL) || (querystatus==PS_MAXFETCH))) + uid_swap_lists(ctl); #endif /* POP3_ENABLE */ - if (querystatus == PS_SUCCESS) - successes++; - else if (!check_only && - ((querystatus!=PS_NOMAIL) || (outlevel==O_DEBUG))) - switch(querystatus) - { - case PS_SUCCESS: - report(stdout, "Query status=0 (SUCCESS)\n"); break ; - case PS_NOMAIL: - report(stdout, "Query status=1 (NOMAIL)\n"); break ; - case PS_SOCKET: - report(stdout, "Query status=2 (SOCKET)\n"); break ; - case PS_AUTHFAIL: - report(stdout, "Query status=3 (AUTHFAIL)\n"); break ; - case PS_PROTOCOL: - report(stdout, "Query status=4 (PROTOCOL)\n"); break ; - case PS_SYNTAX: - report(stdout, "Query status=5 (SYNTAX)\n"); break ; - case PS_IOERR: - report(stdout, "Query status=6 (IOERR)\n"); break ; - case PS_ERROR: - report(stdout, "Query status=7 (ERROR)\n"); break ; - case PS_EXCLUDE: - report(stdout, "Query status=8 (EXCLUDE)\n"); break ; - case PS_LOCKBUSY: - report(stdout, "Query status=9 (LOCKBUSY)\n"); break ; - case PS_SMTP: - report(stdout, "Query status=10 (SMTP)\n"); break ; - case PS_DNS: - report(stdout, "Query status=11 (DNS)\n"); break ; - case PS_BSMTP: - report(stdout, "Query status=12 (BSMTP)\n"); break ; - case PS_MAXFETCH: - report(stdout, "Query status=13 (MAXFETCH)\n"); break ; - default: - report(stdout, _("Query status=%d\n"), querystatus); break; - } + if (querystatus == PS_SUCCESS) + successes++; + else if (!check_only && + ((querystatus!=PS_NOMAIL) || (outlevel==O_DEBUG))) + switch(querystatus) + { + case PS_SUCCESS: + report(stdout,GT_("Query status=0 (SUCCESS)\n"));break; + case PS_NOMAIL: + report(stdout,GT_("Query status=1 (NOMAIL)\n")); break; + case PS_SOCKET: + report(stdout,GT_("Query status=2 (SOCKET)\n")); break; + case PS_AUTHFAIL: + report(stdout,GT_("Query status=3 (AUTHFAIL)\n"));break; + case PS_PROTOCOL: + report(stdout,GT_("Query status=4 (PROTOCOL)\n"));break; + case PS_SYNTAX: + report(stdout,GT_("Query status=5 (SYNTAX)\n")); break; + case PS_IOERR: + report(stdout,GT_("Query status=6 (IOERR)\n")); break; + case PS_ERROR: + report(stdout,GT_("Query status=7 (ERROR)\n")); break; + case PS_EXCLUDE: + report(stdout,GT_("Query status=8 (EXCLUDE)\n")); break; + case PS_LOCKBUSY: + report(stdout,GT_("Query status=9 (LOCKBUSY)\n"));break; + case PS_SMTP: + report(stdout,GT_("Query status=10 (SMTP)\n")); break; + case PS_DNS: + report(stdout,GT_("Query status=11 (DNS)\n")); break; + case PS_BSMTP: + report(stdout,GT_("Query status=12 (BSMTP)\n")); break; + case PS_MAXFETCH: + report(stdout,GT_("Query status=13 (MAXFETCH)\n"));break; + default: + report(stdout,GT_("Query status=%d\n"),querystatus); + break; + } #if (defined(linux) && !INET6_ENABLE) || defined (__FreeBSD__) - if (ctl->server.monitor) - { - /* - * Allow some time for the link to quiesce. One - * second is usually sufficient, three is safe. - * Note: this delay is important - don't remove! - */ - sleep(3); - interface_note_activity(&ctl->server); - } + if (ctl->server.monitor) + { + /* + * Allow some time for the link to quiesce. One + * second is usually sufficient, three is safe. + * Note: this delay is important - don't remove! + */ + sleep(3); + interface_note_activity(&ctl->server); + } #endif /* (defined(linux) && !INET6_ENABLE) || defined(__FreeBSD__) */ + } } - } #if defined(HAVE_RES_SEARCH) && defined(USE_TCPIP_FOR_DNS) endhostent(); /* release TCP/IP connection to nameserver */ @@ -729,46 +703,54 @@ 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) + if (outlevel > O_SILENT) report(stdout, - _("fetchmail: sleeping at %s\n"), rfc822timestamp()); + GT_("sleeping at %s\n"), timestamp()); /* - * 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"), rfc822timestamp()); + report(stdout, GT_("awakened at %s\n"), timestamp()); } } 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) @@ -793,6 +775,7 @@ 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 @@ -805,7 +788,7 @@ static void optmerge(struct query *h2, struct query *h1, int force) 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); @@ -814,6 +797,7 @@ static void optmerge(struct query *h2, struct query *h1, int force) FLAG_MERGE(server.dns); FLAG_MERGE(server.checkalias); FLAG_MERGE(server.uidl); + FLAG_MERGE(server.principal); #if defined(linux) || defined(__FreeBSD__) FLAG_MERGE(server.interface); @@ -843,6 +827,7 @@ static void optmerge(struct query *h2, struct query *h1, int force) FLAG_MERGE(stripcr); FLAG_MERGE(pass8bits); FLAG_MERGE(dropstatus); + FLAG_MERGE(dropdelivered); FLAG_MERGE(mimedecode); FLAG_MERGE(idle); FLAG_MERGE(limit); @@ -853,9 +838,14 @@ static void optmerge(struct query *h2, struct query *h1, int force) FLAG_MERGE(use_ssl); FLAG_MERGE(sslkey); FLAG_MERGE(sslcert); + FLAG_MERGE(sslproto); + FLAG_MERGE(sslcertck); + FLAG_MERGE(sslcertpath); + FLAG_MERGE(sslfingerprint); #endif FLAG_MERGE(expunge); + FLAG_MERGE(tracepolls); FLAG_MERGE(properties); #undef FLAG_MERGE } @@ -868,10 +858,12 @@ static int load_params(int argc, char **argv, int optind) struct stat rcstat; run.bouncemail = TRUE; + run.spambounce = FALSE; /* don't bounce back to innocent bystanders */ memset(&def_opts, '\0', sizeof(struct query)); def_opts.smtp_socket = -1; def_opts.smtpaddress = (char *)0; + def_opts.smtpname = (char *)0; #define ANTISPAM(n) save_str(&def_opts.antispam, STRING_DUMMY, 0)->val.status.num = (n) ANTISPAM(571); /* sendmail */ ANTISPAM(550); /* old exim */ @@ -881,6 +873,7 @@ static int load_params(int argc, char **argv, int optind) 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; @@ -890,7 +883,7 @@ static int load_params(int argc, char **argv, int optind) if (stat(rcfile, &rcstat) != -1) parsetime = rcstat.st_mtime; else if (errno != ENOENT) - report(stderr, _("couldn't time-check the run-control file\n")); + 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) @@ -905,7 +898,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++) @@ -923,7 +916,7 @@ static int load_params(int argc, char **argv, int optind) { /* Is this correct? */ if (predeclared && outlevel == O_VERBOSE) - fprintf(stderr,_("Warning: multiple mentions of host %s in config file\n"),argv[optind]); + fprintf(stderr,GT_("Warning: multiple mentions of host %s in config file\n"),argv[optind]); ctl->active = TRUE; predeclared = TRUE; } @@ -971,6 +964,8 @@ static int load_params(int argc, char **argv, int optind) run.poll_interval = cmd_run.poll_interval; if (cmd_run.invisible) run.invisible = cmd_run.invisible; + if (cmd_run.showdots) + run.showdots = cmd_run.showdots; if (cmd_run.use_syslog) run.use_syslog = (cmd_run.use_syslog == FLAG_TRUE); if (cmd_run.postmaster) @@ -982,19 +977,59 @@ static int load_params(int argc, char **argv, int optind) if (check_only && run.poll_interval) run.poll_interval = 0; + /* + * 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. + */ + if (strcmp(fetchmailhost, "localhost") == 0) + 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 && !(implicitmode && ctl->server.skip))) - { - /* merge in defaults */ - optmerge(ctl, &def_opts, FALSE); + /* merge in defaults */ + optmerge(ctl, &def_opts, FALSE); + + /* force command-line options */ + optmerge(ctl, &cmd_opts, TRUE); - /* 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 ) + { /* this code enables flags to be turned off */ #define DEFAULT(flag, dflt) if (flag == FLAG_TRUE)\ flag = TRUE;\ @@ -1010,41 +1045,37 @@ static int load_params(int argc, char **argv, int optind) DEFAULT(ctl->forcecr, FALSE); DEFAULT(ctl->pass8bits, FALSE); DEFAULT(ctl->dropstatus, FALSE); + DEFAULT(ctl->dropdelivered, FALSE); DEFAULT(ctl->mimedecode, FALSE); DEFAULT(ctl->idle, FALSE); DEFAULT(ctl->server.dns, TRUE); DEFAULT(ctl->server.uidl, FALSE); #ifdef SSL_ENABLE DEFAULT(ctl->use_ssl, FALSE); + DEFAULT(ctl->sslcertck, FALSE); #endif DEFAULT(ctl->server.checkalias, FALSE); +#ifndef SSL_ENABLE + if (ctl->use_ssl) + { + report(stderr, GT_("SSL support is not compiled in.\n")); + exit(PS_SYNTAX); + } +#endif /* SSL_ENABLE */ #undef DEFAULT - /* - * 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. - */ - 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(); - /* * Make sure we have a nonempty host list to forward to. */ if (!ctl->smtphunt) save_str(&ctl->smtphunt, fetchmailhost, 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) ctl->uid = 0; @@ -1058,128 +1089,10 @@ static int load_params(int argc, char **argv, int optind) if (ctl->localnames && ctl->localnames->next && 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 */ - - /* - * 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. - */ - 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 && (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); - exit(PS_DNS); - } - 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 */ - } - /* if no folders were specified, set up the null one as default */ if (!ctl->mailboxes) save_str(&ctl->mailboxes, (char *)NULL, 0); @@ -1193,14 +1106,14 @@ static int load_params(int argc, char **argv, int optind) if (ctl->server.port < 0) { (void) fprintf(stderr, - _("%s configuration invalid, port number cannot be negative\n"), + 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, - _("%s configuration invalid, RPOP requires a privileged port\n"), + GT_("%s configuration invalid, RPOP requires a privileged port\n"), ctl->server.pollname); exit(PS_SYNTAX); } @@ -1216,7 +1129,7 @@ static int load_params(int argc, char **argv, int optind) (atoi(++cp) == SMTP_PORT)) { (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); } @@ -1231,7 +1144,7 @@ static int load_params(int argc, char **argv, int optind) if (ctl->fetchall && ctl->keep && run.poll_interval && !nodetach) { (void) fprintf(stderr, - _("Both fetchall and keep on in daemon mode is a mistake!\n")); + GT_("Both fetchall and keep on in daemon mode is a mistake!\n")); exit(PS_SYNTAX); } } @@ -1281,7 +1194,7 @@ static void terminate_poll(int sig) */ if (sig != 0) - report(stdout, _("terminated with signal %d\n"), sig); + report(stdout, GT_("terminated with signal %d\n"), sig); else { struct query *ctl; @@ -1290,9 +1203,9 @@ static void terminate_poll(int sig) 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; + /* don't send QUIT for ODMR case because we're acting + as a proxy between the SMTP server and client. */ + smtp_close(ctl, ctl->server.protocol != P_ODMR); } } @@ -1330,10 +1243,13 @@ static void terminate_run(int sig) memset(ctl->password, '\0', strlen(ctl->password)); #if !defined(HAVE_ATEXIT) && !defined(HAVE_ON_EXIT) - unlockit(); + lock_release(); #endif - exit(successes ? PS_SUCCESS : querystatus); + if (activecount == 0) + exit(PS_NOMAIL); + else + exit(successes ? PS_SUCCESS : querystatus); } /* @@ -1355,77 +1271,103 @@ static const int autoprobe[] = static int query_host(struct query *ctl) /* perform fetch transaction with single host */ { - int i, st; + int i, 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), - rfc822timestamp()); + 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) + st = query_host(ctl); + if (st == PS_SUCCESS || st == PS_NOMAIL || st == PS_AUTHFAIL || st == PS_LOCKBUSY || st == PS_SMTP || st == PS_MAXFETCH) 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)); + st = doPOP3(ctl); #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)); + st = doIMAP(ctl); #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)); + st = doETRN(ctl); #else - report(stderr, _("Cannot support ETRN without gethostbyname(2).\n")); - return(PS_PROTOCOL); + report(stderr, GT_("Cannot support ETRN without gethostbyname(2).\n")); + st = PS_PROTOCOL; #endif /* HAVE_GETHOSTBYNAME */ + break; #endif /* ETRN_ENABLE */ + case P_ODMR: +#ifndef ODMR_ENABLE + 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: - 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, @@ -1435,69 +1377,63 @@ 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(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")); 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"), + printf(GT_(" Poll of this server will occur every %d intervals.\n"), 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(GT_(" This host %s be queried when no host is specified.\n"), + ctl->server.skip ? GT_("will not") : GT_("will")); + 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 @@ -1506,163 +1442,220 @@ static void dump_params (struct runctl *runp, #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)); + printf(GT_(" Protocol is %s"), showproto(ctl->server.protocol)); #if INET6_ENABLE if (ctl->server.service) - printf(_(" (using service %s)"), ctl->server.service); + printf(GT_(" (using service %s)"), ctl->server.service); if (ctl->server.netsec) - printf(_(" (using network security options %s)"), ctl->server.netsec); + printf(GT_(" (using network security options %s)"), ctl->server.netsec); #else /* INET6_ENABLE */ if (ctl->server.port) - printf(_(" (using port %d)"), ctl->server.port); + printf(GT_(" (using port %d)"), ctl->server.port); #endif /* INET6_ENABLE */ 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")); + 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_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->sslcertck) { + printf(GT_(" SSL server certificate checking enabled.\n")); + if (ctl->sslcertpath != NULL) + printf(GT_(" SSL trusted certificate directory: %s\n"), ctl->sslcertpath); + } + 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(GT_(" Selected mailboxes are:")); + for (idp = ctl->mailboxes; idp; idp = idp->next) + printf(" %s", 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"); + 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_IMAP) - { - 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->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(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; @@ -1672,11 +1665,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(GT_("%d local name(s) recognized.\n"), count); if (outlevel >= O_VERBOSE) { for (idp = ctl->localnames; idp; idp = idp->next) @@ -1690,37 +1683,37 @@ 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(GT_(" DNS lookup for multidrop addresses is %s.\n"), + ctl->server.dns ? GT_("enabled") : GT_("disabled")); if (ctl->server.dns) { - printf(_(" Server aliases will be compared with multidrop addresses by ")); + printf(GT_(" Server aliases will be compared with multidrop addresses by ")); if (ctl->server.checkalias) - printf(_("IP address.\n")); + printf(GT_("IP address.\n")); else - printf(_("name.\n")); + printf(GT_("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")); + printf(GT_(" Envelope header is assumed to be: %s\n"), + ctl->server.envelope ? ctl->server.envelope:GT_("Received")); if (ctl->server.envskip > 1 || outlevel >= O_VERBOSE) - printf(_(" Number of envelope header to be parsed: %d\n"), + printf(GT_(" Number of envelope header to be parsed: %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'); @@ -1729,7 +1722,7 @@ static void dump_params (struct runctl *runp, { 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'); @@ -1739,28 +1732,28 @@ static void dump_params (struct runctl *runp, } #if defined(linux) || defined(__FreeBSD__) 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; @@ -1769,15 +1762,20 @@ 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->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")); + if (ctl->properties) - printf(_(" Pass-through properties \"%s\".\n"), + printf(GT_(" Pass-through properties \"%s\".\n"), visbuf(ctl->properties)); } }