[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111271: * lisp/net/network-stream.el (network-stream-open-starttls):

[Glenn Morris]

------------------------------------------------------------
revno: 111271
fixes bug: http://debbugs.gnu.org/13706
author: Didier Verna <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Fri 2013-02-15 18:45:24 -0800
message:
  * lisp/net/network-stream.el (network-stream-open-starttls):
  Check that response to the starttls-command is non-nil.
modified:
  lisp/ChangeLog
  lisp/net/network-stream.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-14 17:16:47 +0000
+++ b/lisp/ChangeLog    2013-02-16 02:45:24 +0000
@@ -1,3 +1,8 @@
+2013-02-16  Didier Verna  <address@hidden>
+
+       * net/network-stream.el (network-stream-open-starttls):
+       Check that response to the starttls-command is non-nil.  (Bug#13706)
+
 2013-02-14  Glenn Morris  <address@hidden>
 
        * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix.

=== modified file 'lisp/net/network-stream.el'
--- a/lisp/net/network-stream.el        2013-01-01 09:11:05 +0000
+++ b/lisp/net/network-stream.el        2013-02-16 02:45:24 +0000
@@ -262,8 +262,9 @@
        ;; EHLO for SMTP.
        (when (plist-get parameters :always-query-capabilities)
          (network-stream-command stream capability-command eo-capa)))
-      (when (string-match success-string
-                         (network-stream-command stream starttls-command eoc))
+      (when (let ((response
+                  (network-stream-command stream starttls-command eoc)))
+             (and response (string-match success-string response)))
        ;; The server said it was OK to begin STARTTLS negotiations.
        (if builtin-starttls
            (let ((cert (network-stream-certificate host service parameters)))