Repair --logfile, broken in 6.3.5. BerliOS Bug #9059,

reported by Brian Harring.

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

diff --git a/NEWS b/NEWS
index e8ceea39a4ad94c8f95d0c73469e9546b149eb8c..15202950ced89c13d6d61b7b6d90297589e55734 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -39,7 +39,7 @@ change.  MA = Matthias Andree, ESR = Eric S. Raymond, RF = Rob Funk.)
 
 --------------------------------------------------------------------------------
 
-fetchmail 6.3.5 (released 2006-10-09):
+fetchmail 6.3.6 (not yet released):
 
 # KNOWN BUGS AND WORKAROUNDS:
   (this section floats upwards through the NEWS to be on top of the list)
@@ -57,6 +57,12 @@ fetchmail 6.3.5 (released 2006-10-09):
 * some of the logging output is not very helpful
 * some of the documentation is still not up to date
 
+# BUG FIXES:
+* Repair --logfile, broken in 6.3.5. BerliOS Bug #9059,
+  reported by Brian Harring.
+
+fetchmail 6.3.5 (released 2006-10-09):
+
 # BUG FIXES:
 * For protocols such as IMAP that are not delimited by "." lines, truncate the
   input buffer when the message has been completely read, to avoid taking

diff --git a/daemon.c b/daemon.c
index feacfedc73282cd7c8104fa307f593ce10c6d383..cd60725fb840aefef2209ff01bc6bfdd23a90b36 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -218,10 +218,9 @@ nottyDetach:
       if ((logfd = open(logfile, O_CREAT|O_WRONLY|O_APPEND, 0666)) < 0) {      /* stdout */
          report(stderr, "cannot open %s: %s\n", logfile, strerror(errno));
          return PS_IOERR;
-      } else
-         logfd = 0;    /* use /dev/null */
+      }
   } else
-      logfd = 0;    /* this is /dev/null */
+      logfd = 0;    /* else use /dev/null */
 
   /* Close any/all open file descriptors */
 #if    defined(HAVE_GETDTABLESIZE)