From 3ca3cb6de657c5b870b21d4be081319ce585410b Mon Sep 17 00:00:00 2001
From: ueno <ueno>
Date: Tue, 7 Nov 2000 14:22:45 +0000
Subject: [PATCH] Synch with deisui-1_14.

---
 ChangeLog |    5 +++++
 sasl.texi |   35 +++++++++++++++++++++++++++++++++++
 smtp.el   |   22 +++++++++++-----------
 3 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a40f66..ae2500e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* sasl.el (sasl-login-response-1): Fix.
 	(sasl-login-response-2): Fix.
 
+2000-11-07   Daiki Ueno  <ueno@unixuser.org>
+
+	* smtp.el (smtp-sasl-properties): New user option.
+	(smtp-sasl-user-realm): Abolish.
+
 2000-11-05   Daiki Ueno  <ueno@unixuser.org>
 
 	* qmtp.el (qmtp-send-package): Don't check "K" reply per recipient.
diff --git a/sasl.texi b/sasl.texi
index 6d6e9ec..4e538d5 100644
--- a/sasl.texi
+++ b/sasl.texi
@@ -10,6 +10,41 @@
 
 @settitle Emacs SASL Library @value{VERSION}
 
+@ifinfo
+This file describes the Emacs SASL library.
+
+Copyright (C) 2000 Daiki Ueno.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the section entitled "GNU
+Free Documentation License".
+@end ifinfo
+
+@tex
+
+@titlepage
+@title Emacs SASL Library
+
+@author by Daiki Ueno
+@page
+
+@vskip 0pt plus 1filll
+Copyright @copyright{} 2000 Daiki Ueno.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.1 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the section entitled "GNU
+Free Documentation License".
+@end titlepage
+@page
+
+@end tex
+
 @node Top
 @top Emacs SASL
 This manual describes the Emacs SASL library.
diff --git a/smtp.el b/smtp.el
index 0e9b28e..7674291 100644
--- a/smtp.el
+++ b/smtp.el
@@ -100,8 +100,8 @@ don't define this value."
   :type 'string
   :group 'smtp-extensions)
 
-(defcustom smtp-sasl-user-realm smtp-local-domain
-  "Realm name to be used for authorization."
+(defcustom smtp-sasl-properties nil
+  "Properties set to SASL client."
   :type 'string
   :group 'smtp-extensions)
 
@@ -122,8 +122,8 @@ don't define this value."
 
 ;;; @ SMTP package structure
 ;;; A package contains a mail message, an envelope sender address,
-;;; and one or more envelope recipient addresses.  In ESMTP model,
-;;; we should guarantee the user to access the current sending package
+;;; and one or more envelope recipient addresses.  In ESMTP model
+;;; the current sending package should be guaranteed to be accessible
 ;;; anywhere from the hook methods (or SMTP commands).
 
 (defmacro smtp-package-sender (package)
@@ -140,8 +140,7 @@ don't define this value."
 
 (defmacro smtp-make-package (sender recipients buffer)
   "Create a new package structure.
-A package is a unit of SMTP message which contains a mail message,
-an envelope sender address, and one or more envelope recipient addresses.
+A package is a unit of SMTP message
 SENDER specifies the package sender, a string.
 RECIPIENTS is a list of recipients.
 BUFFER may be a buffer or a buffer name which contains mail message."
@@ -167,9 +166,10 @@ BUFFER may be a buffer or a buffer name which contains mail message."
       size)))
 
 ;;; @ SMTP connection structure
-;;; We should take care of a emulation for another network stream.
-;;; They are likely to be implemented with a external program and the function
-;;; `process-contact' returns the process ID instead of `(HOST SERVICE)' pair.
+;;; We should consider the function `open-network-stream' is a emulation
+;;; for another network stream.  They are likely to be implemented with an
+;;; external program and the function `process-contact' returns the
+;;; process id instead of `(HOST SERVICE)' pair.
 
 (defmacro smtp-connection-process (connection)
   "Return the subprocess-object of CONNECTION."
@@ -375,8 +375,8 @@ of the host to connect to.  SERVICE is name of the service desired."
       (error "No authentication mechanism available"))
     (setq client (sasl-make-client mechanism smtp-sasl-user-name "smtp"
 				   (smtp-connection-server connection)))
-    (if smtp-sasl-user-realm
-	(sasl-client-set-property client 'realm smtp-sasl-user-realm))
+    (if smtp-sasl-properties
+	(sasl-client-set-properties client smtp-sasl-properties))
     (setq name (sasl-mechanism-name mechanism)
 	  ;; Retrieve the initial response
 	  step (sasl-next-step client nil))
-- 
1.7.10.4