Generate correct for clauses in trace headers.

svn path=/trunk/; revision=2223

diff --git a/NEWS b/NEWS
index 0678c806c571d0c9cb7de3778f9a44e21c292198..baf9e32a993764f36e034d8ce7ec5e516c9c7884 100644 (file)
--- 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 0e63c19d6864578cb8561d1e355cfbb111795550..efbbec4cc86f878d26fc06ddc6d9de60b1cf0166 100644 (file)
--- 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");
                }