Commit 3b9cbacf authored by Katsumi Yamaoka's avatar Katsumi Yamaoka
Browse files

sieve-manage.el: Rename sieve-manage-ignore-broken-tls

* lisp/net/sieve-manage.el (sieve-manage-ignore-starttls):
Rename from sieve-manage-ignore-broken-tls.  If it is set,
sieve-manage will never use STARTTLS even if the server says
it is capable (but may be broken).
parent 4a0d8b4c
...@@ -146,7 +146,7 @@ for doing the actual authentication." ...@@ -146,7 +146,7 @@ for doing the actual authentication."
:type 'symbol :type 'symbol
:group 'sieve-manage) :group 'sieve-manage)
(defcustom sieve-manage-ignore-broken-tls nil (defcustom sieve-manage-ignore-starttls nil
"Ignore STARTTLS even if STARTTLS capability is provided." "Ignore STARTTLS even if STARTTLS capability is provided."
:version "25.2" :version "25.2"
:type 'boolean :type 'boolean
...@@ -216,14 +216,14 @@ Return the buffer associated with the connection." ...@@ -216,14 +216,14 @@ Return the buffer associated with the connection."
:return-list t :return-list t
:starttls-function :starttls-function
(lambda (capabilities) (lambda (capabilities)
(when (and (not sieve-manage-ignore-broken-tls) (when (and (not sieve-manage-ignore-starttls)
(string-match "\\bSTARTTLS\\b" capabilities)) (string-match "\\bSTARTTLS\\b" capabilities))
"STARTTLS\r\n"))) "STARTTLS\r\n")))
(setq sieve-manage-process proc) (setq sieve-manage-process proc)
(setq sieve-manage-capability (setq sieve-manage-capability
(sieve-manage-parse-capability (plist-get props :capabilities))) (sieve-manage-parse-capability (plist-get props :capabilities)))
;; Ignore new capabilities issues after successful STARTTLS ;; Ignore new capabilities issues after successful STARTTLS
(when (or sieve-manage-ignore-broken-tls (when (or sieve-manage-ignore-starttls
(and (memq stream '(nil network starttls)) (and (memq stream '(nil network starttls))
(eq (plist-get props :type) 'tls))) (eq (plist-get props :type) 'tls)))
(sieve-manage-drop-next-answer)) (sieve-manage-drop-next-answer))
......
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