diff options
| -rw-r--r-- | lisp/net/sieve-manage.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/sieve-manage.el b/lisp/net/sieve-manage.el index e199a7fdfa5..c8276e71d29 100644 --- a/lisp/net/sieve-manage.el +++ b/lisp/net/sieve-manage.el | |||
| @@ -146,7 +146,7 @@ for doing the actual authentication." | |||
| 146 | :type 'symbol | 146 | :type 'symbol |
| 147 | :group 'sieve-manage) | 147 | :group 'sieve-manage) |
| 148 | 148 | ||
| 149 | (defcustom sieve-manage-ignore-broken-tls nil | 149 | (defcustom sieve-manage-ignore-starttls nil |
| 150 | "Ignore STARTTLS even if STARTTLS capability is provided." | 150 | "Ignore STARTTLS even if STARTTLS capability is provided." |
| 151 | :version "25.2" | 151 | :version "25.2" |
| 152 | :type 'boolean | 152 | :type 'boolean |
| @@ -216,14 +216,14 @@ Return the buffer associated with the connection." | |||
| 216 | :return-list t | 216 | :return-list t |
| 217 | :starttls-function | 217 | :starttls-function |
| 218 | (lambda (capabilities) | 218 | (lambda (capabilities) |
| 219 | (when (and (not sieve-manage-ignore-broken-tls) | 219 | (when (and (not sieve-manage-ignore-starttls) |
| 220 | (string-match "\\bSTARTTLS\\b" capabilities)) | 220 | (string-match "\\bSTARTTLS\\b" capabilities)) |
| 221 | "STARTTLS\r\n"))) | 221 | "STARTTLS\r\n"))) |
| 222 | (setq sieve-manage-process proc) | 222 | (setq sieve-manage-process proc) |
| 223 | (setq sieve-manage-capability | 223 | (setq sieve-manage-capability |
| 224 | (sieve-manage-parse-capability (plist-get props :capabilities))) | 224 | (sieve-manage-parse-capability (plist-get props :capabilities))) |
| 225 | ;; Ignore new capabilities issues after successful STARTTLS | 225 | ;; Ignore new capabilities issues after successful STARTTLS |
| 226 | (when (or sieve-manage-ignore-broken-tls | 226 | (when (or sieve-manage-ignore-starttls |
| 227 | (and (memq stream '(nil network starttls)) | 227 | (and (memq stream '(nil network starttls)) |
| 228 | (eq (plist-get props :type) 'tls))) | 228 | (eq (plist-get props :type) 'tls))) |
| 229 | (sieve-manage-drop-next-answer)) | 229 | (sieve-manage-drop-next-answer)) |