* smtp.el (smtp-via-smtp): Fix.

* scram-md5.el (scram-make-unique-nonce): Fix.

diff --git a/ChangeLog b/ChangeLog
index 4de2040..9b57bbe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 1999-12-02  Kenichi OKADA <okada@opaopa.org>
 
+       * smtp.el (smtp-via-smtp): Fix.
+
+1999-12-02  Kenichi OKADA <okada@opaopa.org>
+
+       * scram-md5.el (scram-make-unique-nonce): Fix.
+
+1999-12-02  Kenichi OKADA <okada@opaopa.org>
+
        * smtp.el (smtp-send-command): Add new optional argument
        to delete insecure words in a trace buffer.
        (smtp-auth-cram-md5): Update.

diff --git a/scram-md5.el b/scram-md5.el
index 85efb08..7a22f27 100644 (file)
--- a/scram-md5.el
+++ b/scram-md5.el
@@ -5,6 +5,8 @@
 ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
 ;; Keywords: SCRAM-MD5, HMAC-MD5, SASL, IMAP, POP, ACAP
 
+;; This file is part of FLIM (Faithful Library about Internet Message).
+
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
 ;; published by the Free Software Foundation; either version 2, or
@@ -62,7 +64,7 @@
 (defun scram-make-unique-nonce ()      ; 8*OCTET, globally unique.
   ;; For example, concatenated string of process-identifier, system-clock,
   ;; sequence-number, random-number, and domain-name.
-  (concat "foo" "bar" "baz" "@" (system-name))) ; TEMPORARY
+  (concat "<" "foo" "bar" "baz" "@" (system-name) ">")) ; TEMPORARY
   
 (defun scram-xor-string (str1 str2)
   ;; (length str1) == (length str2) == (length dst) == 16 (in SCRAM-MD5)

diff --git a/smtp.el b/smtp.el
index 4294457..2cb1e37 100644 (file)
--- a/smtp.el
+++ b/smtp.el
@@ -206,37 +206,37 @@ don't define this value."
                         (format "AUTH mechanism %s not available" auth)))))
 
            ;; ONEX --- One message transaction only (sendmail extension?)
-;;         (if (or (memq 'onex extensions)
-;;                 (memq 'xone extensions))
-;;             (progn
-;;               (smtp-send-command process "ONEX")
-;;               (setq response (smtp-read-response process))
-;;               (if (or (null (car response))
-;;                       (not (integerp (car response)))
-;;                       (>= (car response) 400))
-;;                   (throw 'done (car (cdr response))))))
+;;;        (if (or (memq 'onex extensions)
+;;;                (memq 'xone extensions))
+;;;            (progn
+;;;              (smtp-send-command process "ONEX")
+;;;              (setq response (smtp-read-response process))
+;;;              (if (or (null (car response))
+;;;                      (not (integerp (car response)))
+;;;                      (>= (car response) 400))
+;;;                  (throw 'done (car (cdr response))))))
 
            ;; VERB --- Verbose (sendmail extension?)
-;;         (if (and smtp-debug-info
-;;                  (or (memq 'verb extensions)
-;;                      (memq 'xvrb extensions)))
-;;             (progn
-;;               (smtp-send-command process "VERB")
-;;               (setq response (smtp-read-response process))
-;;               (if (or (null (car response))
-;;                       (not (integerp (car response)))
-;;                       (>= (car response) 400))
-;;                   (throw 'done (car (cdr response))))))
+;;;        (if (and smtp-debug-info
+;;;                 (or (memq 'verb extensions)
+;;;                     (memq 'xvrb extensions)))
+;;;            (progn
+;;;              (smtp-send-command process "VERB")
+;;;              (setq response (smtp-read-response process))
+;;;              (if (or (null (car response))
+;;;                      (not (integerp (car response)))
+;;;                      (>= (car response) 400))
+;;;                  (throw 'done (car (cdr response))))))
 
            ;; XUSR --- Initial (user) submission (sendmail extension?)
-;;         (if (memq 'xusr extensions)
-;;             (progn
-;;               (smtp-send-command process "XUSR")
-;;               (setq response (smtp-read-response process))
-;;               (if (or (null (car response))
-;;                       (not (integerp (car response)))
-;;                       (>= (car response) 400))
-;;                   (throw 'done (car (cdr response))))))
+;;;        (if (memq 'xusr extensions)
+;;;            (progn
+;;;              (smtp-send-command process "XUSR")
+;;;              (setq response (smtp-read-response process))
+;;;              (if (or (null (car response))
+;;;                      (not (integerp (car response)))
+;;;                      (>= (car response) 400))
+;;;                  (throw 'done (car (cdr response))))))
 
            ;; MAIL FROM:<sender>
            (smtp-send-command