Store the IMAP greeting, so that we can tell what kind of server we're talking to.

[gnus] / lisp / tls.el

diff --git a/lisp/tls.el b/lisp/tls.el
index 3044cb4..d4fa8c2 100644 (file)
--- a/lisp/tls.el
+++ b/lisp/tls.el
@@ -1,7 +1,7 @@
 ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008  Free Software Foundation, Inc.
+;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: comm, tls, gnutls, ssl
@@ -216,22 +216,32 @@ Fourth arg PORT is an integer specifying a port to connect to."
        (use-temp-buffer (null buffer))
        process cmd done)
     (if use-temp-buffer
-       (setq buffer (generate-new-buffer " TLS")))
+       (setq buffer (generate-new-buffer " TLS"))
+      ;; BUFFER is a string but does not exist as a buffer object.
+      (unless (and (get-buffer buffer)
+                  (buffer-name (get-buffer buffer)))
+       (generate-new-buffer buffer)))
     (with-current-buffer buffer
       (message "Opening TLS connection to `%s'..." host)
       (while (and (not done) (setq cmd (pop cmds)))
-       (message "Opening TLS connection with `%s'..." cmd)
        (let ((process-connection-type tls-process-connection-type)
+             (formatted-cmd
+              (format-spec
+               cmd
+               (format-spec-make
+                ?h host
+                ?p (if (integerp port)
+                       (int-to-string port)
+                     port))))
              response)
+         (message "Opening TLS connection with `%s'..." formatted-cmd)
          (setq process (start-process
                         name buffer shell-file-name shell-command-switch
-                        (format-spec
-                         cmd
-                         (format-spec-make
-                          ?h host
-                          ?p (if (integerp port)
-                                 (int-to-string port)
-                               port)))))
+                        formatted-cmd))
+         (funcall (if (fboundp 'set-process-query-on-exit-flag)
+                      'set-process-query-on-exit-flag
+                    'process-kill-without-query)
+                  process nil)
          (while (and process
                      (memq (process-status process) '(open run))
                      (progn
@@ -240,7 +250,7 @@ Fourth arg PORT is an integer specifying a port to connect to."
                                         tls-success nil t)))))
            (unless (accept-process-output process 1)
              (sit-for 1)))
-         (message "Opening TLS connection with `%s'...%s" cmd
+         (message "Opening TLS connection with `%s'...%s" formatted-cmd
                   (if done "done" "failed"))
          (if (not done)
              (delete-process process)
@@ -292,5 +302,4 @@ match `%s'. Connect anyway? " host))))))
 
 (provide 'tls)
 
-;; arch-tag: 5596d1c4-facc-4bc4-94a9-9863b928d7ac
 ;;; tls.el ends here