Generate correct for clauses in trace headers.

svn path=/trunk/; revision=2223

2 files changed, 4 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index 0678c806..baf9e32a 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ fetchmail-4.6.8 ():
 * Added bounce-mail capability on SMTP/ESMTP error messages.
 * Documented fetchmail's actions on ESMTP errors.
 * Fix an undead-message hole in POP3 with fetchall on.
+* Fix a minor error in generation of fetchmail's trace headers.
 
 There are 247 people on fetchmail-friends and 309 on fetchmail-announce.
 
diff --git a/driver.c b/driver.c
index 0e63c19d..efbbec4c 100644
--- a/driver.c
+++ b/driver.c
@@ -880,7 +880,7 @@ static int readheaders(int sock, long fetchlen, long reallen, struct query *ctl,
 		if (good_addresses == 0)
 		{
 		    sprintf(buf+1, 
-			    "for <%s@%s> (by default); ",
+			    "for %s@%s (by default); ",
 			    user, ctl->destaddr);
 		}
 		else if (good_addresses == 1)
@@ -889,9 +889,9 @@ static int readheaders(int sock, long fetchlen, long reallen, struct query *ctl,
 			if (idp->val.status.mark == XMIT_ACCEPT)
 			    break;	/* only report first address */
 		    if (strchr(idp->id, '@'))
-			sprintf(buf+1, "for <%s>", idp->id);
+			sprintf(buf+1, "for %s", idp->id);
 		    else
-			sprintf(buf+1, "for <%s/%s>", idp->id, ctl->destaddr);
+			sprintf(buf+1, "for %s/%s", idp->id, ctl->destaddr);
 		    sprintf(buf+strlen(buf), " (%s); ",
 			    MULTIDROP(ctl) ? "multi-drop" : "single-drop");
 		}