aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2006-03-03 20:55:22 +0000
committerMatthias Andree <matthias.andree@gmx.de>2006-03-03 20:55:22 +0000
commite15800830f0dfb5a944b1c47ee331a57466de295 (patch)
treef0091ced57b04e98a1ff5a55593d85c53c23fd4c
parentbfabe0f3b95edc0e5ad937fc07f9bbba35aba929 (diff)
downloadfetchmail-e15800830f0dfb5a944b1c47ee331a57466de295.tar.gz
fetchmail-e15800830f0dfb5a944b1c47ee331a57466de295.tar.bz2
fetchmail-e15800830f0dfb5a944b1c47ee331a57466de295.zip
Load UID lists only after initializing report/syslog.
svn path=/branches/BRANCH_6-3/; revision=4716
-rw-r--r--NEWS1
-rw-r--r--fetchmail.c20
2 files changed, 13 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index bc66547c..86a1eb70 100644
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,7 @@ fetchmail 6.3.3 (not yet released):
when using the proprietary SDPS extension for POP3. Fixes Debian Bug#353575,
reported by Roger Lynn.
* fetchmail no longer prints empty lines in verbose mode when using syslog.
+* fetchmail no longer prints UID lists in verbose mode when using syslog.
# CHANGES:
* --idle can now be specified on the command line, too.
diff --git a/fetchmail.c b/fetchmail.c
index 640c9f69..efff53b8 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -302,6 +302,18 @@ int main(int argc, char **argv)
#endif
report_init((run.poll_interval == 0 || nodetach) && !run.logfile);
+#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);
+ }
+#endif /* POP3_ENABLE */
+
/* construct the lockfile */
lock_setup();
@@ -1266,14 +1278,6 @@ static int load_params(int argc, char **argv, int optind)
}
}
-#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.