- (if (string-match "^\+OK .*\\(<[^\>]+>\\)"
- (elmo-network-session-greeting-internal session))
- ;; good, APOP ready server
- (progn
- (elmo-pop3-send-command
- (elmo-network-session-process-internal session)
- (format "apop %s %s"
- (elmo-network-session-user-internal session)
- (md5
- (concat (match-string
- 1
- (elmo-network-session-greeting-internal session))
- (elmo-get-passwd
- (elmo-network-session-password-key session)))))
- nil 'no-log)
- (let ((response (elmo-pop3-read-response
- (elmo-network-session-process-internal session)
- t)))
- (unless (eq (car response) 'ok)
- (delete-process (elmo-network-session-process-internal session))
- (unless (eq 'ok (car response))
- (if (or (eq (car response) 'in-use)
- (eq (car response) 'login-delay))
- (error (cond ((eq (car response) 'in-use)
- "Maildrop is currently in use")
- ((eq (car response) 'login-delay)
- "Not allowed to login \
-until the login delay period has expired")))
- (signal 'elmo-authenticate-error
- '(elmo-pop-auth-apop)))))
- (car response)))
- (signal 'elmo-open-error '(elmo-pop3-auth-apop))))
+ (unless (string-match "^\+OK .*\\(<[=!-;?-~]+@[=!-;?-~]+>\\)"
+ (elmo-network-session-greeting-internal session))
+ (signal 'elmo-open-error '(elmo-pop3-auth-apop)))
+ ;; good, APOP ready server
+ (elmo-pop3-send-command
+ (elmo-network-session-process-internal session)
+ (format "apop %s %s"
+ (elmo-network-session-user-internal session)
+ (md5
+ (concat (match-string
+ 1
+ (elmo-network-session-greeting-internal session))
+ (elmo-get-passwd
+ (elmo-network-session-password-key session)))))
+ nil 'no-log)
+ (let ((response (elmo-pop3-read-response
+ (elmo-network-session-process-internal session)
+ t)))
+ (case (car response)
+ (ok)
+ (in-use
+ (error "Maildrop is currently in use"))
+ (login-delay
+ (error "Not allowed to login until the login delay period has expired"))
+ (t
+ (signal 'elmo-authenticate-error '(elmo-pop-auth-apop))))
+ (car response)))