emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r104985: * net/network-stream.el (net


From: Lars Magne Ingebrigtsen
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r104985: * net/network-stream.el (network-stream-open-starttls): Try using
Date: Wed, 06 Jul 2011 17:09:11 +0200
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 104985
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-06 17:09:11 +0200
message:
  * net/network-stream.el (network-stream-open-starttls): Try using
  a plain connection even if the server offered STARTTLS, and we
  kinda wanted to use it, if Emacs doesn't have any STARTTLS
  capability.  This should make smtpmail.el work in slightly more
  configurations.
modified:
  lisp/ChangeLog
  lisp/net/network-stream.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-06 09:48:20 +0000
+++ b/lisp/ChangeLog    2011-07-06 15:09:11 +0000
@@ -1,3 +1,11 @@
+2011-07-06  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/network-stream.el (network-stream-open-starttls): Try using
+       a plain connection even if the server offered STARTTLS, and we
+       kinda wanted to use it, if Emacs doesn't have any STARTTLS
+       capability.  This should make smtpmail.el work in slightly more
+       configurations.
+
 2011-07-06  Michael Albinus  <address@hidden>
 
        * net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window):

=== modified file 'lisp/net/network-stream.el'
--- a/lisp/net/network-stream.el        2011-07-03 13:48:59 +0000
+++ b/lisp/net/network-stream.el        2011-07-06 15:09:11 +0000
@@ -281,18 +281,14 @@
              (network-stream-command stream capability-command eo-capa))))
 
     ;; If TLS is mandatory, close the connection if it's unencrypted.
-    (when (and (or require-tls
-                  ;; The server said it was possible to do STARTTLS,
-                  ;; and we wanted to use it...
-                  (and starttls-command
-                       (plist-get parameters :use-starttls-if-possible)))
+    (when (and require-tls
               ;; ... but Emacs wasn't able to -- either no built-in
               ;; support, or no gnutls-cli installed.
               (eq resulting-type 'plain))
-         (setq error
-               (if require-tls
-                   "Server does not support TLS"
-                 "Server supports STARTTLS, but Emacs does not have support 
for it"))
+      (setq error
+           (if require-tls
+               "Server does not support TLS"
+             "Server supports STARTTLS, but Emacs does not have support for 
it"))
       (delete-process stream)
       (setq stream nil))
     ;; Return value:


reply via email to

[Prev in Thread] Current Thread [Next in Thread]