diff options
| author | Miles Bader <miles@gnu.org> | 2008-11-06 00:49:23 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-11-06 00:49:23 +0000 |
| commit | ed778fada51bffe8e6d69aefe9279f6f64f7b508 (patch) | |
| tree | 12aa50fb5c60108f75345a77b65d87872ac03505 /lisp/gnus/starttls.el | |
| parent | a2baa908022e3459e12eb4c7ce701f8391cf06c2 (diff) | |
Merge from gnus--devo--0
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1464
Diffstat (limited to 'lisp/gnus/starttls.el')
| -rw-r--r-- | lisp/gnus/starttls.el | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el index 7aa13c26dc..03d8522649 100644 --- a/lisp/gnus/starttls.el +++ b/lisp/gnus/starttls.el @@ -241,7 +241,7 @@ handshake, or nil on failure." 'process-kill-without-query))) (defun starttls-open-stream-gnutls (name buffer host port) - (message "Opening STARTTLS connection to `%s'..." host) + (message "Opening STARTTLS connection to `%s:%s'..." host port) (let* (done (old-max (with-current-buffer buffer (point-max))) (process-connection-type starttls-process-connection-type) @@ -266,8 +266,8 @@ handshake, or nil on failure." (delete-region old-max done)) (delete-process process) (setq process nil)) - (message "Opening STARTTLS connection to `%s'...%s" - host (if done "done" "failed")) + (message "Opening STARTTLS connection to `%s:%s'...%s" + host port (if done "done" "failed")) process)) (defun starttls-open-stream (name buffer host port) @@ -287,6 +287,7 @@ If `starttls-use-gnutls' is nil, this may also be a service name, but GNUTLS requires a port number." (if starttls-use-gnutls (starttls-open-stream-gnutls name buffer host port) + (message "Opening STARTTLS connection to `%s:%s'" host (format "%s" port)) (let* ((process-connection-type starttls-process-connection-type) (process (apply #'start-process name buffer starttls-program @@ -295,6 +296,19 @@ GNUTLS requires a port number." (starttls-set-process-query-on-exit-flag process nil) process))) +(defun starttls-any-program-available () + (let ((program (if starttls-use-gnutls + starttls-gnutls-program + starttls-program))) + (condition-case () + (progn + (call-process program) + program) + (error (progn + (message "No STARTTLS program was available (tried '%s')" + program) + nil))))) + (provide 'starttls) ;; arch-tag: 648b3bd8-63bd-47f5-904c-7c819aea2297 |