Load UID lists only after initializing report/syslog.

svn path=/branches/BRANCH_6-3/; revision=4716

diff --git a/NEWS b/NEWS
index bc66547c9edefe7f6d0f79ca1ecf910657b68236..86a1eb70072e1f225d7b9ec400657b24016ed342 100644 (file)
--- 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 640c9f69d58e1907f420d259af5ee8df2342b031..efff53b87fdf45a5715ab247124de552171d74aa 100644 (file)
--- 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.