From: okada <okada>
Date: Sun, 19 Nov 2000 15:23:06 +0000 (+0000)
Subject: * elmo-pop3.el (toplevel): Delete defun-maybe for sasl-*.
X-Git-Tag: wl-2_6-root~193
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=321db2156b277c70a81b22a19b0004f46b77e892;p=elisp%2Fwanderlust.git

* elmo-pop3.el (toplevel): Delete defun-maybe for sasl-*.
Delete `elmo-pop3-authenticator-alist'.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 18a5e5a..2b6bd8f 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,16 @@
 2000-11-19  Kenichi OKADA  <okada@opaopa.org>
 
+	* elmo-pop3.el (toplevel): Delete defun-maybe for sasl-*.
+	Delete `elmo-pop3-authenticator-alist'.
+
+2000-11-19  Kenichi OKADA  <okada@opaopa.org>
+
+	* elmo-pop3.el (elmo-network-authenticate-session): Rewrite for
+	new SASL API.
+	* elmo-imap4.el (elmo-network-authenticate-session): Ditto.
+
+2000-11-19  Kenichi OKADA  <okada@opaopa.org>
+
 	* elmo-version.el (elmo-version): Up to 2.5.2.
 
 2000-11-15  Yuuichi Teranishi  <teranisi@gohome.org>
diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 892862a..407f35e 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -41,17 +41,6 @@
 	(require 'sasl))
     (error))
   (defun-maybe md5 (a))
-  (defun-maybe sasl-digest-md5-digest-response
-    (digest-challenge username passwd serv-type host &optional realm))
-  (defun-maybe sasl-scram-md5-client-msg-1
-    (authenticate-id &optional authorize-id))
-  (defun-maybe sasl-scram-md5-client-msg-2
-    (server-msg-1 client-msg-1 salted-pass))
-  (defun-maybe sasl-scram-md5-make-salted-pass
-    (server-msg-1 passphrase))
-  (defun-maybe sasl-cram-md5 (username passphrase challenge))
-  (defun-maybe sasl-scram-md5-authenticate-server
-    (server-msg-1 server-msg-2 client-msg-1 salted-pass))
   (defun-maybe starttls-negotiate (a)))
 (condition-case nil
     (progn
@@ -63,14 +52,6 @@
 
 (defvar elmo-pop3-exists-exactly t)
 
-(defvar elmo-pop3-authenticator-alist
-  '((user        elmo-pop3-auth-user)
-    (apop        elmo-pop3-auth-apop)
-    (cram-md5    elmo-pop3-auth-cram-md5)
-    (scram-md5   elmo-pop3-auth-scram-md5)
-    (digest-md5  elmo-pop3-auth-digest-md5))
-  "Definition of authenticators.")
-
 (eval-and-compile
   (luna-define-class elmo-pop3-session (elmo-network-session) ()))
 
@@ -363,19 +344,6 @@
 	  (signal 'elmo-open-error
 		  '(elmo-pop3-starttls-error)))))))
 
-;(luna-define-method elmo-network-authenticate-session ((session
-;							elmo-pop3-session))
-;  (let (authenticator)
-;    ;; defaults to 'user.
-;    (unless (elmo-network-session-auth-internal session)
-;      (elmo-network-session-set-auth-internal session 'user))
-;    (setq authenticator
-;	  (nth 1 (assq (elmo-network-session-auth-internal session)
-;		       elmo-pop3-authenticator-alist)))
-;    (unless authenticator (error "There's no authenticator for %s"
-;				 (elmo-network-session-auth-internal session)))
-;    (funcall authenticator session)))
-
 (luna-define-method elmo-network-authenticate-session ((session
 							elmo-pop3-session))
   (let* ((process (elmo-network-session-process-internal session))
diff --git a/elmo/elmo-vars.el b/elmo/elmo-vars.el
index 4866a6d..4c26e37 100644
--- a/elmo/elmo-vars.el
+++ b/elmo/elmo-vars.el
@@ -174,7 +174,6 @@ For disconnected operations.")
 (defvar elmo-imap4-use-select-to-update-status nil
   "*Some imapd have to send select command to update status.
 (ex. UW imapd 4.5-BETA?).  For these imapd, you must set this variable t.")
-
 (defvar elmo-imap4-use-modified-utf7 nil
   "*Use mofidied UTF-7 (rfc2060) encoding for IMAP4 folder name.")
 
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 8e27f5a..a344490 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,9 @@
 2000-11-19  Kenichi OKADA  <okada@opaopa.org>
 
+	* wl-draft.el (wl-smtp-extension-bind): Rewrite for new SASL API.
+
+2000-11-19  Kenichi OKADA  <okada@opaopa.org>
+
 	* Version number is increased to 2.5.2.
 
 2000-11-17  Yuuichi Teranishi  <teranisi@gohome.org>