aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--env.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index feabf655..26ecc71a 100644
--- a/NEWS
+++ b/NEWS
@@ -267,6 +267,10 @@ fetchmail 6.3.0 (not yet released officially):
* When eating IMAP message trailer, don't see any line containing "OK" as the
end of the trailer, but wait for the proper tagged OK line. To work around
the qmail + Courier-IMAP problem in Debian Bug#338007. Matthias Andree
+* Fix Debian Bug#317761: when trying to send a bounce message, don't bail out
+ if we cannot qualify our own hostname, so we aren't losing the bounce.
+ Instead, pass the buck on to the SMTP server and use our own unqualified
+ hostname. Matthias Andree
# INTERNAL CHANGES
* Switched to automake. Matthias Andree.
diff --git a/env.c b/env.c
index b1f05561..4b74d368 100644
--- a/env.c
+++ b/env.c
@@ -132,8 +132,7 @@ void envquery(int argc, char **argv)
strcat(rcfile, RCFILE_NAME);
}
-char *host_fqdn(int required /** barf if the name cannot be resolved */)
-/* get the FQDN of the machine we're running */
+char *host_fqdn(int required)
{
char tmpbuf[HOSTLEN+1];
char *result;
@@ -168,7 +167,7 @@ char *host_fqdn(int required /** barf if the name cannot be resolved */)
exit(PS_DNS);
else {
fprintf(stderr, GT_("Trying to continue with unqualified hostname.\nDO NOT report broken Received: headers, HELO/EHLO lines or similar problems!\nDO repair your /etc/hosts, DNS, NIS or LDAP instead.\n"));
- return 0;
+ return xstrdup(tmpbuf);
}
}