[Mew-dist 12774] Re: SMTP HELO

[Kazu Yamamoto ( 山本和彦 )]

From: Takashi SATOH <satoh at example.com>
Subject: [Mew-dist 12760] Re: SMTP HELO

> "localhost"とすることができるようになるか、
> configのcaseの影響を受けるようになって欲しいです。

付属のパッチを当ると、mew-smtp-helo-domain という変数が定義され、
mew-config-alist に "smtp-helo-domain" を定義できるようになります。

--かず
Index: mew-blvs.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-blvs.el,v
retrieving revision 1.7
diff -c -r1.7 mew-blvs.el
*** mew-blvs.el	2000/02/04 12:06:11	1.7
--- mew-blvs.el	2000/04/11 04:29:03
***************
*** 52,57 ****
--- 52,58 ----
  (defvar mew-draft-smtp-server nil)
  (defvar mew-draft-smtp-port nil)
  (defvar mew-draft-smtp-ssh-server nil)
+ (defvar mew-draft-smtp-helo-domain nil)
  (defvar mew-draft-buffer-config nil)
  (defvar mew-overlay-header-keymap nil)
  (defvar mew-overlay-attach-keymap nil)
***************
*** 104,109 ****
--- 105,111 ----
  	      'mew-draft-smtp-server
  	      'mew-draft-smtp-port
  	      'mew-draft-smtp-ssh-server
+ 	      'mew-draft-smtp-helo-domain
  	      'mew-draft-buffer-config
  	      'mew-overlay-header-keymap
  	      'mew-overlay-attach-keymap
Index: mew-config.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-config.el,v
retrieving revision 1.28
diff -c -r1.28 mew-config.el
*** mew-config.el	2000/04/06 09:47:55	1.28
--- mew-config.el	2000/04/11 04:28:28
***************
*** 137,142 ****
--- 137,146 ----
    (or (mew-cfent-value case "smtp-ssh-server")
        mew-smtp-ssh-server))
  
+ (defun mew-smtp-helo-domain (&optional case)
+   (or (mew-cfent-value case "smtp-helo-domain")
+       mew-smtp-helo-domain))
+ 
  (defun mew-nntp-server (&optional case)
    (or (mew-cfent-value case "nntp-server")
        mew-nntp-server))
Index: mew-encode.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-encode.el,v
retrieving revision 1.180
diff -c -r1.180 mew-encode.el
*** mew-encode.el	2000/03/10 09:53:59	1.180
--- mew-encode.el	2000/04/11 04:33:36
***************
*** 189,194 ****
--- 189,195 ----
      (setq mew-draft-smtp-server (mew-smtp-server case))
      (setq mew-draft-smtp-port (mew-smtp-port case))
      (setq mew-draft-smtp-ssh-server (mew-smtp-ssh-server case))
+     (setq mew-draft-smtp-helo-domain (mew-smtp-helo-domain case))
      (setq mew-draft-msgid (mew-message-id case))
      (setq mew-draft-date (format-time-string "%Y/%m/%d %H:%M:%S" time))
      ;;
Index: mew-smtp.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-smtp.el,v
retrieving revision 1.72
diff -c -r1.72 mew-smtp.el
*** mew-smtp.el	2000/03/13 05:16:43	1.72
--- mew-smtp.el	2000/04/11 04:35:24
***************
*** 304,310 ****
  (defun mew-smtp-filter-greeting (pro pnm)
    (mew-smtp-set-status pnm "helo")
    ;; xxx case?
!   (process-send-string pro (format "HELO %s\n" (mew-mail-domain))))
  
  (defun mew-smtp-filter-helo (pro pnm)
    ;; Session is about to start. Let's lock the connection first.
--- 304,310 ----
  (defun mew-smtp-filter-greeting (pro pnm)
    (mew-smtp-set-status pnm "helo")
    ;; xxx case?
!   (process-send-string pro (format "HELO %s\n" mew-draft-smtp-helo-domain)))
  
  (defun mew-smtp-filter-helo (pro pnm)
    ;; Session is about to start. Let's lock the connection first.
***************
*** 463,468 ****
--- 463,469 ----
        (cons "Server:" mew-draft-smtp-server)
        (cons "Port:" mew-draft-smtp-port)
        (cons "SSH:" mew-draft-smtp-ssh-server)
+       (cons "Helo:" mew-draft-smtp-helo-domain)
        (cons "Error:" err)))
      (kill-buffer (current-buffer))
      (message "%s has been queued to %s (%s)"
***************
*** 495,500 ****
--- 496,502 ----
        (setq mew-draft-smtp-server (cdr (assoc "Server:" syntax)))
        (setq mew-draft-smtp-port (cdr (assoc "Port:" syntax)))
        (setq mew-draft-smtp-ssh-server (cdr (assoc "SSH:" syntax)))
+       (setq mew-draft-smtp-helo-domain (cdr (assoc "Helo:" syntax)))
        t)))
  
  (defun mew-smtp-get-next (msgs)
Index: mew-vars.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-vars.el,v
retrieving revision 1.248
diff -c -r1.248 mew-vars.el
*** mew-vars.el	2000/04/07 08:42:23	1.248
--- mew-vars.el	2000/04/11 04:27:27
***************
*** 297,302 ****
--- 297,304 ----
  (defvar mew-smtp-timeout-time 4)
  (defvar mew-smtp-msgid-domain nil)
  
+ (defvar mew-smtp-helo-domain "localhost")
+ 
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;;
  ;;; Demo
Index: mew-vars2.el
===================================================================
RCS file: /usr/home/kazu/cvsroot/Mew/mew/mew-vars2.el,v
retrieving revision 1.6
diff -c -r1.6 mew-vars2.el
*** mew-vars2.el	2000/04/06 11:59:44	1.6
--- mew-vars2.el	2000/04/11 04:30:23
***************
*** 666,671 ****
--- 666,672 ----
  
  Currently, the following keys are supported: \"user\", \"name\",
  \"mail-domain\", \"cc\", \"fcc\", \"dcc\", \"reply-to\",
+ \"smtp-server\", \"smtp-port\", \"smtp-ssh-server\", \"smtp-helo-domain\", 
  \"organization\", \"nttp-server\", \"msgid-domain\", 
  \"header-alist\", \"inbox-folder\".