Use `starttls-available-p' to see whether starttls.el can be used.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 791233439bb14bd0462b67dfe411cb11887758a5..ad5cad4307d762a44ca1ea2d049e3d5ae4891ecb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * net/network-stream.el (network-stream-open-starttls): Use
+       `starttls-available-p' to see whether starttls.el can be used.
+
 2011-08-01  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (display-buffer-in-window): Don't set dedicated status

diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index bb09d8945c962465494ebed0565da0f3c4d48eda..ceb094cded7a2ecd6dd078ff41704df3e9201890 100644 (file)
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -230,7 +230,7 @@ functionality.
               (or builtin-starttls
                   (and (or require-tls
                            (plist-get parameters :use-starttls-if-possible))
-                       (executable-find "gnutls-cli")))
+                       (starttls-available-p)))
               (not (eq (plist-get parameters :type) 'plain)))
       ;; If using external STARTTLS, drop this connection and start
       ;; anew with `starttls-open-stream'.