From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Wed, 13 Sep 2017 16:08:34 +0000 (+0200)
Subject: Make fully qualified domain names more fully qualified
X-Git-Tag: emacs-26.0.90~173^2~25
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6519df8f5a10826f4a3203aa55da30bca25cb6f1;p=emacs.git

Make fully qualified domain names more fully qualified

* lisp/gnus/message.el (message-make-fqdn): Don't try to use a
system-name without any periods as a fully qualified domain name.
---

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 214cf61e84d..80f270a0c11 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -5778,7 +5778,10 @@ give as trustworthy answer as possible."
 	   (not (string-match message-bogus-system-names message-user-fqdn)))
       ;; `message-user-fqdn' seems to be valid
       message-user-fqdn)
-     ((not (string-match message-bogus-system-names sysname))
+     ;; A system name without any dots is unlikely to be a good fully
+     ;; qualified domain name.
+     ((and (string-match "[.]" sysname)
+	   (not (string-match message-bogus-system-names sysname)))
       ;; `system-name' returned the right result.
       sysname)
      ;; Try `mail-host-address'.