[Emacs-diffs] master 3b9cbac: sieve-manage.el: Rename sieve-manage-ignore-broken-tls

[Katsumi Yamaoka]

branch: master
commit 3b9cbacf6110daf7cb2a838e28afef1e4f5ff831
Author: Katsumi Yamaoka <address@hidden>
Commit: Katsumi Yamaoka <address@hidden>

    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).
---
 lisp/net/sieve-manage.el |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/net/sieve-manage.el b/lisp/net/sieve-manage.el
index e199a7f..c8276e7 100644
--- a/lisp/net/sieve-manage.el
+++ b/lisp/net/sieve-manage.el
@@ -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))