Almost ready to ship.

svn path=/trunk/; revision=2068

diff --git a/NEWS b/NEWS
index 77408da5da984d77d81e69d11945cc6b27ed60d5..12b14c8d738f13dc92dd390c467c8e8ef2f52a4f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
                                Release Notes:
 
+fetchmail-4.5.8 ():
+
+There are 249 people on fetchmail-friends and 273 on fetchmail-announce.
+* Prevent fetchmailconf from adding an additional layer of quotes on
+  preconnect/postconnect/smtpaddress options.
+* Fix a --configdump bug affecting multidrop configurations.
+
 fetchmail-4.5.7 (Tue Aug 25 00:29:44 EDT 1998):
 * Fixed SDPS support (thanks to Chris Brooks).
 * One more fix for the snakebit postmaster option.

diff --git a/conf.c b/conf.c
index 837e1c70242de65a8dfc4aca65d7ac4e16f41be2..8ec27c6596a682e4d2227f9baf22de017b37c1fb 100644 (file)
--- a/conf.c
+++ b/conf.c
@@ -236,11 +236,14 @@ void dump_config(struct runctl *runp, struct query *querylist)
        fprintf(stdout, "'localnames':[");
        for (idp = ctl->localnames; idp; idp = idp->next)
        {
+           char        namebuf[USERNAMELEN + 1];
+
+           strncpy(namebuf, visbuf(idp->id), USERNAMELEN);
+           namebuf[USERNAMELEN] = '\0';
            if (idp->val.id2)
-               fprintf(stdout, "(\"%s\", %s)", 
-                       visbuf(idp->id), visbuf(idp->val.id2));
+               fprintf(stdout, "(\"%s\", %s)", namebuf, visbuf(idp->val.id2));
            else
-               fprintf(stdout, "\"%s\"", visbuf(idp->id));
+               fprintf(stdout, "\"%s\"", namebuf);
            if (idp->next)
                fputs(", ", stdout);
        }

diff --git a/fetchmailconf b/fetchmailconf
index e604300010f7637123801b9721ef0d55db3a19ad..e4912c641bc1f32eca1a70e33886f7d2804f3e6e 100755 (executable)
--- a/fetchmailconf
+++ b/fetchmailconf
@@ -7,7 +7,7 @@
 #
 # TO DO: Arrange for save and quit buttons to clean up all frames dependent
 # on the current ones.
-version = "1.3"
+version = "1.4"
 
 from Tkinter import *
 from Dialog import *
@@ -278,7 +278,7 @@ class User:
             str = str + "\n"
         for fld in ('smtpaddress', 'preconnect', 'postconnect', 'mda'):
             if getattr(self, fld):
-                str = str + " %s \"%s\"\n" % (fld, `getattr(self, fld)`)
+                str = str + " %s %s\n" % (fld, `getattr(self, fld)`)
         if self.antispam != UserDefaults.antispam:
             str = str + "    antispam " + self.antispam + "\n"
        return str;