mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-06 11:55:48 +00:00
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).
This commit is contained in:
parent
4a0d8b4cad
commit
3b9cbacf61
@ -146,7 +146,7 @@ for doing the actual authentication."
|
||||
:type 'symbol
|
||||
:group 'sieve-manage)
|
||||
|
||||
(defcustom sieve-manage-ignore-broken-tls nil
|
||||
(defcustom sieve-manage-ignore-starttls nil
|
||||
"Ignore STARTTLS even if STARTTLS capability is provided."
|
||||
:version "25.2"
|
||||
:type 'boolean
|
||||
@ -216,14 +216,14 @@ Return the buffer associated with the connection."
|
||||
:return-list t
|
||||
:starttls-function
|
||||
(lambda (capabilities)
|
||||
(when (and (not sieve-manage-ignore-broken-tls)
|
||||
(when (and (not sieve-manage-ignore-starttls)
|
||||
(string-match "\\bSTARTTLS\\b" capabilities))
|
||||
"STARTTLS\r\n")))
|
||||
(setq sieve-manage-process proc)
|
||||
(setq sieve-manage-capability
|
||||
(sieve-manage-parse-capability (plist-get props :capabilities)))
|
||||
;; 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))
|
||||
(eq (plist-get props :type) 'tls)))
|
||||
(sieve-manage-drop-next-answer))
|
||||
|
Loading…
Reference in New Issue
Block a user