From: yoichi <yoichi>
Date: Tue, 24 Apr 2007 14:28:23 +0000 (+0000)
Subject: * elmo-pop3.el (elmo-pop3-auth-apop): Use more strict regexp.
X-Git-Tag: wl-2_15_6-fixes~82
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=edfc70c856caa58a15365c730980448ce028ab51;p=elisp%2Fwanderlust.git

* elmo-pop3.el (elmo-pop3-auth-apop): Use more strict regexp.
http://seclists.org/bugtraq/2007/Apr/0018.html
(Suggested by Tatsuya Kinoshita)
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index bf9cb76..05904f7 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-24  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+	* elmo-pop3.el (elmo-pop3-auth-apop): Use more strict regexp.
+	http://seclists.org/bugtraq/2007/Apr/0018.html
+	(Suggested by Tatsuya Kinoshita)
+
 2007-04-16  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
 	* elmo-imap4.el (elmo-folder-delete): Don't call close for mailbox
diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 19d052b..c95188d 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -299,7 +299,7 @@ CODE is one of the following:
     (car response)))
 
 (defun elmo-pop3-auth-apop (session)
-  (unless (string-match "^\+OK .*\\(<[^\>]+>\\)"
+  (unless (string-match "^\+OK .*\\(<[=!-;?-~]+@[=!-;?-~]+>\\)"
 			(elmo-network-session-greeting-internal session))
     (signal 'elmo-open-error '(elmo-pop3-auth-apop)))
   ;; good, APOP ready server