Remove obsolete "OpenSSL default fingerprint is MD5" claim.

[~andy/fetchmail] / fetchmail.c

diff --git a/fetchmail.c b/fetchmail.c
index c02e4432d290275bae7b06d7b3b412ca104f91bd..ae30f90a55f85c73bc46d77f01b8ebb3962b12f1 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -137,8 +137,8 @@ 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 - 2012 Sunil Shetye\n"
-                  "Copyright (C) 2005 - 2012 Matthias Andree\n"
+                  "Copyright (C) 2005 - 2012 Sunil Shetye\n"
+                  "Copyright (C) 2005 - 2013 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"
@@ -310,25 +310,27 @@ int main(int argc, char **argv)
     if (run.logfile) {
        /* nodetach -> turn off logfile option */
        if (nodetach) {
-           if (outlevel >= O_DEBUG) { fprintf(stderr, GT_("The nodetach option is in effect, ignoring logfile option.\n")); }
+           if (outlevel >= O_NORMAL) { fprintf(stderr, GT_("The nodetach option is in effect, ignoring logfile option.\n")); }
            xfree(run.logfile);
        }
 
+#if 0
        /* not in daemon mode -> turn off logfile option */
        if (0 == run.poll_interval) {
-           if (outlevel >= O_DEBUG) { fprintf(stderr, GT_("Not running in daemon mode, ignoring logfile option.\n")); }
+           if (outlevel >= O_NORMAL) { fprintf(stderr, GT_("Not running in daemon mode, ignoring logfile option.\n")); }
            xfree(run.logfile);
        }
+#endif
 
        /* log file not writable -> turn off logfile option */
        if (run.logfile && 0 != access(run.logfile, F_OK)) {
-           if (outlevel >= O_DEBUG) { fprintf(stderr, GT_("Logfile \"%s\" does not exist, ignoring logfile option.\n"), run.logfile); }
+           if (outlevel >= O_NORMAL) { fprintf(stderr, GT_("Logfile \"%s\" does not exist, ignoring logfile option.\n"), run.logfile); }
            xfree(run.logfile);
        }
 
        /* log file not writable -> turn off logfile option */
        if (run.logfile && 0 != access(run.logfile, W_OK)) {
-           if (outlevel >= O_DEBUG) { fprintf(stderr, GT_("Logfile \"%s\" is not writable, aborting.\n"), run.logfile); }
+           fprintf(stderr, GT_("Logfile \"%s\" is not writable, aborting.\n"), run.logfile);
            xfree(run.logfile);
            exit(PS_UNDEFINED);
        }