'("143" "993" "imap" "imaps"))
(t
(error "Unknown stream type: %s" nnimap-stream))))
- connection-result login-result credentials)
+ (proto-stream-always-use-starttls t)
+ login-result credentials)
(when nnimap-server-port
- (push (format "%s" nnimap-server-port) ports))
+ (setq ports (append ports (list nnimap-server-port))))
(destructuring-bind (stream greeting capabilities)
- (open-proto-stream
+ (open-protocol-stream
"*nnimap*" (current-buffer) nnimap-address (car (last ports))
:type nnimap-stream
:shell-command nnimap-shell-program
:capability-command "1 CAPABILITY\r\n"
+ :success " OK "
:starttls-function
(lambda (capabilities)
- (if (not (string-match "STARTTLS" capabilities))
- ;; Not a STARTTLS-capable server.
- nil
+ (when (gnus-string-match-p "STARTTLS" capabilities)
"1 STARTTLS\r\n")))
(setf (nnimap-process nnimap-object) stream)
(if (not stream)
nnimap-address port nnimap-stream)
'no-connect)
(gnus-set-process-query-on-exit-flag stream nil)
- (if (not (string-match "[*.] OK" greeting))
+ (if (not (gnus-string-match-p "[*.] \\(OK\\|PREAUTH\\)" greeting))
(nnheader-report 'nnimap "%s" greeting)
;; Store the greeting (for debugging purposes).
(setf (nnimap-greeting nnimap-object) greeting)
(setf (nnimap-capabilities nnimap-object)
(mapcar #'upcase
(split-string capabilities)))
- (unless (equal connection-result "PREAUTH")
+ (unless (gnus-string-match-p "[*.] PREAUTH" greeting)
(if (not (setq credentials
(if (eq nnimap-authenticator 'anonymous)
(list "anonymous"