*** empty log message ***

svn path=/trunk/; revision=1364

2 files changed, 5 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 2b312850..e038ee7d 100644
--- a/NEWS
+++ b/NEWS
@@ -19,8 +19,9 @@ fetchmail-4.2.2 ()
 * ETRN mode no longer tries to flush queue for "localhost".
 * Introduced new DNS error return 11 to indicate DNS failure at startup.
 * More portation tweaks for unusual Unixes.
+* Make sure any X-Fetchmail-Error: line is properly terminated.
 
-There are 286 people on the fetchmail-friends list.
+There are 287 people on the fetchmail-friends list.
 
 fetchmail-4.2.1 (Sun Sep 14 16:31:58 EDT 1997)
 * Type and inclusion changes to eliminate warnings on weird Unixes.
diff --git a/driver.c b/driver.c
index 56046e16..fc6f23c4 100644
--- a/driver.c
+++ b/driver.c
@@ -447,7 +447,7 @@ static RETSIGTYPE (*sigchld)();
 static int sizeticker;
 
 static int stuffline(struct query *ctl, char *buf)
-/* ship a line to the given control block's SMTP server */
+/* ship a line to the given control block's output sink (SMTP server or MDA) */
 {
     int	n;
 
@@ -1127,6 +1127,8 @@ int num;		/* index of message */
 
 	}
 
+	strcat(errmsg, "\n");
+
 	/* ship out the error line */
 	if (sinkfp)
 	    stuffline(ctl, errmsg);