diff options
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | sink.c | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -68,6 +68,11 @@ * Miloslav Trmac's patch for fetchmailconf to support string-type values of the "port" variable, avoiding "port None" corruption in .fetchmailrc. To fix Redhat Bug #55623 (Matthias Andree) +* de.po fixes from Nico Golde (Matthias Andree) +* es.po fixes from Jesus Roncero, Debian bug #286044 (Matthias Andree) +* sink.c fix from Cesar Eduardo Barros, to avoid double @ in address + when username contains an @ and the envelope sender is null, Debian + bug #272289 (Matthias Andree) fetchmail-6.2.5 (Wed Oct 15 18:39:22 EDT 2003), 23079 lines: @@ -877,7 +877,11 @@ static int open_smtp_sink(struct query *ctl, struct msgblk *msg, */ if (!msg->return_path[0] || (msg->return_path[0] == '@')) { - if (is_dottedquad(ctl->server.truename)) + if (strchr(ctl->remotename,'@') || strchr(ctl->remotename,'!')) + { + snprintf(addr, sizeof(addr), "%s", ctl->remotename); + } + else if (is_dottedquad(ctl->server.truename)) { snprintf(addr, sizeof(addr), "%s@[%s]", ctl->remotename, ctl->server.truename); |