diff options
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | conf.c | 9 | ||||
| -rwxr-xr-x | fetchmailconf | 4 |
3 files changed, 15 insertions, 5 deletions
@@ -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. @@ -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 e6043000..e4912c64 100755 --- 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; |