Commit 6f33b4d7 authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen Committed by Katsumi Yamaoka

nnimap.el (nnimap-open-connection): Wait for the response to STARTTLS before starting negotiation.

gnus.el (gnus-local-domain): Put gnus-local-domain back again, since apparently third-party libraries depend on it.
parent 6688abe0
2010-09-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus.el (gnus-local-domain): Put gnus-local-domain back again, since
apparently third-party libraries depend on it.
* nnimap.el (nnimap-open-connection): Wait for the response to STARTTLS
before starting negotiation.
* gnus-art.el (gnus-treat-from-gravatar): Change default to nil for
privacy reasons.
(gnus-treat-mail-gravatar): Ditto.
......
......@@ -1428,6 +1428,15 @@ you could set this variable:
"Default default new newsgroups the first time Gnus is run.
Should be set in paths.el, and shouldn't be touched by the user.")
(defcustom gnus-local-domain nil
"Local domain name without a host name.
The DOMAINNAME environment variable is used instead if it is defined.
If the function `system-name' returns the full Internet name, there is
no need to set this variable."
:group 'gnus-message
:type '(choice (const :tag "default" nil)
string))
(defvar gnus-local-organization nil
"String with a description of what organization (if any) the user belongs to.
Obsolete variable; use `message-user-organization' instead.")
......
......@@ -310,7 +310,7 @@ not done by default on servers that doesn't support that command.")
(gnus-set-process-query-on-exit-flag (nnimap-process nnimap-object) nil)
(when (setq connection-result (nnimap-wait-for-connection))
(when (eq nnimap-stream 'starttls)
(nnimap-send-command "STARTTLS")
(nnimap-command "STARTTLS")
(starttls-negotiate (nnimap-process nnimap-object)))
(unless (equal connection-result "PREAUTH")
(if (not (setq credentials
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment