1997-04-20 07:33:52 +00:00
|
|
|
;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail
|
1996-06-07 14:21:50 +00:00
|
|
|
|
2011-01-25 04:08:28 +00:00
|
|
|
;; Copyright (C) 1995-1996, 2001-2011 Free Software Foundation, Inc.
|
1996-06-07 14:21:50 +00:00
|
|
|
|
|
|
|
;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
;; Maintainer: Simon Josefsson <simon@josefsson.org>
|
|
|
|
;; w32 Maintainer: Brian D. Carlstrom <bdc@ai.mit.edu>
|
1997-06-01 22:24:22 +00:00
|
|
|
;; ESMTP support: Simon Leinen <simon@switch.ch>
|
2001-05-18 11:24:16 +00:00
|
|
|
;; Hacked by Mike Taylor, 11th October 1999 to add support for
|
|
|
|
;; automatically appending a domain to RCPT TO: addresses.
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
;; AUTH=LOGIN support: Stephen Cranefield <scranefield@infoscience.otago.ac.nz>
|
1996-06-07 14:21:50 +00:00
|
|
|
;; Keywords: mail
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 07:25:26 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1996-06-07 14:21:50 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 07:25:26 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
1996-06-07 14:21:50 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 07:25:26 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1996-06-07 14:21:50 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; Send Mail to smtp host from smtpmail temp buffer.
|
|
|
|
|
1998-08-29 15:56:41 +00:00
|
|
|
;; Please add these lines in your .emacs(_emacs) or use customize.
|
1996-06-07 14:21:50 +00:00
|
|
|
;;
|
1998-08-29 15:56:41 +00:00
|
|
|
;;(setq send-mail-function 'smtpmail-send-it) ; if you use `mail'
|
2002-04-25 21:45:22 +00:00
|
|
|
;;(setq message-send-mail-function 'smtpmail-send-it) ; if you use message/Gnus
|
1996-06-07 14:21:50 +00:00
|
|
|
;;(setq smtpmail-default-smtp-server "YOUR SMTP HOST")
|
|
|
|
;;(setq smtpmail-local-domain "YOUR DOMAIN NAME")
|
1999-10-14 22:09:58 +00:00
|
|
|
;;(setq smtpmail-sendto-domain "YOUR DOMAIN NAME")
|
1998-08-29 15:56:41 +00:00
|
|
|
;;(setq smtpmail-debug-info t) ; only to debug problems
|
2002-04-25 23:39:21 +00:00
|
|
|
;;(setq smtpmail-auth-credentials ; or use ~/.authinfo
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
;; '(("YOUR SMTP HOST" 25 "username" "password")))
|
|
|
|
;;(setq smtpmail-starttls-credentials
|
|
|
|
;; '(("YOUR SMTP HOST" 25 "~/.my_smtp_tls.key" "~/.my_smtp_tls.cert")))
|
2004-04-09 13:39:30 +00:00
|
|
|
;; Where the 25 equals the value of `smtpmail-smtp-service', it can be an
|
|
|
|
;; integer or a string, just as long as they match (eq).
|
1996-06-07 14:21:50 +00:00
|
|
|
|
2009-05-25 01:13:59 +00:00
|
|
|
;; To queue mail, set `smtpmail-queue-mail' to t and use
|
|
|
|
;; `smtpmail-send-queued-mail' to send.
|
1997-06-01 23:26:16 +00:00
|
|
|
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
;; Modified by Stephen Cranefield <scranefield@infoscience.otago.ac.nz>,
|
|
|
|
;; 22/6/99, to support SMTP Authentication by the AUTH=LOGIN mechanism.
|
|
|
|
;; See http://help.netscape.com/products/server/messaging/3x/info/smtpauth.html
|
|
|
|
;; Rewritten by Simon Josefsson to use same credential variable as AUTH
|
|
|
|
;; support below.
|
|
|
|
|
|
|
|
;; Modified by Simon Josefsson <jas@pdc.kth.se>, 22/2/99, to support SMTP
|
|
|
|
;; Authentication by the AUTH mechanism.
|
|
|
|
;; See http://www.ietf.org/rfc/rfc2554.txt
|
|
|
|
|
|
|
|
;; Modified by Simon Josefsson <simon@josefsson.org>, 2000-10-07, to support
|
|
|
|
;; STARTTLS. Requires external program
|
|
|
|
;; ftp://ftp.opaopa.org/pub/elisp/starttls-*.tar.gz.
|
|
|
|
;; See http://www.ietf.org/rfc/rfc2246.txt, http://www.ietf.org/rfc/rfc2487.txt
|
1997-06-01 23:26:16 +00:00
|
|
|
|
1996-06-07 14:21:50 +00:00
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(require 'sendmail)
|
2008-11-10 20:13:41 +00:00
|
|
|
(autoload 'starttls-any-program-available "starttls")
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(autoload 'starttls-open-stream "starttls")
|
|
|
|
(autoload 'starttls-negotiate "starttls")
|
|
|
|
(autoload 'mail-strip-quoted-names "mail-utils")
|
2001-12-01 00:36:12 +00:00
|
|
|
(autoload 'message-make-date "message")
|
|
|
|
(autoload 'message-make-message-id "message")
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(autoload 'rfc2104-hash "rfc2104")
|
2002-04-25 23:39:21 +00:00
|
|
|
(autoload 'netrc-parse "netrc")
|
2002-05-08 13:13:41 +00:00
|
|
|
(autoload 'netrc-machine "netrc")
|
|
|
|
(autoload 'netrc-get "netrc")
|
2008-02-14 14:59:32 +00:00
|
|
|
(autoload 'password-read "password-cache")
|
2011-02-12 17:51:02 +00:00
|
|
|
(autoload 'auth-source-search "auth-source")
|
2008-05-12 12:40:12 +00:00
|
|
|
|
1996-06-07 14:21:50 +00:00
|
|
|
;;;
|
1997-04-13 07:51:54 +00:00
|
|
|
(defgroup smtpmail nil
|
|
|
|
"SMTP protocol for sending mail."
|
|
|
|
:group 'mail)
|
1996-06-07 14:21:50 +00:00
|
|
|
|
1997-04-13 07:51:54 +00:00
|
|
|
|
|
|
|
(defcustom smtpmail-default-smtp-server nil
|
2008-02-23 19:33:50 +00:00
|
|
|
"Specify default SMTP server.
|
2002-09-11 04:53:40 +00:00
|
|
|
This only has effect if you specify it before loading the smtpmail library."
|
1997-04-13 07:51:54 +00:00
|
|
|
:type '(choice (const nil) string)
|
|
|
|
:group 'smtpmail)
|
|
|
|
|
2002-04-26 18:59:08 +00:00
|
|
|
(defcustom smtpmail-smtp-server
|
1996-06-18 22:35:10 +00:00
|
|
|
(or (getenv "SMTPSERVER") smtpmail-default-smtp-server)
|
2008-02-23 19:33:50 +00:00
|
|
|
"The name of the host running SMTP server."
|
1997-04-13 07:51:54 +00:00
|
|
|
:type '(choice (const nil) string)
|
|
|
|
:group 'smtpmail)
|
1996-06-07 14:21:50 +00:00
|
|
|
|
1997-04-13 07:51:54 +00:00
|
|
|
(defcustom smtpmail-smtp-service 25
|
2008-02-23 19:33:50 +00:00
|
|
|
"SMTP service port number.
|
2007-02-09 16:17:56 +00:00
|
|
|
The default value would be \"smtp\" or 25."
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
:type '(choice (integer :tag "Port") (string :tag "Service"))
|
1997-04-13 07:51:54 +00:00
|
|
|
:group 'smtpmail)
|
1996-06-07 14:21:50 +00:00
|
|
|
|
1997-04-13 07:51:54 +00:00
|
|
|
(defcustom smtpmail-local-domain nil
|
2008-02-23 19:33:50 +00:00
|
|
|
"Local domain name without a host name.
|
2007-02-09 16:17:56 +00:00
|
|
|
If the function `system-name' returns the full internet address,
|
1997-04-13 07:51:54 +00:00
|
|
|
don't define this value."
|
|
|
|
:type '(choice (const nil) string)
|
|
|
|
:group 'smtpmail)
|
|
|
|
|
1999-10-14 22:09:58 +00:00
|
|
|
(defcustom smtpmail-sendto-domain nil
|
2008-02-23 19:33:50 +00:00
|
|
|
"Local domain name without a host name.
|
1999-10-14 22:09:58 +00:00
|
|
|
This is appended (with an @-sign) to any specified recipients which do
|
|
|
|
not include an @-sign, so that each RCPT TO address is fully qualified.
|
|
|
|
\(Some configurations of sendmail require this.)
|
|
|
|
|
|
|
|
Don't bother to set this unless you have get an error like:
|
|
|
|
Sending failed; SMTP protocol error
|
|
|
|
when sending mail, and the *trace of SMTP session to <somewhere>*
|
|
|
|
buffer includes an exchange like:
|
|
|
|
RCPT TO: <someone>
|
2009-05-25 01:13:59 +00:00
|
|
|
501 <someone>: recipient address must contain a domain."
|
1999-10-14 22:09:58 +00:00
|
|
|
:type '(choice (const nil) string)
|
|
|
|
:group 'smtpmail)
|
|
|
|
|
1997-04-13 07:51:54 +00:00
|
|
|
(defcustom smtpmail-debug-info nil
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
"Whether to print info in buffer *trace of SMTP session to <somewhere>*.
|
|
|
|
See also `smtpmail-debug-verb' which determines if the SMTP protocol should
|
|
|
|
be verbose as well."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'smtpmail)
|
|
|
|
|
|
|
|
(defcustom smtpmail-debug-verb nil
|
|
|
|
"Whether this library sends the SMTP VERB command or not.
|
|
|
|
The commands enables verbose information from the SMTP server."
|
1997-04-13 07:51:54 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'smtpmail)
|
|
|
|
|
2008-02-23 19:33:50 +00:00
|
|
|
(defcustom smtpmail-code-conv-from nil
|
|
|
|
"Coding system for encoding outgoing mail.
|
|
|
|
Used for the value of `sendmail-coding-system' when
|
|
|
|
`select-message-coding-system' is called. "
|
|
|
|
:type 'coding-system
|
1997-04-13 07:51:54 +00:00
|
|
|
:group 'smtpmail)
|
1996-06-07 14:21:50 +00:00
|
|
|
|
2002-04-26 18:59:08 +00:00
|
|
|
(defcustom smtpmail-queue-mail nil
|
2008-02-23 19:33:50 +00:00
|
|
|
"Non-nil means mail is queued; otherwise it is sent immediately.
|
1997-06-01 23:26:16 +00:00
|
|
|
If queued, it is stored in the directory `smtpmail-queue-dir'
|
|
|
|
and sent with `smtpmail-send-queued-mail'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'smtpmail)
|
|
|
|
|
|
|
|
(defcustom smtpmail-queue-dir "~/Mail/queued-mail/"
|
2008-02-23 19:33:50 +00:00
|
|
|
"Directory where `smtpmail.el' stores queued mail."
|
1997-06-01 23:26:16 +00:00
|
|
|
:type 'directory
|
|
|
|
:group 'smtpmail)
|
|
|
|
|
2002-04-25 23:39:21 +00:00
|
|
|
(defcustom smtpmail-auth-credentials "~/.authinfo"
|
|
|
|
"Specify username and password for servers, directly or via .netrc file.
|
|
|
|
This variable can either be a filename pointing to a file in netrc(5)
|
|
|
|
format, or list of four-element lists that contain, in order,
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
`servername' (a string), `port' (an integer), `user' (a string) and
|
2002-04-25 23:39:21 +00:00
|
|
|
`password' (a string, or nil to query the user when needed). If you
|
|
|
|
need to enter a `realm' too, add it to the user string, so that it
|
|
|
|
looks like `user@realm'."
|
|
|
|
:type '(choice file
|
|
|
|
(repeat (list (string :tag "Server")
|
2009-05-25 01:13:59 +00:00
|
|
|
(integer :tag "Port")
|
|
|
|
(string :tag "Username")
|
|
|
|
(choice (const :tag "Query when needed" nil)
|
2002-04-25 23:39:21 +00:00
|
|
|
(string :tag "Password")))))
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1"
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
:group 'smtpmail)
|
|
|
|
|
|
|
|
(defcustom smtpmail-starttls-credentials '(("" 25 "" ""))
|
|
|
|
"Specify STARTTLS keys and certificates for servers.
|
|
|
|
This is a list of four-element list with `servername' (a string),
|
2006-09-06 09:08:55 +00:00
|
|
|
`port' (an integer), `key' (a filename) and `certificate' (a
|
|
|
|
filename).
|
|
|
|
If you do not have a certificate/key pair, leave the `key' and
|
|
|
|
`certificate' fields as `nil'. A key/certificate pair is only
|
|
|
|
needed if you want to use X.509 client authenticated
|
|
|
|
connections."
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
:type '(repeat (list (string :tag "Server")
|
|
|
|
(integer :tag "Port")
|
|
|
|
(file :tag "Key")
|
|
|
|
(file :tag "Certificate")))
|
|
|
|
:version "21.1"
|
|
|
|
:group 'smtpmail)
|
|
|
|
|
2001-05-07 11:24:51 +00:00
|
|
|
(defcustom smtpmail-warn-about-unknown-extensions nil
|
2008-02-23 19:33:50 +00:00
|
|
|
"If set, print warnings about unknown SMTP extensions.
|
2001-05-07 11:24:51 +00:00
|
|
|
This is mainly useful for development purposes, to learn about
|
|
|
|
new SMTP extensions that might be useful to support."
|
|
|
|
:type 'boolean
|
2001-05-07 11:26:24 +00:00
|
|
|
:version "21.1"
|
2001-05-07 11:24:51 +00:00
|
|
|
:group 'smtpmail)
|
|
|
|
|
2008-02-23 19:33:50 +00:00
|
|
|
(defcustom smtpmail-queue-index-file "index"
|
2007-02-09 16:17:56 +00:00
|
|
|
"File name of queued mail index.
|
2008-02-23 19:33:50 +00:00
|
|
|
This is relative to `smtpmail-queue-dir'."
|
|
|
|
:type 'string
|
|
|
|
:group 'smtpmail)
|
|
|
|
|
|
|
|
;; End of customizable variables.
|
|
|
|
|
1997-06-01 23:26:16 +00:00
|
|
|
|
1998-10-13 15:32:12 +00:00
|
|
|
(defvar smtpmail-address-buffer)
|
|
|
|
(defvar smtpmail-recipient-address-list)
|
|
|
|
|
2002-04-25 21:45:22 +00:00
|
|
|
(defvar smtpmail-queue-counter 0)
|
|
|
|
|
1998-10-13 15:32:12 +00:00
|
|
|
;; Buffer-local variable.
|
|
|
|
(defvar smtpmail-read-point)
|
|
|
|
|
2005-07-17 07:44:34 +00:00
|
|
|
(defconst smtpmail-auth-supported '(cram-md5 plain login)
|
2009-03-03 16:28:17 +00:00
|
|
|
"List of supported SMTP AUTH mechanisms.
|
|
|
|
The list is in preference order.")
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
|
2002-05-12 17:01:59 +00:00
|
|
|
(defvar smtpmail-mail-address nil
|
2003-08-24 15:23:12 +00:00
|
|
|
"Value to use for envelope-from address for mail from ambient buffer.")
|
2002-05-12 17:01:59 +00:00
|
|
|
|
1998-08-29 15:56:41 +00:00
|
|
|
;;;###autoload
|
1996-06-07 14:21:50 +00:00
|
|
|
(defun smtpmail-send-it ()
|
|
|
|
(let ((errbuf (if mail-interactive
|
|
|
|
(generate-new-buffer " smtpmail errors")
|
|
|
|
0))
|
|
|
|
(tembuf (generate-new-buffer " smtpmail temp"))
|
|
|
|
(case-fold-search nil)
|
|
|
|
delimline
|
1999-05-25 11:12:17 +00:00
|
|
|
(mailbuf (current-buffer))
|
2003-08-26 17:42:27 +00:00
|
|
|
;; Examine this variable now, so that
|
|
|
|
;; local binding in the mail buffer will take effect.
|
2003-08-24 15:23:12 +00:00
|
|
|
(smtpmail-mail-address
|
|
|
|
(or (and mail-specify-envelope-from (mail-envelope-from))
|
|
|
|
user-mail-address))
|
1999-05-25 11:12:17 +00:00
|
|
|
(smtpmail-code-conv-from
|
|
|
|
(if enable-multibyte-characters
|
|
|
|
(let ((sendmail-coding-system smtpmail-code-conv-from))
|
|
|
|
(select-message-coding-system)))))
|
1996-06-07 14:21:50 +00:00
|
|
|
(unwind-protect
|
* url-util.el (url-insert-entities-in-string):
* url-nfs.el (url-nfs-unescape):
* url-ldap.el (url-ldap):
* url-imap.el (url-imap):
* url-cid.el (url-cid-gnus, url-cid): Use with-current-buffer.
* erc.el (erc-display-line-1, erc-process-away):
* erc-truncate.el (erc-truncate-buffer-to-size):
Use with-current-buffer.
* term/ns-win.el (ns-scroll-bar-move, ns-face-at-pos):
* play/mpuz.el (mpuz-create-buffer):
* play/landmark.el (lm-prompt-for-move, lm-print-wts, lm-print-smell)
(lm-print-y,s,noise, lm-print-w0, lm-init):
* play/gomoku.el (gomoku-prompt-for-move):
* play/fortune.el (fortune-in-buffer):
* play/dissociate.el (dissociated-press):
* play/decipher.el (decipher-adjacency-list, decipher-display-regexp)
(decipher-analyze-buffer, decipher-stats-buffer,decipher-stats-buffer):
* mail/supercite.el (sc-eref-show):
* mail/smtpmail.el (smtpmail-send-it):
* mail/rmailsum.el (rmail-summary-next-labeled-message)
(rmail-summary-previous-labeled-message, rmail-summary-wipe)
(rmail-summary-undelete-many, rmail-summary-rmail-update)
(rmail-summary-goto-msg, rmail-summary-expunge)
(rmail-summary-get-new-mail, rmail-summary-search-backward)
(rmail-summary-add-label, rmail-summary-output-menu)
(rmail-summary-output-body):
* mail/rfc822.el (rfc822-addresses):
* mail/reporter.el (reporter-dump-variable, reporter-dump-state):
* mail/mailpost.el (post-mail-send-it):
* mail/hashcash.el (hashcash-generate-payment):
* mail/feedmail.el (feedmail-run-the-queue)
(feedmail-queue-send-edit-prompt-help-first)
(feedmail-send-it-immediately, feedmail-give-it-to-buffer-eater)
(feedmail-deduce-address-list):
* eshell/esh-ext.el (eshell-remote-command):
* eshell/em-unix.el (eshell-occur-mode-mouse-goto):
* emulation/viper-util.el (viper-glob-unix-files, viper-save-setting)
(viper-wildcard-to-regexp, viper-glob-mswindows-files)
(viper-save-string-in-file, viper-valid-marker):
* emulation/viper-keym.el (viper-toggle-key):
* emulation/viper-ex.el (ex-expand-filsyms, viper-get-ex-file)
(ex-edit, ex-global, ex-mark, ex-next-related-buffer, ex-quit)
(ex-get-inline-cmd-args, ex-tag, ex-command, ex-compile):
* emulation/viper-cmd.el (viper-exec-form-in-vi)
(viper-exec-form-in-emacs, viper-brac-function):
* emulation/viper.el (viper-delocalize-var):
* emulation/vip.el (vip-mode, vip-get-ex-token, vip-ex, vip-get-ex-pat)
(vip-get-ex-command, vip-get-ex-opt-gc, vip-get-ex-buffer)
(vip-get-ex-count, vip-get-ex-file, ex-edit, ex-global, ex-mark)
(ex-map, ex-unmap, ex-quit, ex-read, ex-tag, ex-command):
* emulation/vi.el (vi-switch-mode, vi-ex-cmd):
* emulation/edt.el (edt-electric-helpify):
* emulation/cua-rect.el (cua--rectangle-aux-replace):
* emulation/cua-gmrk.el (cua--insert-at-global-mark)
(cua--delete-at-global-mark, cua--copy-rectangle-to-global-mark)
(cua-indent-to-global-mark-column):
* calendar/diary-lib.el (calendar-mark-1):
* calendar/cal-hebrew.el (calendar-hebrew-mark-date-pattern):
Use with-current-buffer.
* emulation/viper.el (viper-delocalize-var): Use dolist.
2009-11-03 02:04:29 +00:00
|
|
|
(with-current-buffer tembuf
|
1996-06-07 14:21:50 +00:00
|
|
|
(erase-buffer)
|
2009-05-25 01:13:59 +00:00
|
|
|
;; Use the same `buffer-file-coding-system' as in the mail
|
|
|
|
;; buffer, otherwise any `write-region' invocations (e.g., in
|
2006-11-24 14:33:19 +00:00
|
|
|
;; mail-do-fcc below) will annoy with asking for a suitable
|
|
|
|
;; encoding.
|
|
|
|
(set-buffer-file-coding-system smtpmail-code-conv-from nil t)
|
1996-06-07 14:21:50 +00:00
|
|
|
(insert-buffer-substring mailbuf)
|
|
|
|
(goto-char (point-max))
|
|
|
|
;; require one newline at the end.
|
|
|
|
(or (= (preceding-char) ?\n)
|
|
|
|
(insert ?\n))
|
|
|
|
;; Change header-delimiter to be what sendmail expects.
|
1998-04-30 06:12:32 +00:00
|
|
|
(mail-sendmail-undelimit-header)
|
1996-06-07 14:21:50 +00:00
|
|
|
(setq delimline (point-marker))
|
2009-05-25 01:13:59 +00:00
|
|
|
;; (sendmail-synch-aliases)
|
1996-06-07 14:21:50 +00:00
|
|
|
(if mail-aliases
|
|
|
|
(expand-mail-aliases (point-min) delimline))
|
|
|
|
(goto-char (point-min))
|
|
|
|
;; ignore any blank lines in the header
|
|
|
|
(while (and (re-search-forward "\n\n\n*" delimline t)
|
|
|
|
(< (point) delimline))
|
|
|
|
(replace-match "\n"))
|
|
|
|
(let ((case-fold-search t))
|
1998-04-20 18:03:00 +00:00
|
|
|
;; We used to process Resent-... headers here,
|
|
|
|
;; but it was not done properly, and the job
|
2009-05-25 01:13:59 +00:00
|
|
|
;; is done correctly in `smtpmail-deduce-address-list'.
|
1996-06-07 14:21:50 +00:00
|
|
|
;; Don't send out a blank subject line
|
|
|
|
(goto-char (point-min))
|
1998-04-20 18:03:00 +00:00
|
|
|
(if (re-search-forward "^Subject:\\([ \t]*\n\\)+\\b" delimline t)
|
|
|
|
(replace-match "")
|
|
|
|
;; This one matches a Subject just before the header delimiter.
|
|
|
|
(if (and (re-search-forward "^Subject:\\([ \t]*\n\\)+" delimline t)
|
|
|
|
(= (match-end 0) delimline))
|
|
|
|
(replace-match "")))
|
1996-06-18 22:38:23 +00:00
|
|
|
;; Put the "From:" field in unless for some odd reason
|
|
|
|
;; they put one in themselves.
|
|
|
|
(goto-char (point-min))
|
|
|
|
(if (not (re-search-forward "^From:" delimline t))
|
2002-05-12 17:01:59 +00:00
|
|
|
(let* ((login smtpmail-mail-address)
|
1996-06-18 22:38:23 +00:00
|
|
|
(fullname (user-full-name)))
|
|
|
|
(cond ((eq mail-from-style 'angles)
|
|
|
|
(insert "From: " fullname)
|
|
|
|
(let ((fullname-start (+ (point-min) 6))
|
|
|
|
(fullname-end (point-marker)))
|
|
|
|
(goto-char fullname-start)
|
|
|
|
;; Look for a character that cannot appear unquoted
|
|
|
|
;; according to RFC 822.
|
|
|
|
(if (re-search-forward "[^- !#-'*+/-9=?A-Z^-~]"
|
|
|
|
fullname-end 1)
|
|
|
|
(progn
|
|
|
|
;; Quote fullname, escaping specials.
|
|
|
|
(goto-char fullname-start)
|
|
|
|
(insert "\"")
|
|
|
|
(while (re-search-forward "[\"\\]"
|
|
|
|
fullname-end 1)
|
|
|
|
(replace-match "\\\\\\&" t))
|
|
|
|
(insert "\""))))
|
|
|
|
(insert " <" login ">\n"))
|
|
|
|
((eq mail-from-style 'parens)
|
|
|
|
(insert "From: " login " (")
|
|
|
|
(let ((fullname-start (point)))
|
|
|
|
(insert fullname)
|
|
|
|
(let ((fullname-end (point-marker)))
|
|
|
|
(goto-char fullname-start)
|
|
|
|
;; RFC 822 says \ and nonmatching parentheses
|
|
|
|
;; must be escaped in comments.
|
|
|
|
;; Escape every instance of ()\ ...
|
|
|
|
(while (re-search-forward "[()\\]" fullname-end 1)
|
|
|
|
(replace-match "\\\\\\&" t))
|
|
|
|
;; ... then undo escaping of matching parentheses,
|
|
|
|
;; including matching nested parentheses.
|
|
|
|
(goto-char fullname-start)
|
2002-04-26 18:59:08 +00:00
|
|
|
(while (re-search-forward
|
1996-06-18 22:38:23 +00:00
|
|
|
"\\(\\=\\|[^\\]\\(\\\\\\\\\\)*\\)\\\\(\\(\\([^\\]\\|\\\\\\\\\\)*\\)\\\\)"
|
|
|
|
fullname-end 1)
|
|
|
|
(replace-match "\\1(\\3)" t)
|
|
|
|
(goto-char fullname-start))))
|
|
|
|
(insert ")\n"))
|
|
|
|
((null mail-from-style)
|
|
|
|
(insert "From: " login "\n")))))
|
2001-12-01 00:36:12 +00:00
|
|
|
;; Insert a `Message-Id:' field if there isn't one yet.
|
|
|
|
(goto-char (point-min))
|
|
|
|
(unless (re-search-forward "^Message-Id:" delimline t)
|
|
|
|
(insert "Message-Id: " (message-make-message-id) "\n"))
|
|
|
|
;; Insert a `Date:' field if there isn't one yet.
|
|
|
|
(goto-char (point-min))
|
|
|
|
(unless (re-search-forward "^Date:" delimline t)
|
|
|
|
(insert "Date: " (message-make-date) "\n"))
|
2006-11-24 14:33:19 +00:00
|
|
|
;; Possibly add a MIME header for the current coding system
|
|
|
|
(let (charset)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(and (eq mail-send-nonascii 'mime)
|
|
|
|
(not (re-search-forward "^MIME-version:" delimline t))
|
|
|
|
(progn (skip-chars-forward "\0-\177")
|
|
|
|
(/= (point) (point-max)))
|
|
|
|
smtpmail-code-conv-from
|
|
|
|
(setq charset
|
|
|
|
(coding-system-get smtpmail-code-conv-from
|
|
|
|
'mime-charset))
|
|
|
|
(goto-char delimline)
|
|
|
|
(insert "MIME-version: 1.0\n"
|
|
|
|
"Content-type: text/plain; charset="
|
|
|
|
(symbol-name charset)
|
|
|
|
"\nContent-Transfer-Encoding: 8bit\n")))
|
1996-06-07 14:21:50 +00:00
|
|
|
;; Insert an extra newline if we need it to work around
|
|
|
|
;; Sun's bug that swallows newlines.
|
|
|
|
(goto-char (1+ delimline))
|
|
|
|
(if (eval mail-mailer-swallows-blank-line)
|
|
|
|
(newline))
|
1996-06-18 22:38:23 +00:00
|
|
|
;; Find and handle any FCC fields.
|
|
|
|
(goto-char (point-min))
|
|
|
|
(if (re-search-forward "^FCC:" delimline t)
|
2009-05-25 01:13:59 +00:00
|
|
|
;; Force `mail-do-fcc' to use the encoding of the mail
|
2006-11-24 14:33:19 +00:00
|
|
|
;; buffer to encode outgoing messages on FCC files.
|
|
|
|
(let ((coding-system-for-write smtpmail-code-conv-from))
|
|
|
|
(mail-do-fcc delimline)))
|
1996-06-07 14:21:50 +00:00
|
|
|
(if mail-interactive
|
2001-12-01 00:36:12 +00:00
|
|
|
(with-current-buffer errbuf
|
1996-06-07 14:21:50 +00:00
|
|
|
(erase-buffer))))
|
2011-05-23 04:44:29 +00:00
|
|
|
;; Encode the header according to RFC2047.
|
|
|
|
(mail-encode-header (point-min) delimline)
|
1996-06-07 14:21:50 +00:00
|
|
|
;;
|
|
|
|
(setq smtpmail-address-buffer (generate-new-buffer "*smtp-mail*"))
|
|
|
|
(setq smtpmail-recipient-address-list
|
2009-05-25 01:13:59 +00:00
|
|
|
(smtpmail-deduce-address-list tembuf (point-min) delimline))
|
1996-06-07 14:21:50 +00:00
|
|
|
(kill-buffer smtpmail-address-buffer)
|
2002-04-26 18:59:08 +00:00
|
|
|
|
1996-06-07 14:21:50 +00:00
|
|
|
(smtpmail-do-bcc delimline)
|
2009-05-25 01:13:59 +00:00
|
|
|
;; Send or queue
|
1997-06-01 23:26:16 +00:00
|
|
|
(if (not smtpmail-queue-mail)
|
|
|
|
(if (not (null smtpmail-recipient-address-list))
|
2002-04-26 18:59:08 +00:00
|
|
|
(if (not (smtpmail-via-smtp
|
1997-06-01 23:26:16 +00:00
|
|
|
smtpmail-recipient-address-list tembuf))
|
|
|
|
(error "Sending failed; SMTP protocol error"))
|
|
|
|
(error "Sending failed; no recipients"))
|
2002-09-12 06:03:03 +00:00
|
|
|
(let* ((file-data
|
|
|
|
(expand-file-name
|
|
|
|
(format "%s_%i"
|
2010-12-09 01:46:03 +00:00
|
|
|
(format-time-string "%Y-%m-%d_%H:%M:%S")
|
2002-09-12 06:03:03 +00:00
|
|
|
(setq smtpmail-queue-counter
|
|
|
|
(1+ smtpmail-queue-counter)))
|
|
|
|
smtpmail-queue-dir))
|
|
|
|
(file-data (convert-standard-filename file-data))
|
|
|
|
(file-elisp (concat file-data ".el"))
|
1997-06-01 23:26:16 +00:00
|
|
|
(buffer-data (create-file-buffer file-data))
|
|
|
|
(buffer-elisp (create-file-buffer file-elisp))
|
|
|
|
(buffer-scratch "*queue-mail*"))
|
2003-07-13 17:20:34 +00:00
|
|
|
(unless (file-exists-p smtpmail-queue-dir)
|
|
|
|
(make-directory smtpmail-queue-dir t))
|
2001-12-01 00:36:12 +00:00
|
|
|
(with-current-buffer buffer-data
|
1997-06-01 23:26:16 +00:00
|
|
|
(erase-buffer)
|
2010-12-13 15:12:01 +00:00
|
|
|
(set-buffer-file-coding-system
|
|
|
|
;; We will be reading the file with no-conversion in
|
|
|
|
;; smtpmail-send-queued-mail below, so write it out
|
|
|
|
;; with Unix EOLs.
|
|
|
|
(coding-system-change-eol-conversion
|
|
|
|
(or smtpmail-code-conv-from 'undecided)
|
|
|
|
'unix)
|
|
|
|
nil t)
|
2006-01-18 20:49:00 +00:00
|
|
|
(insert-buffer-substring tembuf)
|
1997-06-01 23:26:16 +00:00
|
|
|
(write-file file-data)
|
|
|
|
(set-buffer buffer-elisp)
|
|
|
|
(erase-buffer)
|
|
|
|
(insert (concat
|
|
|
|
"(setq smtpmail-recipient-address-list '"
|
|
|
|
(prin1-to-string smtpmail-recipient-address-list)
|
2002-04-26 18:59:08 +00:00
|
|
|
")\n"))
|
1997-06-01 23:26:16 +00:00
|
|
|
(write-file file-elisp)
|
|
|
|
(set-buffer (generate-new-buffer buffer-scratch))
|
|
|
|
(insert (concat file-data "\n"))
|
2002-04-26 18:59:08 +00:00
|
|
|
(append-to-file (point-min)
|
|
|
|
(point-max)
|
2008-02-23 19:33:50 +00:00
|
|
|
(expand-file-name smtpmail-queue-index-file
|
|
|
|
smtpmail-queue-dir)))
|
1997-06-01 23:26:16 +00:00
|
|
|
(kill-buffer buffer-scratch)
|
|
|
|
(kill-buffer buffer-data)
|
|
|
|
(kill-buffer buffer-elisp))))
|
1996-06-07 14:21:50 +00:00
|
|
|
(kill-buffer tembuf)
|
|
|
|
(if (bufferp errbuf)
|
|
|
|
(kill-buffer errbuf)))))
|
|
|
|
|
2002-11-18 08:05:28 +00:00
|
|
|
;;;###autoload
|
1997-06-01 23:26:16 +00:00
|
|
|
(defun smtpmail-send-queued-mail ()
|
|
|
|
"Send mail that was queued as a result of setting `smtpmail-queue-mail'."
|
|
|
|
(interactive)
|
2001-12-21 12:06:21 +00:00
|
|
|
(with-temp-buffer
|
2009-05-25 01:13:59 +00:00
|
|
|
;; Get index, get first mail, send it, update index, get second
|
|
|
|
;; mail, send it, etc...
|
2008-02-23 19:33:50 +00:00
|
|
|
(let ((file-msg "")
|
|
|
|
(qfile (expand-file-name smtpmail-queue-index-file
|
|
|
|
smtpmail-queue-dir)))
|
|
|
|
(insert-file-contents qfile)
|
2005-05-22 13:49:09 +00:00
|
|
|
(goto-char (point-min))
|
1997-06-01 23:26:16 +00:00
|
|
|
(while (not (eobp))
|
2001-12-01 00:36:12 +00:00
|
|
|
(setq file-msg (buffer-substring (point) (line-end-position)))
|
1997-06-01 23:26:16 +00:00
|
|
|
(load file-msg)
|
2001-12-10 19:49:32 +00:00
|
|
|
;; Insert the message literally: it is already encoded as per
|
|
|
|
;; the MIME headers, and code conversions might guess the
|
|
|
|
;; encoding wrongly.
|
2001-12-21 12:06:21 +00:00
|
|
|
(with-temp-buffer
|
|
|
|
(let ((coding-system-for-read 'no-conversion))
|
|
|
|
(insert-file-contents file-msg))
|
2003-08-26 17:42:27 +00:00
|
|
|
(let ((smtpmail-mail-address
|
|
|
|
(or (and mail-specify-envelope-from (mail-envelope-from))
|
|
|
|
user-mail-address)))
|
|
|
|
(if (not (null smtpmail-recipient-address-list))
|
|
|
|
(if (not (smtpmail-via-smtp smtpmail-recipient-address-list
|
|
|
|
(current-buffer)))
|
|
|
|
(error "Sending failed; SMTP protocol error"))
|
|
|
|
(error "Sending failed; no recipients"))))
|
1997-06-01 23:26:16 +00:00
|
|
|
(delete-file file-msg)
|
|
|
|
(delete-file (concat file-msg ".el"))
|
2003-05-09 22:51:21 +00:00
|
|
|
(delete-region (point-at-bol) (point-at-bol 2)))
|
2008-02-23 19:33:50 +00:00
|
|
|
(write-region (point-min) (point-max) qfile))))
|
1996-06-07 14:21:50 +00:00
|
|
|
|
2009-05-25 01:13:59 +00:00
|
|
|
;; (defun smtpmail-via-smtp (host,port,sender,destination,smtpmail-text-buffer)
|
1996-06-07 14:21:50 +00:00
|
|
|
|
|
|
|
(defun smtpmail-fqdn ()
|
|
|
|
(if smtpmail-local-domain
|
|
|
|
(concat (system-name) "." smtpmail-local-domain)
|
|
|
|
(system-name)))
|
|
|
|
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(defsubst smtpmail-cred-server (cred)
|
|
|
|
(nth 0 cred))
|
|
|
|
|
|
|
|
(defsubst smtpmail-cred-port (cred)
|
|
|
|
(nth 1 cred))
|
|
|
|
|
|
|
|
(defsubst smtpmail-cred-key (cred)
|
|
|
|
(nth 2 cred))
|
|
|
|
|
|
|
|
(defsubst smtpmail-cred-user (cred)
|
|
|
|
(nth 2 cred))
|
|
|
|
|
|
|
|
(defsubst smtpmail-cred-cert (cred)
|
|
|
|
(nth 3 cred))
|
|
|
|
|
|
|
|
(defsubst smtpmail-cred-passwd (cred)
|
|
|
|
(nth 3 cred))
|
|
|
|
|
|
|
|
(defun smtpmail-find-credentials (cred server port)
|
|
|
|
(catch 'done
|
|
|
|
(let ((l cred) el)
|
|
|
|
(while (setq el (pop l))
|
|
|
|
(when (and (equal server (smtpmail-cred-server el))
|
|
|
|
(equal port (smtpmail-cred-port el)))
|
|
|
|
(throw 'done el))))))
|
|
|
|
|
2001-05-18 11:24:16 +00:00
|
|
|
(defun smtpmail-maybe-append-domain (recipient)
|
|
|
|
(if (or (not smtpmail-sendto-domain)
|
|
|
|
(string-match "@" recipient))
|
|
|
|
recipient
|
|
|
|
(concat recipient "@" smtpmail-sendto-domain)))
|
|
|
|
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(defun smtpmail-intersection (list1 list2)
|
|
|
|
(let ((result nil))
|
|
|
|
(dolist (el2 list2)
|
|
|
|
(when (memq el2 list1)
|
|
|
|
(push el2 result)))
|
|
|
|
(nreverse result)))
|
|
|
|
|
2005-05-22 13:49:09 +00:00
|
|
|
(defvar starttls-extra-args)
|
|
|
|
(defvar starttls-extra-arguments)
|
|
|
|
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(defun smtpmail-open-stream (process-buffer host port)
|
|
|
|
(let ((cred (smtpmail-find-credentials
|
|
|
|
smtpmail-starttls-credentials host port)))
|
2008-11-10 20:10:51 +00:00
|
|
|
(if (null (and cred (starttls-any-program-available)))
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
;; The normal case.
|
|
|
|
(open-network-stream "SMTP" process-buffer host port)
|
|
|
|
(let* ((cred-key (smtpmail-cred-key cred))
|
|
|
|
(cred-cert (smtpmail-cred-cert cred))
|
|
|
|
(starttls-extra-args
|
2004-10-11 18:42:18 +00:00
|
|
|
(append
|
|
|
|
starttls-extra-args
|
|
|
|
(when (and (stringp cred-key) (stringp cred-cert)
|
|
|
|
(file-regular-p
|
|
|
|
(setq cred-key (expand-file-name cred-key)))
|
|
|
|
(file-regular-p
|
|
|
|
(setq cred-cert (expand-file-name cred-cert))))
|
|
|
|
(list "--key-file" cred-key "--cert-file" cred-cert))))
|
2004-05-28 05:56:19 +00:00
|
|
|
(starttls-extra-arguments
|
2004-10-11 18:42:18 +00:00
|
|
|
(append
|
|
|
|
starttls-extra-arguments
|
|
|
|
(when (and (stringp cred-key) (stringp cred-cert)
|
|
|
|
(file-regular-p
|
|
|
|
(setq cred-key (expand-file-name cred-key)))
|
|
|
|
(file-regular-p
|
|
|
|
(setq cred-cert (expand-file-name cred-cert))))
|
|
|
|
(list "--x509keyfile" cred-key "--x509certfile" cred-cert)))))
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(starttls-open-stream "SMTP" process-buffer host port)))))
|
|
|
|
|
2009-05-25 01:13:59 +00:00
|
|
|
;; `password-read' autoloads password-cache.
|
2008-02-14 18:43:02 +00:00
|
|
|
(declare-function password-cache-add "password-cache" (key password))
|
|
|
|
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(defun smtpmail-try-auth-methods (process supported-extensions host port)
|
|
|
|
(let* ((mechs (cdr-safe (assoc 'auth supported-extensions)))
|
2009-03-03 16:28:17 +00:00
|
|
|
(mech (car (smtpmail-intersection mechs smtpmail-auth-supported)))
|
2011-02-12 17:51:02 +00:00
|
|
|
(auth-info (auth-source-search :max 1
|
|
|
|
:host host
|
|
|
|
:port (or port "smtp")))
|
|
|
|
(auth-user (plist-get (nth 0 auth-info) :user))
|
|
|
|
(auth-pass (plist-get (nth 0 auth-info) :secret))
|
|
|
|
(auth-pass (if (functionp auth-pass)
|
|
|
|
(funcall auth-pass)
|
|
|
|
auth-pass))
|
2008-05-12 12:40:12 +00:00
|
|
|
(cred (if (and auth-user auth-pass) ; try user-auth-* before netrc-*
|
|
|
|
(list host port auth-user auth-pass)
|
|
|
|
;; else, if auth-source didn't return them...
|
|
|
|
(if (stringp smtpmail-auth-credentials)
|
|
|
|
(let* ((netrc (netrc-parse smtpmail-auth-credentials))
|
|
|
|
(port-name (format "%s" (or port "smtp")))
|
|
|
|
(hostentry (netrc-machine netrc host port-name
|
|
|
|
port-name)))
|
|
|
|
(when hostentry
|
|
|
|
(list host port
|
|
|
|
(netrc-get hostentry "login")
|
|
|
|
(netrc-get hostentry "password"))))
|
2009-05-25 01:13:59 +00:00
|
|
|
;; else, try `smtpmail-find-credentials' since
|
|
|
|
;; `smtpmail-auth-credentials' is not a string
|
2008-05-12 12:40:12 +00:00
|
|
|
(smtpmail-find-credentials
|
|
|
|
smtpmail-auth-credentials host port))))
|
2008-02-13 21:52:41 +00:00
|
|
|
(prompt (when cred (format "SMTP password for %s:%s: "
|
|
|
|
(smtpmail-cred-server cred)
|
|
|
|
(smtpmail-cred-port cred))))
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(passwd (when cred
|
|
|
|
(or (smtpmail-cred-passwd cred)
|
2008-02-13 21:52:41 +00:00
|
|
|
(password-read prompt prompt))))
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
ret)
|
2004-02-04 15:35:11 +00:00
|
|
|
(when (and cred mech)
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(cond
|
|
|
|
((eq mech 'cram-md5)
|
2004-12-27 23:06:11 +00:00
|
|
|
(smtpmail-send-command process (upcase (format "AUTH %s" mech)))
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(if (or (null (car (setq ret (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car ret)))
|
|
|
|
(>= (car ret) 400))
|
|
|
|
(throw 'done nil))
|
|
|
|
(when (eq (car ret) 334)
|
|
|
|
(let* ((challenge (substring (cadr ret) 4))
|
|
|
|
(decoded (base64-decode-string challenge))
|
|
|
|
(hash (rfc2104-hash 'md5 64 16 passwd decoded))
|
|
|
|
(response (concat (smtpmail-cred-user cred) " " hash))
|
2006-10-18 11:11:32 +00:00
|
|
|
;; Osamu Yamane <yamane@green.ocn.ne.jp>:
|
|
|
|
;; SMTP auth fails because the SMTP server identifies
|
|
|
|
;; only the first part of the string (delimited by
|
|
|
|
;; new line characters) as a response from the
|
|
|
|
;; client, and the rest as distinct commands.
|
|
|
|
|
|
|
|
;; In my case, the response string is 80 characters
|
|
|
|
;; long. Without the no-line-break option for
|
2009-05-25 01:13:59 +00:00
|
|
|
;; `base64-encode-string', only the first 76 characters
|
2006-10-18 11:11:32 +00:00
|
|
|
;; are taken as a response to the server, and the
|
|
|
|
;; authentication fails.
|
2006-09-28 17:16:12 +00:00
|
|
|
(encoded (base64-encode-string response t)))
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(smtpmail-send-command process (format "%s" encoded))
|
|
|
|
(if (or (null (car (setq ret (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car ret)))
|
|
|
|
(>= (car ret) 400))
|
|
|
|
(throw 'done nil)))))
|
|
|
|
((eq mech 'login)
|
|
|
|
(smtpmail-send-command process "AUTH LOGIN")
|
|
|
|
(if (or (null (car (setq ret (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car ret)))
|
|
|
|
(>= (car ret) 400))
|
|
|
|
(throw 'done nil))
|
|
|
|
(smtpmail-send-command
|
2006-10-02 07:48:59 +00:00
|
|
|
process (base64-encode-string (smtpmail-cred-user cred) t))
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(if (or (null (car (setq ret (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car ret)))
|
|
|
|
(>= (car ret) 400))
|
|
|
|
(throw 'done nil))
|
2006-09-28 17:16:12 +00:00
|
|
|
(smtpmail-send-command process (base64-encode-string passwd t))
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(if (or (null (car (setq ret (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car ret)))
|
|
|
|
(>= (car ret) 400))
|
|
|
|
(throw 'done nil)))
|
2005-07-17 07:43:29 +00:00
|
|
|
((eq mech 'plain)
|
2006-01-10 14:06:14 +00:00
|
|
|
;; We used to send an empty initial request, and wait for an
|
|
|
|
;; empty response, and then send the password, but this
|
|
|
|
;; violate a SHOULD in RFC 2222 paragraph 5.1. Note that this
|
|
|
|
;; is not sent if the server did not advertise AUTH PLAIN in
|
|
|
|
;; the EHLO response. See RFC 2554 for more info.
|
2005-12-28 08:46:05 +00:00
|
|
|
(smtpmail-send-command process
|
|
|
|
(concat "AUTH PLAIN "
|
|
|
|
(base64-encode-string
|
2005-07-17 07:43:29 +00:00
|
|
|
(concat "\0"
|
|
|
|
(smtpmail-cred-user cred)
|
|
|
|
"\0"
|
2006-09-28 17:16:12 +00:00
|
|
|
passwd) t)))
|
2005-07-17 07:43:29 +00:00
|
|
|
(if (or (null (car (setq ret (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car ret)))
|
|
|
|
(not (equal (car ret) 235)))
|
|
|
|
(throw 'done nil)))
|
|
|
|
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(t
|
2005-07-17 07:43:29 +00:00
|
|
|
(error "Mechanism %s not implemented" mech)))
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
;; Remember the password.
|
2008-02-13 21:52:41 +00:00
|
|
|
(when (null (smtpmail-cred-passwd cred))
|
|
|
|
(password-cache-add prompt passwd)))))
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
|
1996-06-07 14:21:50 +00:00
|
|
|
(defun smtpmail-via-smtp (recipient smtpmail-text-buffer)
|
|
|
|
(let ((process nil)
|
1998-08-29 15:56:41 +00:00
|
|
|
(host (or smtpmail-smtp-server
|
|
|
|
(error "`smtpmail-smtp-server' not defined")))
|
1996-06-07 14:28:16 +00:00
|
|
|
(port smtpmail-smtp-service)
|
2009-05-25 01:13:59 +00:00
|
|
|
;; `smtpmail-mail-address' should be set to the appropriate
|
2003-08-26 17:42:27 +00:00
|
|
|
;; buffer-local value by the caller, but in case not:
|
|
|
|
(envelope-from (or smtpmail-mail-address
|
|
|
|
(and mail-specify-envelope-from
|
|
|
|
(mail-envelope-from))
|
|
|
|
user-mail-address))
|
1996-06-07 14:21:50 +00:00
|
|
|
response-code
|
1996-06-07 14:28:16 +00:00
|
|
|
greeting
|
1997-06-01 22:24:22 +00:00
|
|
|
process-buffer
|
|
|
|
(supported-extensions '()))
|
1996-06-07 14:21:50 +00:00
|
|
|
(unwind-protect
|
|
|
|
(catch 'done
|
|
|
|
;; get or create the trace buffer
|
|
|
|
(setq process-buffer
|
|
|
|
(get-buffer-create (format "*trace of SMTP session to %s*" host)))
|
|
|
|
|
|
|
|
;; clear the trace buffer of old output
|
2001-12-01 00:36:12 +00:00
|
|
|
(with-current-buffer process-buffer
|
2005-12-09 09:44:35 +00:00
|
|
|
(setq buffer-undo-list t)
|
1996-06-07 14:21:50 +00:00
|
|
|
(erase-buffer))
|
|
|
|
|
|
|
|
;; open the connection to the server
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(setq process (smtpmail-open-stream process-buffer host port))
|
1996-06-07 14:21:50 +00:00
|
|
|
(and (null process) (throw 'done nil))
|
|
|
|
|
|
|
|
;; set the send-filter
|
|
|
|
(set-process-filter process 'smtpmail-process-filter)
|
|
|
|
|
2001-12-01 00:36:12 +00:00
|
|
|
(with-current-buffer process-buffer
|
1998-05-12 19:44:17 +00:00
|
|
|
(set-buffer-process-coding-system 'raw-text-unix 'raw-text-unix)
|
1996-06-07 14:21:50 +00:00
|
|
|
(make-local-variable 'smtpmail-read-point)
|
|
|
|
(setq smtpmail-read-point (point-min))
|
|
|
|
|
2002-04-26 18:59:08 +00:00
|
|
|
|
1996-06-07 14:21:50 +00:00
|
|
|
(if (or (null (car (setq greeting (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car greeting)))
|
|
|
|
(>= (car greeting) 400))
|
2009-05-25 01:13:59 +00:00
|
|
|
(throw 'done nil))
|
1996-06-07 14:21:50 +00:00
|
|
|
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(let ((do-ehlo t)
|
|
|
|
(do-starttls t))
|
|
|
|
(while do-ehlo
|
2009-05-25 01:13:59 +00:00
|
|
|
;; EHLO
|
|
|
|
(smtpmail-send-command process (format "EHLO %s" (smtpmail-fqdn)))
|
|
|
|
|
|
|
|
(if (or (null (car (setq response-code
|
|
|
|
(smtpmail-read-response process))))
|
|
|
|
(not (integerp (car response-code)))
|
|
|
|
(>= (car response-code) 400))
|
|
|
|
(progn
|
|
|
|
;; HELO
|
|
|
|
(smtpmail-send-command
|
|
|
|
process (format "HELO %s" (smtpmail-fqdn)))
|
|
|
|
|
|
|
|
(if (or (null (car (setq response-code
|
|
|
|
(smtpmail-read-response process))))
|
|
|
|
(not (integerp (car response-code)))
|
|
|
|
(>= (car response-code) 400))
|
|
|
|
(throw 'done nil)))
|
|
|
|
(dolist (line (cdr (cdr response-code)))
|
|
|
|
(let ((name
|
|
|
|
(with-case-table ascii-case-table
|
|
|
|
(mapcar (lambda (s) (intern (downcase s)))
|
|
|
|
(split-string (substring line 4) "[ ]")))))
|
|
|
|
(and (eq (length name) 1)
|
|
|
|
(setq name (car name)))
|
|
|
|
(and name
|
|
|
|
(cond ((memq (if (consp name) (car name) name)
|
|
|
|
'(verb xvrb 8bitmime onex xone
|
|
|
|
expn size dsn etrn
|
|
|
|
enhancedstatuscodes
|
|
|
|
help xusr
|
|
|
|
auth=login auth starttls))
|
|
|
|
(setq supported-extensions
|
|
|
|
(cons name supported-extensions)))
|
|
|
|
(smtpmail-warn-about-unknown-extensions
|
|
|
|
(message "Unknown extension %s" name)))))))
|
|
|
|
|
|
|
|
(if (and do-starttls
|
|
|
|
(smtpmail-find-credentials smtpmail-starttls-credentials host port)
|
|
|
|
(member 'starttls supported-extensions)
|
|
|
|
(numberp (process-id process)))
|
|
|
|
(progn
|
|
|
|
(smtpmail-send-command process (format "STARTTLS"))
|
|
|
|
(if (or (null (car (setq response-code (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car response-code)))
|
|
|
|
(>= (car response-code) 400))
|
|
|
|
(throw 'done nil))
|
|
|
|
(starttls-negotiate process)
|
|
|
|
(setq do-starttls nil))
|
|
|
|
(setq do-ehlo nil))))
|
2002-04-26 18:59:08 +00:00
|
|
|
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(smtpmail-try-auth-methods process supported-extensions host port)
|
1997-06-01 22:24:22 +00:00
|
|
|
|
|
|
|
(if (or (member 'onex supported-extensions)
|
|
|
|
(member 'xone supported-extensions))
|
|
|
|
(progn
|
|
|
|
(smtpmail-send-command process (format "ONEX"))
|
|
|
|
(if (or (null (car (setq response-code (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car response-code)))
|
|
|
|
(>= (car response-code) 400))
|
|
|
|
(throw 'done nil))))
|
|
|
|
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(if (and smtpmail-debug-verb
|
1997-06-01 22:24:22 +00:00
|
|
|
(or (member 'verb supported-extensions)
|
|
|
|
(member 'xvrb supported-extensions)))
|
|
|
|
(progn
|
|
|
|
(smtpmail-send-command process (format "VERB"))
|
|
|
|
(if (or (null (car (setq response-code (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car response-code)))
|
|
|
|
(>= (car response-code) 400))
|
|
|
|
(throw 'done nil))))
|
|
|
|
|
|
|
|
(if (member 'xusr supported-extensions)
|
|
|
|
(progn
|
|
|
|
(smtpmail-send-command process (format "XUSR"))
|
|
|
|
(if (or (null (car (setq response-code (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car response-code)))
|
|
|
|
(>= (car response-code) 400))
|
|
|
|
(throw 'done nil))))
|
1996-06-07 14:21:50 +00:00
|
|
|
|
2003-09-28 08:55:50 +00:00
|
|
|
;; MAIL FROM:<sender>
|
1997-06-01 22:24:22 +00:00
|
|
|
(let ((size-part
|
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd):
Defsubst instead of defmacro.
(smtpmail-intersection): Return value in reverse order.
(smtpmail-open-stream): Use stringp instead of string-to-list.
(smtpmail-open-stream, smtpmail-try-auth-methods): New functions,
separated from smtpmail-via-smtp.
(top level): Autoload starttls, mail-utils and rfc2104.
(smtpmail-smtp-service): Doc fix. :type fix.
(smtpmail-debug-info): Doc fix.
(smtpmail-debug-verb, smtpmail-auth-credentials)
(smtpmail-starttls-credentials, smtpmail-auth-supported): New variables.
(smtpmail-deduce-address-list, smtpmail-send-it): Don't require
mail-utils (it is autoloaded).
(smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
(smtpmail-cred-user, smtpmail-cred-cert, smtpmail-cred-passwd)
(smtpmail-find-credentials, smtpmail-intersection): New utility funs.
(smtpmail-via-smtp): Support STARTTLS, if binary is installed.
(smtpmail-via-smtp): Support AUTH.
(smtpmail-via-smtp): Use `smtpmail-debug-verb' to control VERB.
2001-11-17 22:43:36 +00:00
|
|
|
(if (or (member 'size supported-extensions)
|
|
|
|
(assoc 'size supported-extensions))
|
1997-06-01 22:24:22 +00:00
|
|
|
(format " SIZE=%d"
|
2001-12-01 00:36:12 +00:00
|
|
|
(with-current-buffer smtpmail-text-buffer
|
1997-06-01 22:24:22 +00:00
|
|
|
;; size estimate:
|
|
|
|
(+ (- (point-max) (point-min))
|
|
|
|
;; Add one byte for each change-of-line
|
2004-01-20 22:17:32 +00:00
|
|
|
;; because of CR-LF representation:
|
|
|
|
(count-lines (point-min) (point-max)))))
|
1997-06-01 22:24:22 +00:00
|
|
|
""))
|
|
|
|
(body-part
|
|
|
|
(if (member '8bitmime supported-extensions)
|
|
|
|
;; FIXME:
|
|
|
|
;; Code should be added here that transforms
|
|
|
|
;; the contents of the message buffer into
|
|
|
|
;; something the receiving SMTP can handle.
|
|
|
|
;; For a receiver that supports 8BITMIME, this
|
|
|
|
;; may mean converting BINARY to BASE64, or
|
|
|
|
;; adding Content-Transfer-Encoding and the
|
|
|
|
;; other MIME headers. The code should also
|
|
|
|
;; return an indication of what encoding the
|
|
|
|
;; message buffer is now, i.e. ASCII or
|
|
|
|
;; 8BITMIME.
|
|
|
|
(if nil
|
|
|
|
" BODY=8BITMIME"
|
|
|
|
"")
|
|
|
|
"")))
|
2009-05-25 01:13:59 +00:00
|
|
|
;; (smtpmail-send-command process (format "MAIL FROM:%s@%s" (user-login-name) (smtpmail-fqdn)))
|
2003-09-28 08:55:50 +00:00
|
|
|
(smtpmail-send-command process (format "MAIL FROM:<%s>%s%s"
|
2003-08-26 17:42:27 +00:00
|
|
|
envelope-from
|
1997-06-01 22:24:22 +00:00
|
|
|
size-part
|
|
|
|
body-part))
|
2003-02-04 13:24:35 +00:00
|
|
|
|
1997-06-01 22:24:22 +00:00
|
|
|
(if (or (null (car (setq response-code (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car response-code)))
|
|
|
|
(>= (car response-code) 400))
|
2009-05-25 01:13:59 +00:00
|
|
|
(throw 'done nil)))
|
2002-04-26 18:59:08 +00:00
|
|
|
|
2003-09-28 08:55:50 +00:00
|
|
|
;; RCPT TO:<recipient>
|
1996-06-07 14:28:16 +00:00
|
|
|
(let ((n 0))
|
|
|
|
(while (not (null (nth n recipient)))
|
2003-09-28 08:55:50 +00:00
|
|
|
(smtpmail-send-command process (format "RCPT TO:<%s>" (smtpmail-maybe-append-domain (nth n recipient))))
|
1996-06-07 14:28:16 +00:00
|
|
|
(setq n (1+ n))
|
|
|
|
|
1997-06-01 22:24:22 +00:00
|
|
|
(setq response-code (smtpmail-read-response process))
|
|
|
|
(if (or (null (car response-code))
|
1996-06-07 14:28:16 +00:00
|
|
|
(not (integerp (car response-code)))
|
|
|
|
(>= (car response-code) 400))
|
2009-05-25 01:13:59 +00:00
|
|
|
(throw 'done nil))))
|
2002-04-26 18:59:08 +00:00
|
|
|
|
1996-06-07 14:21:50 +00:00
|
|
|
;; DATA
|
|
|
|
(smtpmail-send-command process "DATA")
|
|
|
|
|
|
|
|
(if (or (null (car (setq response-code (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car response-code)))
|
|
|
|
(>= (car response-code) 400))
|
2009-05-25 01:13:59 +00:00
|
|
|
(throw 'done nil))
|
1996-06-07 14:21:50 +00:00
|
|
|
|
|
|
|
;; Mail contents
|
|
|
|
(smtpmail-send-data process smtpmail-text-buffer)
|
|
|
|
|
2009-05-25 01:13:59 +00:00
|
|
|
;; DATA end "."
|
1996-06-07 14:21:50 +00:00
|
|
|
(smtpmail-send-command process ".")
|
|
|
|
|
|
|
|
(if (or (null (car (setq response-code (smtpmail-read-response process))))
|
|
|
|
(not (integerp (car response-code)))
|
|
|
|
(>= (car response-code) 400))
|
2009-05-25 01:13:59 +00:00
|
|
|
(throw 'done nil))
|
|
|
|
|
|
|
|
;; QUIT
|
|
|
|
;; (smtpmail-send-command process "QUIT")
|
|
|
|
;; (and (null (car (smtpmail-read-response process)))
|
|
|
|
;; (throw 'done nil))
|
|
|
|
t))
|
1996-06-07 14:21:50 +00:00
|
|
|
(if process
|
2001-12-01 00:36:12 +00:00
|
|
|
(with-current-buffer (process-buffer process)
|
1996-06-07 14:21:50 +00:00
|
|
|
(smtpmail-send-command process "QUIT")
|
|
|
|
(smtpmail-read-response process)
|
|
|
|
|
2009-05-25 01:13:59 +00:00
|
|
|
;; (if (or (null (car (setq response-code (smtpmail-read-response process))))
|
|
|
|
;; (not (integerp (car response-code)))
|
|
|
|
;; (>= (car response-code) 400))
|
|
|
|
;; (throw 'done nil))
|
2002-08-30 10:32:25 +00:00
|
|
|
(delete-process process)
|
|
|
|
(unless smtpmail-debug-info
|
|
|
|
(kill-buffer process-buffer)))))))
|
1996-06-07 14:21:50 +00:00
|
|
|
|
|
|
|
|
|
|
|
(defun smtpmail-process-filter (process output)
|
2001-12-01 00:36:12 +00:00
|
|
|
(with-current-buffer (process-buffer process)
|
1996-06-07 14:21:50 +00:00
|
|
|
(goto-char (point-max))
|
|
|
|
(insert output)))
|
|
|
|
|
|
|
|
(defun smtpmail-read-response (process)
|
|
|
|
(let ((case-fold-search nil)
|
1997-06-01 22:24:22 +00:00
|
|
|
(response-strings nil)
|
1996-06-07 14:21:50 +00:00
|
|
|
(response-continue t)
|
1997-06-01 22:24:22 +00:00
|
|
|
(return-value '(nil ()))
|
1996-06-07 14:21:50 +00:00
|
|
|
match-end)
|
2004-03-11 10:53:22 +00:00
|
|
|
(catch 'done
|
|
|
|
(while response-continue
|
|
|
|
(goto-char smtpmail-read-point)
|
|
|
|
(while (not (search-forward "\r\n" nil t))
|
|
|
|
(unless (memq (process-status process) '(open run))
|
|
|
|
(throw 'done nil))
|
|
|
|
(accept-process-output process)
|
|
|
|
(goto-char smtpmail-read-point))
|
|
|
|
|
|
|
|
(setq match-end (point))
|
|
|
|
(setq response-strings
|
|
|
|
(cons (buffer-substring smtpmail-read-point (- match-end 2))
|
|
|
|
response-strings))
|
|
|
|
|
|
|
|
(goto-char smtpmail-read-point)
|
|
|
|
(if (looking-at "[0-9]+ ")
|
|
|
|
(let ((begin (match-beginning 0))
|
|
|
|
(end (match-end 0)))
|
|
|
|
(if smtpmail-debug-info
|
|
|
|
(message "%s" (car response-strings)))
|
|
|
|
|
|
|
|
(setq smtpmail-read-point match-end)
|
|
|
|
|
|
|
|
;; ignore lines that start with "0"
|
|
|
|
(if (looking-at "0[0-9]+ ")
|
|
|
|
nil
|
|
|
|
(setq response-continue nil)
|
|
|
|
(setq return-value
|
2005-05-16 11:34:49 +00:00
|
|
|
(cons (string-to-number
|
2004-03-11 10:53:22 +00:00
|
|
|
(buffer-substring begin end))
|
|
|
|
(nreverse response-strings)))))
|
|
|
|
|
|
|
|
(if (looking-at "[0-9]+-")
|
|
|
|
(progn (if smtpmail-debug-info
|
|
|
|
(message "%s" (car response-strings)))
|
|
|
|
(setq smtpmail-read-point match-end)
|
|
|
|
(setq response-continue t))
|
|
|
|
(progn
|
|
|
|
(setq smtpmail-read-point match-end)
|
1997-06-01 22:24:22 +00:00
|
|
|
(setq response-continue nil)
|
|
|
|
(setq return-value
|
2004-03-11 10:53:22 +00:00
|
|
|
(cons nil (nreverse response-strings)))))))
|
|
|
|
(setq smtpmail-read-point match-end))
|
1996-06-07 14:21:50 +00:00
|
|
|
return-value))
|
|
|
|
|
|
|
|
|
|
|
|
(defun smtpmail-send-command (process command)
|
|
|
|
(goto-char (point-max))
|
|
|
|
(if (= (aref command 0) ?P)
|
|
|
|
(insert "PASS <omitted>\r\n")
|
|
|
|
(insert command "\r\n"))
|
|
|
|
(setq smtpmail-read-point (point))
|
|
|
|
(process-send-string process command)
|
|
|
|
(process-send-string process "\r\n"))
|
|
|
|
|
|
|
|
(defun smtpmail-send-data-1 (process data)
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
1999-05-25 11:12:17 +00:00
|
|
|
(if (and (multibyte-string-p data)
|
|
|
|
smtpmail-code-conv-from)
|
|
|
|
(setq data (string-as-multibyte
|
|
|
|
(encode-coding-string data smtpmail-code-conv-from))))
|
2002-04-26 18:59:08 +00:00
|
|
|
|
1996-06-07 14:21:50 +00:00
|
|
|
(if smtpmail-debug-info
|
|
|
|
(insert data "\r\n"))
|
|
|
|
|
|
|
|
(setq smtpmail-read-point (point))
|
1996-07-15 20:00:34 +00:00
|
|
|
;; Escape "." at start of a line
|
|
|
|
(if (eq (string-to-char data) ?.)
|
1996-06-07 14:21:50 +00:00
|
|
|
(process-send-string process "."))
|
1996-07-15 20:00:34 +00:00
|
|
|
(process-send-string process data)
|
2009-05-25 01:13:59 +00:00
|
|
|
(process-send-string process "\r\n"))
|
1996-06-07 14:21:50 +00:00
|
|
|
|
|
|
|
(defun smtpmail-send-data (process buffer)
|
2004-01-18 14:11:11 +00:00
|
|
|
(let ((data-continue t) sending-data)
|
2001-12-01 00:36:12 +00:00
|
|
|
(with-current-buffer buffer
|
1996-06-07 14:21:50 +00:00
|
|
|
(goto-char (point-min)))
|
|
|
|
(while data-continue
|
2001-12-01 00:36:12 +00:00
|
|
|
(with-current-buffer buffer
|
2004-01-18 14:11:11 +00:00
|
|
|
(setq sending-data (buffer-substring (point-at-bol) (point-at-eol)))
|
|
|
|
(end-of-line 2)
|
|
|
|
(setq data-continue (not (eobp))))
|
|
|
|
(smtpmail-send-data-1 process sending-data))))
|
1996-06-07 14:21:50 +00:00
|
|
|
|
|
|
|
(defun smtpmail-deduce-address-list (smtpmail-text-buffer header-start header-end)
|
|
|
|
"Get address list suitable for smtp RCPT TO: <address>."
|
1999-05-02 09:50:47 +00:00
|
|
|
(unwind-protect
|
2001-12-01 00:36:12 +00:00
|
|
|
(with-current-buffer smtpmail-address-buffer
|
|
|
|
(erase-buffer)
|
2009-05-25 01:13:59 +00:00
|
|
|
(let ((case-fold-search t)
|
|
|
|
(simple-address-list "")
|
|
|
|
this-line
|
|
|
|
this-line-end
|
|
|
|
addr-regexp)
|
1996-06-07 14:21:50 +00:00
|
|
|
(insert-buffer-substring smtpmail-text-buffer header-start header-end)
|
|
|
|
(goto-char (point-min))
|
1996-07-12 00:09:50 +00:00
|
|
|
;; RESENT-* fields should stop processing of regular fields.
|
|
|
|
(save-excursion
|
2001-12-01 00:36:12 +00:00
|
|
|
(setq addr-regexp
|
|
|
|
(if (re-search-forward "^Resent-\\(to\\|cc\\|bcc\\):"
|
|
|
|
header-end t)
|
|
|
|
"^Resent-\\(to\\|cc\\|bcc\\):"
|
|
|
|
"^\\(To:\\|Cc:\\|Bcc:\\)")))
|
1996-07-12 00:09:50 +00:00
|
|
|
|
|
|
|
(while (re-search-forward addr-regexp header-end t)
|
1996-06-07 14:21:50 +00:00
|
|
|
(replace-match "")
|
|
|
|
(setq this-line (match-beginning 0))
|
|
|
|
(forward-line 1)
|
|
|
|
;; get any continuation lines
|
|
|
|
(while (and (looking-at "^[ \t]+") (< (point) header-end))
|
|
|
|
(forward-line 1))
|
|
|
|
(setq this-line-end (point-marker))
|
|
|
|
(setq simple-address-list
|
|
|
|
(concat simple-address-list " "
|
2009-05-25 01:13:59 +00:00
|
|
|
(mail-strip-quoted-names (buffer-substring this-line this-line-end)))))
|
1996-06-07 14:21:50 +00:00
|
|
|
(erase-buffer)
|
2001-11-25 17:45:36 +00:00
|
|
|
(insert " " simple-address-list "\n")
|
2009-05-25 01:13:59 +00:00
|
|
|
(subst-char-in-region (point-min) (point-max) 10 ? t) ; newline --> blank
|
|
|
|
(subst-char-in-region (point-min) (point-max) ?, ? t) ; comma --> blank
|
|
|
|
(subst-char-in-region (point-min) (point-max) 9 ? t) ; tab --> blank
|
1996-06-07 14:21:50 +00:00
|
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
;; tidyness in case hook is not robust when it looks at this
|
|
|
|
(while (re-search-forward "[ \t]+" header-end t) (replace-match " "))
|
|
|
|
|
|
|
|
(goto-char (point-min))
|
1996-06-07 14:28:16 +00:00
|
|
|
(let (recipient-address-list)
|
1996-06-18 22:35:10 +00:00
|
|
|
(while (re-search-forward " \\([^ ]+\\) " (point-max) t)
|
1996-06-07 14:28:16 +00:00
|
|
|
(backward-char 1)
|
1996-06-18 22:35:10 +00:00
|
|
|
(setq recipient-address-list (cons (buffer-substring (match-beginning 1) (match-end 1))
|
2009-05-25 01:13:59 +00:00
|
|
|
recipient-address-list)))
|
|
|
|
(setq smtpmail-recipient-address-list recipient-address-list))))))
|
1996-06-07 14:21:50 +00:00
|
|
|
|
|
|
|
(defun smtpmail-do-bcc (header-end)
|
1998-04-20 18:03:00 +00:00
|
|
|
"Delete [Resent-]BCC: and their continuation lines from the header area.
|
1996-06-07 14:21:50 +00:00
|
|
|
There may be multiple BCC: lines, and each may have arbitrarily
|
|
|
|
many continuation lines."
|
|
|
|
(let ((case-fold-search t))
|
1999-03-09 03:02:55 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
;; iterate over all BCC: lines
|
|
|
|
(while (re-search-forward "^\\(RESENT-\\)?BCC:" header-end t)
|
|
|
|
(delete-region (match-beginning 0)
|
|
|
|
(progn (forward-line 1) (point)))
|
|
|
|
;; get rid of any continuation lines
|
|
|
|
(while (and (looking-at "^[ \t].*\n") (< (point) header-end))
|
|
|
|
(replace-match ""))))))
|
1996-06-07 14:21:50 +00:00
|
|
|
|
|
|
|
(provide 'smtpmail)
|
|
|
|
|
1997-04-20 07:33:52 +00:00
|
|
|
;;; smtpmail.el ends here
|