SMTP: Use Hostname if Fqdn is bogus. Closes #3142.

diff --git a/ChangeLog b/ChangeLog
index add294950d537035dc627e05e0ec64e7cc2f578c..77e147540f451a28053749f5d620a2a4ca854990 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-01-02 22:37 -0800  Brendan Cully  <brendan@kublai.com>  (37ed3cc8d40c)
+
+       * init.h: More tyops
+
+       * doc/manual.xml.head: Tyops
+
+       * mutt_ssl_gnutls.c: Add SSL intermediate certificate support for
+       gnutls
+
+       * mutt_ssl.c: Simplify intermediate certificate handling.  Return
+       immediately if a certificate is interactively accepted.  Display
+       index of current certificate in chain in menu title.
+
 2009-01-02 12:46 -0800  TAKAHASHI Tamotsu  <ttakah@lapis.plala.or.jp>  (5db868a874b6)
 
        * globals.h, mutt_ssl.c: Add support for intermediate certificates to

diff --git a/smtp.c b/smtp.c
index f9cc58bd0d0e47332ea62a355021911e274ce705..f5b1c05e2a1fa9e453c70ea53c51e1769b204d2c 100644 (file)
--- a/smtp.c
+++ b/smtp.c
@@ -340,6 +340,7 @@ static int smtp_fill_account (ACCOUNT* account)
 static int smtp_helo (CONNECTION* conn)
 {
   char buf[LONG_STRING];
+  const char* fqdn;
 
   memset (Capabilities, 0, sizeof (Capabilities));
 
@@ -354,7 +355,10 @@ static int smtp_helo (CONNECTION* conn)
 #endif
   }
 
-  snprintf (buf, sizeof (buf), "%s %s\r\n", Esmtp ? "EHLO" : "HELO", Fqdn);
+  if(!(fqdn = mutt_fqdn (0)))
+    fqdn = NONULL (Hostname);
+
+  snprintf (buf, sizeof (buf), "%s %s\r\n", Esmtp ? "EHLO" : "HELO", fqdn);
   /* XXX there should probably be a wrapper in mutt_socket.c that
     * repeatedly calls conn->write until all data is sent.  This
     * currently doesn't check for a short write.