From f325cabe946b0ac0de37bff183adcbcc114ad2c0 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Thu, 4 Oct 2001 12:59:41 +0000 Subject: Logging logic changed. Verbosity lowered. svn path=/trunk/; revision=3540 --- NEWS | 5 ++++- fetchmail.c | 13 +++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 064873c0..542f0327 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,8 @@ (The `lines' figures total .c, .h, .l, and .y files under version control.) +* Changed the logging logic along lines suggested by Jan Klaverstijn, + fetchmail-5.9.4 (Wed Oct 3 07:47:45 EDT 2001), 21104 lines: * Finished license cleanup, all licenses in the distribution are now @@ -9,7 +11,8 @@ fetchmail-5.9.4 (Wed Oct 3 07:47:45 EDT 2001), 21104 lines: * Added a length check to from64tobits() after receiving a warning that it might create buffer overflows. No exploitable overflows were found by a careful case-by-case audit, and at minimum an exploit would have required - that the mailserver be subverted. + that the mailserver be subverted or DNS be spoofed to enable a + man-in-the-middle attack. There are 371 people on fetchmail-friends and 623 on fetchmail-announce. % Mailing list cleaned diff --git a/fetchmail.c b/fetchmail.c index e4889e4d..a1c6754d 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -706,9 +706,9 @@ int main(int argc, char **argv) exit(PS_AUTHFAIL); } - if (outlevel >= O_VERBOSE) + if (outlevel > O_SILENT) report(stdout, - GT_("fetchmail: sleeping at %s\n"), timestamp()); + GT_("sleeping at %s\n"), timestamp()); /* * OK, now pause until it's time for the next poll cycle. @@ -718,11 +718,12 @@ int main(int argc, char **argv) */ if ((lastsig = interruptible_idle(run.poll_interval))) { + if (outlevel > O_SILENT) #ifdef SYS_SIGLIST_DECLARED - report(stdout, + report(stdout, GT_("awakened by %s\n"), sys_siglist[lastsig]); #else - report(stdout, + report(stdout, GT_("awakened by signal %d\n"), lastsig); #endif for (ctl = querylist; ctl; ctl = ctl->next) @@ -1272,7 +1273,7 @@ static int query_host(struct query *ctl) * If we're syslogging the progress messages are automatically timestamped. * Force timestamping if we're going to a logfile. */ - if (outlevel >= O_VERBOSE || (run.logfile && outlevel > O_SILENT)) + if (outlevel >= O_VERBOSE) { report(stdout, GT_("%s querying %s (protocol %s) at %s: poll started\n"), VERSION, @@ -1353,7 +1354,7 @@ static int query_host(struct query *ctl) * If we're syslogging the progress messages are automatically timestamped. * Force timestamping if we're going to a logfile. */ - if (outlevel >= O_VERBOSE || (run.logfile && outlevel > O_SILENT)) + if (outlevel >= O_VERBOSE) { report(stdout, GT_("%s querying %s (protocol %s) at %s: poll completed\n"), VERSION, -- cgit v1.2.3