From fd6b0d6017ad425c6e04fc3e6cdc91712895c3fa Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Wed, 22 Dec 2004 02:43:57 +0000
Subject: [PATCH] * wl-vars.el (wl-smtp-authenticate-realm): New user option.

* wl-draft.el (wl-smtp-extension-bind): Use wl-smtp-authenticate-realm.
---
 wl/ChangeLog   |    6 ++++++
 wl/wl-draft.el |   13 ++++---------
 wl/wl-vars.el  |    8 ++++++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index b8b5230..c03ad3e 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-22  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-vars.el (wl-smtp-authenticate-realm): New user option.
+
+	* wl-draft.el (wl-smtp-extension-bind): Use wl-smtp-authenticate-realm.
+
 2004-12-15  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-e21.el (wl-draft-mode-setup): Avoid global-font-lock-mode
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index a2b49a0..ce725e6 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -152,15 +152,10 @@ e.g.
 		 "\n"
 	       smtp-end-of-line))
 	    smtp-sasl-user-name smtp-sasl-properties sasl-read-passphrase)
-       (if (and (string= (car smtp-sasl-mechanisms) "DIGEST-MD5")
-		;; sendmail bug?
-		(string-match "^\\([^@]*\\)@\\([^@]*\\)"
-			      wl-smtp-posting-user))
-	   (setq smtp-sasl-user-name (match-string 1 wl-smtp-posting-user)
-		 smtp-sasl-properties (list 'realm
-					    (match-string 2 wl-smtp-posting-user)))
-	 (setq smtp-sasl-user-name wl-smtp-posting-user
-	       smtp-sasl-properties nil))
+       (setq smtp-sasl-user-name wl-smtp-posting-user
+	     smtp-sasl-properties (when wl-smtp-authenticate-realm
+				    (list 'realm
+					  wl-smtp-authenticate-realm)))
        (setq sasl-read-passphrase
 	     (function
 	      (lambda (prompt)
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index cb56495..6a7d702 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -594,6 +594,14 @@ If nil, don't authenticate."
   :group 'wl
   :group 'wl-setting)
 
+(defcustom wl-smtp-authenticate-realm nil
+  "*SMTP Authentication realm.
+If you don't need to specify realm, set as nil."
+  :type '(choice (const :tag "none" nil)
+		 string)
+  :group 'wl
+  :group 'wl-setting)
+
 (defcustom wl-pop-before-smtp-user nil
   "*POP3 user name to send mail using POP-before-SMTP.
 If nil, `elmo-pop3-default-user' is used.
-- 
1.7.10.4