diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | driver.c | 5 |
2 files changed, 6 insertions, 0 deletions
@@ -7,6 +7,7 @@ fetchmail-4.6.1 (): * Removed -pipe compilation option, it confuses too many non-GCC compilers. * Major update of SDPS FAQ material from B.Candler@pobox.com. * Fetchmailconf can deal with zsh now. +* Append "@localhost" to MAIL FROM if it's not an FQDN. There are 255 people on fetchmail-friends and 296 on fetchmail-announce. @@ -753,10 +753,15 @@ int num; /* index of message */ * not trigger bounces if delivery fails. What we *do* need to do is * make sure we never try to rewrite such a blank Return-Path. We * handle this with a check for <> in the rewrite logic. + * + * If the Return-Path header has no host part, tack on "@localhost" + * in order to pacify sendmails that want to see an FQDN. */ if (!strncasecmp("Return-Path:", line, 12) && (cp = nxtaddr(line))) { strcpy(return_path, cp); + if (!strchr(return_path, '@')) + strcat(return_path, "@localhost"); if (!ctl->mda) { free(line); continue; |