annotate lisp/mail/smtpmail.el @ 108899:f094e7889b4c

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 02 Jun 2010 22:44:58 +0000
parents 1d1d5d9bd884
children 16dda1d80ad4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
17517
8f952e921136 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 17436
diff changeset
1 ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2
95626
a9fc7556436a Remove unnecessary eval-and-compile.
Glenn Morris <rgm@gnu.org>
parents: 94880
diff changeset
3 ;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 105829
diff changeset
4 ;; 2008, 2009, 2010 Free Software Foundation, Inc.
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6 ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
7 ;; Maintainer: Simon Josefsson <simon@josefsson.org>
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
8 ;; w32 Maintainer: Brian D. Carlstrom <bdc@ai.mit.edu>
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
9 ;; ESMTP support: Simon Leinen <simon@switch.ch>
37800
9cddd888d25f (maybe-append-domain): Renamed to
Gerd Moellmann <gerd@gnu.org>
parents: 37600
diff changeset
10 ;; Hacked by Mike Taylor, 11th October 1999 to add support for
9cddd888d25f (maybe-append-domain): Renamed to
Gerd Moellmann <gerd@gnu.org>
parents: 37600
diff changeset
11 ;; automatically appending a domain to RCPT TO: addresses.
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
12 ;; AUTH=LOGIN support: Stephen Cranefield <scranefield@infoscience.otago.ac.nz>
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13 ;; Keywords: mail
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
15 ;; This file is part of GNU Emacs.
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
16
94674
ef65fa4dca3b Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
17 ;; GNU Emacs is free software: you can redistribute it and/or modify
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18 ;; it under the terms of the GNU General Public License as published by
94674
ef65fa4dca3b Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
19 ;; the Free Software Foundation, either version 3 of the License, or
ef65fa4dca3b Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
20 ;; (at your option) any later version.
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
22 ;; GNU Emacs is distributed in the hope that it will be useful,
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
23 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
24 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
25 ;; GNU General Public License for more details.
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
26
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
27 ;; You should have received a copy of the GNU General Public License
94674
ef65fa4dca3b Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
28 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
29
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
30 ;;; Commentary:
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
31
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
32 ;; Send Mail to smtp host from smtpmail temp buffer.
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
33
23142
98c430cac424 (smtpmail-send-it): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents: 22037
diff changeset
34 ;; Please add these lines in your .emacs(_emacs) or use customize.
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
35 ;;
23142
98c430cac424 (smtpmail-send-it): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents: 22037
diff changeset
36 ;;(setq send-mail-function 'smtpmail-send-it) ; if you use `mail'
44864
c18dd95f6962 (smtpmail-queue-counter): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 42225
diff changeset
37 ;;(setq message-send-mail-function 'smtpmail-send-it) ; if you use message/Gnus
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
38 ;;(setq smtpmail-default-smtp-server "YOUR SMTP HOST")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
39 ;;(setq smtpmail-local-domain "YOUR DOMAIN NAME")
26028
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
40 ;;(setq smtpmail-sendto-domain "YOUR DOMAIN NAME")
23142
98c430cac424 (smtpmail-send-it): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents: 22037
diff changeset
41 ;;(setq smtpmail-debug-info t) ; only to debug problems
44868
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
42 ;;(setq smtpmail-auth-credentials ; or use ~/.authinfo
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
43 ;; '(("YOUR SMTP HOST" 25 "username" "password")))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
44 ;;(setq smtpmail-starttls-credentials
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
45 ;; '(("YOUR SMTP HOST" 25 "~/.my_smtp_tls.key" "~/.my_smtp_tls.cert")))
54763
63ed691cfee6 Add comment, based on report by kdc@rcn.com (Kevin D. Clark).
Simon Josefsson <jas@extundo.com>
parents: 54350
diff changeset
46 ;; Where the 25 equals the value of `smtpmail-smtp-service', it can be an
63ed691cfee6 Add comment, based on report by kdc@rcn.com (Kevin D. Clark).
Simon Josefsson <jas@extundo.com>
parents: 54350
diff changeset
47 ;; integer or a string, just as long as they match (eq).
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
48
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
49 ;; To queue mail, set `smtpmail-queue-mail' to t and use
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
50 ;; `smtpmail-send-queued-mail' to send.
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
51
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
52 ;; Modified by Stephen Cranefield <scranefield@infoscience.otago.ac.nz>,
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
53 ;; 22/6/99, to support SMTP Authentication by the AUTH=LOGIN mechanism.
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
54 ;; See http://help.netscape.com/products/server/messaging/3x/info/smtpauth.html
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
55 ;; Rewritten by Simon Josefsson to use same credential variable as AUTH
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
56 ;; support below.
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
57
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
58 ;; Modified by Simon Josefsson <jas@pdc.kth.se>, 22/2/99, to support SMTP
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
59 ;; Authentication by the AUTH mechanism.
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
60 ;; See http://www.ietf.org/rfc/rfc2554.txt
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
61
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
62 ;; Modified by Simon Josefsson <simon@josefsson.org>, 2000-10-07, to support
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
63 ;; STARTTLS. Requires external program
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
64 ;; ftp://ftp.opaopa.org/pub/elisp/starttls-*.tar.gz.
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
65 ;; See http://www.ietf.org/rfc/rfc2246.txt, http://www.ietf.org/rfc/rfc2487.txt
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
66
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
67 ;;; Code:
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
68
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
69 (require 'sendmail)
99479
cd67cf7962fa (smtpmail-open-stream): Use `starttls-any-program-available'. Auto-load starttls.el for it.
Teodor Zlatanov <tzz@lifelogs.com>
parents: 99478
diff changeset
70 (autoload 'starttls-any-program-available "starttls")
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
71 (autoload 'starttls-open-stream "starttls")
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
72 (autoload 'starttls-negotiate "starttls")
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
73 (autoload 'mail-strip-quoted-names "mail-utils")
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
74 (autoload 'message-make-date "message")
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
75 (autoload 'message-make-message-id "message")
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
76 (autoload 'rfc2104-hash "rfc2104")
44868
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
77 (autoload 'netrc-parse "netrc")
45179
6ff2c20da16e (netrc-machine, netrc-get): Add autoloads.
Richard M. Stallman <rms@gnu.org>
parents: 44883
diff changeset
78 (autoload 'netrc-machine "netrc")
6ff2c20da16e (netrc-machine, netrc-get): Add autoloads.
Richard M. Stallman <rms@gnu.org>
parents: 44883
diff changeset
79 (autoload 'netrc-get "netrc")
91843
499730b7bd8e 2008-02-14 Justus Piater <Justus-bulk@Piater.name> (tiny change)
Bastien Guerry <bzg@altern.org>
parents: 91820
diff changeset
80 (autoload 'password-read "password-cache")
95626
a9fc7556436a Remove unnecessary eval-and-compile.
Glenn Morris <rgm@gnu.org>
parents: 94880
diff changeset
81 (autoload 'auth-source-user-or-password "auth-source")
94880
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
82
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
83 ;;;
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
84 (defgroup smtpmail nil
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
85 "SMTP protocol for sending mail."
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
86 :group 'mail)
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
87
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
88
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
89 (defcustom smtpmail-default-smtp-server nil
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
90 "Specify default SMTP server.
47396
d7fa9253971f (smtpmail-default-smtp-server): Doc fix.
Simon Josefsson <jas@extundo.com>
parents: 47225
diff changeset
91 This only has effect if you specify it before loading the smtpmail library."
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
92 :type '(choice (const nil) string)
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
93 :group 'smtpmail)
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
94
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
95 (defcustom smtpmail-smtp-server
15451
89c1e7fe879a (smtpmail-smtp-service): Use port 25 as default.
Richard M. Stallman <rms@gnu.org>
parents: 15372
diff changeset
96 (or (getenv "SMTPSERVER") smtpmail-default-smtp-server)
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
97 "The name of the host running SMTP server."
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
98 :type '(choice (const nil) string)
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
99 :group 'smtpmail)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
100
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
101 (defcustom smtpmail-smtp-service 25
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
102 "SMTP service port number.
75739
d6f3ca7298f7 (smtpmail-smtp-service, smtpmail-queue-index-file): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
103 The default value would be \"smtp\" or 25."
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
104 :type '(choice (integer :tag "Port") (string :tag "Service"))
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
105 :group 'smtpmail)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
106
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
107 (defcustom smtpmail-local-domain nil
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
108 "Local domain name without a host name.
75739
d6f3ca7298f7 (smtpmail-smtp-service, smtpmail-queue-index-file): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
109 If the function `system-name' returns the full internet address,
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
110 don't define this value."
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
111 :type '(choice (const nil) string)
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
112 :group 'smtpmail)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
113
26028
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
114 (defcustom smtpmail-sendto-domain nil
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
115 "Local domain name without a host name.
26028
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
116 This is appended (with an @-sign) to any specified recipients which do
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
117 not include an @-sign, so that each RCPT TO address is fully qualified.
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
118 \(Some configurations of sendmail require this.)
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
119
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
120 Don't bother to set this unless you have get an error like:
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
121 Sending failed; SMTP protocol error
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
122 when sending mail, and the *trace of SMTP session to <somewhere>*
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
123 buffer includes an exchange like:
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
124 RCPT TO: <someone>
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
125 501 <someone>: recipient address must contain a domain."
26028
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
126 :type '(choice (const nil) string)
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
127 :group 'smtpmail)
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
128
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
129 (defcustom smtpmail-debug-info nil
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
130 "Whether to print info in buffer *trace of SMTP session to <somewhere>*.
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
131 See also `smtpmail-debug-verb' which determines if the SMTP protocol should
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
132 be verbose as well."
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
133 :type 'boolean
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
134 :group 'smtpmail)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
135
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
136 (defcustom smtpmail-debug-verb nil
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
137 "Whether this library sends the SMTP VERB command or not.
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
138 The commands enables verbose information from the SMTP server."
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
139 :type 'boolean
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
140 :group 'smtpmail)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
141
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
142 (defcustom smtpmail-code-conv-from nil
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
143 "Coding system for encoding outgoing mail.
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
144 Used for the value of `sendmail-coding-system' when
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
145 `select-message-coding-system' is called. "
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
146 :type 'coding-system
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
147 :group 'smtpmail)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
148
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
149 (defcustom smtpmail-queue-mail nil
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
150 "Non-nil means mail is queued; otherwise it is sent immediately.
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
151 If queued, it is stored in the directory `smtpmail-queue-dir'
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
152 and sent with `smtpmail-send-queued-mail'."
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
153 :type 'boolean
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
154 :group 'smtpmail)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
155
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
156 (defcustom smtpmail-queue-dir "~/Mail/queued-mail/"
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
157 "Directory where `smtpmail.el' stores queued mail."
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
158 :type 'directory
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
159 :group 'smtpmail)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
160
44868
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
161 (defcustom smtpmail-auth-credentials "~/.authinfo"
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
162 "Specify username and password for servers, directly or via .netrc file.
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
163 This variable can either be a filename pointing to a file in netrc(5)
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
164 format, or list of four-element lists that contain, in order,
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
165 `servername' (a string), `port' (an integer), `user' (a string) and
44868
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
166 `password' (a string, or nil to query the user when needed). If you
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
167 need to enter a `realm' too, add it to the user string, so that it
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
168 looks like `user@realm'."
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
169 :type '(choice file
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
170 (repeat (list (string :tag "Server")
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
171 (integer :tag "Port")
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
172 (string :tag "Username")
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
173 (choice (const :tag "Query when needed" nil)
44868
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
174 (string :tag "Password")))))
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59159
diff changeset
175 :version "22.1"
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
176 :group 'smtpmail)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
177
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
178 (defcustom smtpmail-starttls-credentials '(("" 25 "" ""))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
179 "Specify STARTTLS keys and certificates for servers.
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
180 This is a list of four-element list with `servername' (a string),
72671
b1e05ba6e2b1 2006-09-06 Simon Josefsson <jas@extundo.com>
Simon Josefsson <jas@extundo.com>
parents: 68648
diff changeset
181 `port' (an integer), `key' (a filename) and `certificate' (a
b1e05ba6e2b1 2006-09-06 Simon Josefsson <jas@extundo.com>
Simon Josefsson <jas@extundo.com>
parents: 68648
diff changeset
182 filename).
b1e05ba6e2b1 2006-09-06 Simon Josefsson <jas@extundo.com>
Simon Josefsson <jas@extundo.com>
parents: 68648
diff changeset
183 If you do not have a certificate/key pair, leave the `key' and
b1e05ba6e2b1 2006-09-06 Simon Josefsson <jas@extundo.com>
Simon Josefsson <jas@extundo.com>
parents: 68648
diff changeset
184 `certificate' fields as `nil'. A key/certificate pair is only
b1e05ba6e2b1 2006-09-06 Simon Josefsson <jas@extundo.com>
Simon Josefsson <jas@extundo.com>
parents: 68648
diff changeset
185 needed if you want to use X.509 client authenticated
b1e05ba6e2b1 2006-09-06 Simon Josefsson <jas@extundo.com>
Simon Josefsson <jas@extundo.com>
parents: 68648
diff changeset
186 connections."
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
187 :type '(repeat (list (string :tag "Server")
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
188 (integer :tag "Port")
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
189 (file :tag "Key")
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
190 (file :tag "Certificate")))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
191 :version "21.1"
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
192 :group 'smtpmail)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
193
37598
595c23d107f8 (smtpmail-warn-about-unknown-extensions): New
Gerd Moellmann <gerd@gnu.org>
parents: 26028
diff changeset
194 (defcustom smtpmail-warn-about-unknown-extensions nil
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
195 "If set, print warnings about unknown SMTP extensions.
37598
595c23d107f8 (smtpmail-warn-about-unknown-extensions): New
Gerd Moellmann <gerd@gnu.org>
parents: 26028
diff changeset
196 This is mainly useful for development purposes, to learn about
595c23d107f8 (smtpmail-warn-about-unknown-extensions): New
Gerd Moellmann <gerd@gnu.org>
parents: 26028
diff changeset
197 new SMTP extensions that might be useful to support."
595c23d107f8 (smtpmail-warn-about-unknown-extensions): New
Gerd Moellmann <gerd@gnu.org>
parents: 26028
diff changeset
198 :type 'boolean
37600
20c37aac51cd (smtpmail-warn-about-unknown-extensions): Add :version.
Gerd Moellmann <gerd@gnu.org>
parents: 37598
diff changeset
199 :version "21.1"
37598
595c23d107f8 (smtpmail-warn-about-unknown-extensions): New
Gerd Moellmann <gerd@gnu.org>
parents: 26028
diff changeset
200 :group 'smtpmail)
595c23d107f8 (smtpmail-warn-about-unknown-extensions): New
Gerd Moellmann <gerd@gnu.org>
parents: 26028
diff changeset
201
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
202 (defcustom smtpmail-queue-index-file "index"
75739
d6f3ca7298f7 (smtpmail-smtp-service, smtpmail-queue-index-file): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
203 "File name of queued mail index.
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
204 This is relative to `smtpmail-queue-dir'."
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
205 :type 'string
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
206 :group 'smtpmail)
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
207
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
208 ;; End of customizable variables.
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
209
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
210
23444
a632871d7cfa (smtpmail-send-data-1): Use encode-coding-string.
Richard M. Stallman <rms@gnu.org>
parents: 23181
diff changeset
211 (defvar smtpmail-address-buffer)
a632871d7cfa (smtpmail-send-data-1): Use encode-coding-string.
Richard M. Stallman <rms@gnu.org>
parents: 23181
diff changeset
212 (defvar smtpmail-recipient-address-list)
a632871d7cfa (smtpmail-send-data-1): Use encode-coding-string.
Richard M. Stallman <rms@gnu.org>
parents: 23181
diff changeset
213
44864
c18dd95f6962 (smtpmail-queue-counter): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 42225
diff changeset
214 (defvar smtpmail-queue-counter 0)
c18dd95f6962 (smtpmail-queue-counter): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 42225
diff changeset
215
23444
a632871d7cfa (smtpmail-send-data-1): Use encode-coding-string.
Richard M. Stallman <rms@gnu.org>
parents: 23181
diff changeset
216 ;; Buffer-local variable.
a632871d7cfa (smtpmail-send-data-1): Use encode-coding-string.
Richard M. Stallman <rms@gnu.org>
parents: 23181
diff changeset
217 (defvar smtpmail-read-point)
a632871d7cfa (smtpmail-send-data-1): Use encode-coding-string.
Richard M. Stallman <rms@gnu.org>
parents: 23181
diff changeset
218
64416
3b19cfc14a51 (smtpmail-auth-supported): Prefer PLAIN over LOGIN.
Simon Josefsson <jas@extundo.com>
parents: 64414
diff changeset
219 (defconst smtpmail-auth-supported '(cram-md5 plain login)
102382
b83a02b58e7f (smtpmail-auth-supported): Mention that list is
Simon Josefsson <jas@extundo.com>
parents: 100908
diff changeset
220 "List of supported SMTP AUTH mechanisms.
b83a02b58e7f (smtpmail-auth-supported): Mention that list is
Simon Josefsson <jas@extundo.com>
parents: 100908
diff changeset
221 The list is in preference order.")
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
222
45252
ee1b06064fbb (smtpmail-mail-address): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 45204
diff changeset
223 (defvar smtpmail-mail-address nil
52321
e4b050573b12 (smtpmail-mail-address): Doc change.
Glenn Morris <rgm@gnu.org>
parents: 51895
diff changeset
224 "Value to use for envelope-from address for mail from ambient buffer.")
45252
ee1b06064fbb (smtpmail-mail-address): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 45204
diff changeset
225
23142
98c430cac424 (smtpmail-send-it): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents: 22037
diff changeset
226 ;;;###autoload
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
227 (defun smtpmail-send-it ()
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
228 (let ((errbuf (if mail-interactive
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
229 (generate-new-buffer " smtpmail errors")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
230 0))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
231 (tembuf (generate-new-buffer " smtpmail temp"))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
232 (case-fold-search nil)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
233 delimline
24773
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
234 (mailbuf (current-buffer))
52347
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
235 ;; Examine this variable now, so that
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
236 ;; local binding in the mail buffer will take effect.
52321
e4b050573b12 (smtpmail-mail-address): Doc change.
Glenn Morris <rgm@gnu.org>
parents: 51895
diff changeset
237 (smtpmail-mail-address
e4b050573b12 (smtpmail-mail-address): Doc change.
Glenn Morris <rgm@gnu.org>
parents: 51895
diff changeset
238 (or (and mail-specify-envelope-from (mail-envelope-from))
e4b050573b12 (smtpmail-mail-address): Doc change.
Glenn Morris <rgm@gnu.org>
parents: 51895
diff changeset
239 user-mail-address))
24773
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
240 (smtpmail-code-conv-from
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
241 (if enable-multibyte-characters
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
242 (let ((sendmail-coding-system smtpmail-code-conv-from))
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
243 (select-message-coding-system)))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
244 (unwind-protect
105829
328150f0cf76 * url-util.el (url-insert-entities-in-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103287
diff changeset
245 (with-current-buffer tembuf
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
246 (erase-buffer)
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
247 ;; Use the same `buffer-file-coding-system' as in the mail
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
248 ;; buffer, otherwise any `write-region' invocations (e.g., in
74158
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
249 ;; mail-do-fcc below) will annoy with asking for a suitable
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
250 ;; encoding.
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
251 (set-buffer-file-coding-system smtpmail-code-conv-from nil t)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
252 (insert-buffer-substring mailbuf)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
253 (goto-char (point-max))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
254 ;; require one newline at the end.
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
255 (or (= (preceding-char) ?\n)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
256 (insert ?\n))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
257 ;; Change header-delimiter to be what sendmail expects.
21862
c0569fcdef88 (smtpmail-send-it): Use mail-sendmail-undelimit-header.
Richard M. Stallman <rms@gnu.org>
parents: 21683
diff changeset
258 (mail-sendmail-undelimit-header)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
259 (setq delimline (point-marker))
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
260 ;; (sendmail-synch-aliases)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
261 (if mail-aliases
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
262 (expand-mail-aliases (point-min) delimline))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
263 (goto-char (point-min))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
264 ;; ignore any blank lines in the header
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
265 (while (and (re-search-forward "\n\n\n*" delimline t)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
266 (< (point) delimline))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
267 (replace-match "\n"))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
268 (let ((case-fold-search t))
21683
dfb671ba22f8 (smtpmail-send-it): Deleted all code related to Resent-To: processing.
Richard M. Stallman <rms@gnu.org>
parents: 20058
diff changeset
269 ;; We used to process Resent-... headers here,
dfb671ba22f8 (smtpmail-send-it): Deleted all code related to Resent-To: processing.
Richard M. Stallman <rms@gnu.org>
parents: 20058
diff changeset
270 ;; but it was not done properly, and the job
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
271 ;; is done correctly in `smtpmail-deduce-address-list'.
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
272 ;; Don't send out a blank subject line
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
273 (goto-char (point-min))
21683
dfb671ba22f8 (smtpmail-send-it): Deleted all code related to Resent-To: processing.
Richard M. Stallman <rms@gnu.org>
parents: 20058
diff changeset
274 (if (re-search-forward "^Subject:\\([ \t]*\n\\)+\\b" delimline t)
dfb671ba22f8 (smtpmail-send-it): Deleted all code related to Resent-To: processing.
Richard M. Stallman <rms@gnu.org>
parents: 20058
diff changeset
275 (replace-match "")
dfb671ba22f8 (smtpmail-send-it): Deleted all code related to Resent-To: processing.
Richard M. Stallman <rms@gnu.org>
parents: 20058
diff changeset
276 ;; This one matches a Subject just before the header delimiter.
dfb671ba22f8 (smtpmail-send-it): Deleted all code related to Resent-To: processing.
Richard M. Stallman <rms@gnu.org>
parents: 20058
diff changeset
277 (if (and (re-search-forward "^Subject:\\([ \t]*\n\\)+" delimline t)
dfb671ba22f8 (smtpmail-send-it): Deleted all code related to Resent-To: processing.
Richard M. Stallman <rms@gnu.org>
parents: 20058
diff changeset
278 (= (match-end 0) delimline))
dfb671ba22f8 (smtpmail-send-it): Deleted all code related to Resent-To: processing.
Richard M. Stallman <rms@gnu.org>
parents: 20058
diff changeset
279 (replace-match "")))
15452
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
280 ;; Put the "From:" field in unless for some odd reason
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
281 ;; they put one in themselves.
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
282 (goto-char (point-min))
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
283 (if (not (re-search-forward "^From:" delimline t))
45252
ee1b06064fbb (smtpmail-mail-address): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 45204
diff changeset
284 (let* ((login smtpmail-mail-address)
15452
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
285 (fullname (user-full-name)))
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
286 (cond ((eq mail-from-style 'angles)
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
287 (insert "From: " fullname)
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
288 (let ((fullname-start (+ (point-min) 6))
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
289 (fullname-end (point-marker)))
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
290 (goto-char fullname-start)
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
291 ;; Look for a character that cannot appear unquoted
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
292 ;; according to RFC 822.
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
293 (if (re-search-forward "[^- !#-'*+/-9=?A-Z^-~]"
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
294 fullname-end 1)
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
295 (progn
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
296 ;; Quote fullname, escaping specials.
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
297 (goto-char fullname-start)
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
298 (insert "\"")
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
299 (while (re-search-forward "[\"\\]"
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
300 fullname-end 1)
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
301 (replace-match "\\\\\\&" t))
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
302 (insert "\""))))
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
303 (insert " <" login ">\n"))
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
304 ((eq mail-from-style 'parens)
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
305 (insert "From: " login " (")
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
306 (let ((fullname-start (point)))
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
307 (insert fullname)
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
308 (let ((fullname-end (point-marker)))
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
309 (goto-char fullname-start)
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
310 ;; RFC 822 says \ and nonmatching parentheses
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
311 ;; must be escaped in comments.
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
312 ;; Escape every instance of ()\ ...
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
313 (while (re-search-forward "[()\\]" fullname-end 1)
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
314 (replace-match "\\\\\\&" t))
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
315 ;; ... then undo escaping of matching parentheses,
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
316 ;; including matching nested parentheses.
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
317 (goto-char fullname-start)
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
318 (while (re-search-forward
15452
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
319 "\\(\\=\\|[^\\]\\(\\\\\\\\\\)*\\)\\\\(\\(\\([^\\]\\|\\\\\\\\\\)*\\)\\\\)"
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
320 fullname-end 1)
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
321 (replace-match "\\1(\\3)" t)
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
322 (goto-char fullname-start))))
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
323 (insert ")\n"))
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
324 ((null mail-from-style)
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
325 (insert "From: " login "\n")))))
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
326 ;; Insert a `Message-Id:' field if there isn't one yet.
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
327 (goto-char (point-min))
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
328 (unless (re-search-forward "^Message-Id:" delimline t)
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
329 (insert "Message-Id: " (message-make-message-id) "\n"))
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
330 ;; Insert a `Date:' field if there isn't one yet.
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
331 (goto-char (point-min))
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
332 (unless (re-search-forward "^Date:" delimline t)
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
333 (insert "Date: " (message-make-date) "\n"))
74158
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
334 ;; Possibly add a MIME header for the current coding system
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
335 (let (charset)
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
336 (goto-char (point-min))
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
337 (and (eq mail-send-nonascii 'mime)
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
338 (not (re-search-forward "^MIME-version:" delimline t))
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
339 (progn (skip-chars-forward "\0-\177")
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
340 (/= (point) (point-max)))
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
341 smtpmail-code-conv-from
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
342 (setq charset
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
343 (coding-system-get smtpmail-code-conv-from
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
344 'mime-charset))
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
345 (goto-char delimline)
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
346 (insert "MIME-version: 1.0\n"
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
347 "Content-type: text/plain; charset="
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
348 (symbol-name charset)
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
349 "\nContent-Transfer-Encoding: 8bit\n")))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
350 ;; Insert an extra newline if we need it to work around
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
351 ;; Sun's bug that swallows newlines.
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
352 (goto-char (1+ delimline))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
353 (if (eval mail-mailer-swallows-blank-line)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
354 (newline))
15452
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
355 ;; Find and handle any FCC fields.
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
356 (goto-char (point-min))
6f41e17b3452 (smtpmail-send-it): Don't handle FCC fields until after determining FROM field.
Richard M. Stallman <rms@gnu.org>
parents: 15451
diff changeset
357 (if (re-search-forward "^FCC:" delimline t)
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
358 ;; Force `mail-do-fcc' to use the encoding of the mail
74158
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
359 ;; buffer to encode outgoing messages on FCC files.
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
360 (let ((coding-system-for-write smtpmail-code-conv-from))
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
361 (mail-do-fcc delimline)))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
362 (if mail-interactive
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
363 (with-current-buffer errbuf
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
364 (erase-buffer))))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
365 ;;
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
366 (setq smtpmail-address-buffer (generate-new-buffer "*smtp-mail*"))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
367 (setq smtpmail-recipient-address-list
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
368 (smtpmail-deduce-address-list tembuf (point-min) delimline))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
369 (kill-buffer smtpmail-address-buffer)
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
370
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
371 (smtpmail-do-bcc delimline)
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
372 ;; Send or queue
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
373 (if (not smtpmail-queue-mail)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
374 (if (not (null smtpmail-recipient-address-list))
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
375 (if (not (smtpmail-via-smtp
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
376 smtpmail-recipient-address-list tembuf))
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
377 (error "Sending failed; SMTP protocol error"))
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
378 (error "Sending failed; no recipients"))
47436
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
379 (let* ((file-data
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
380 (expand-file-name
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
381 (format "%s_%i"
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
382 (format-time-string "%Y-%m-%d_%H:%M:%S")
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
383 (setq smtpmail-queue-counter
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
384 (1+ smtpmail-queue-counter)))
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
385 smtpmail-queue-dir))
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
386 (file-data (convert-standard-filename file-data))
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
387 (file-elisp (concat file-data ".el"))
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
388 (buffer-data (create-file-buffer file-data))
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
389 (buffer-elisp (create-file-buffer file-elisp))
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
390 (buffer-scratch "*queue-mail*"))
51895
2f47cd5fd50d (smtpmail-send-it): Create smtpmail-queue-dir if it doesn't exist.
Juanma Barranquero <lekktu@gmail.com>
parents: 50973
diff changeset
391 (unless (file-exists-p smtpmail-queue-dir)
2f47cd5fd50d (smtpmail-send-it): Create smtpmail-queue-dir if it doesn't exist.
Juanma Barranquero <lekktu@gmail.com>
parents: 50973
diff changeset
392 (make-directory smtpmail-queue-dir t))
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
393 (with-current-buffer buffer-data
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
394 (erase-buffer)
74158
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
395 (set-buffer-file-coding-system smtpmail-code-conv-from nil t)
68250
3db62d37041f (smtpmail-send-it): Use insert-buffer-substring.
Jesper Harder <harder@ifa.au.dk>
parents: 68117
diff changeset
396 (insert-buffer-substring tembuf)
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
397 (write-file file-data)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
398 (set-buffer buffer-elisp)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
399 (erase-buffer)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
400 (insert (concat
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
401 "(setq smtpmail-recipient-address-list '"
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
402 (prin1-to-string smtpmail-recipient-address-list)
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
403 ")\n"))
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
404 (write-file file-elisp)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
405 (set-buffer (generate-new-buffer buffer-scratch))
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
406 (insert (concat file-data "\n"))
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
407 (append-to-file (point-min)
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
408 (point-max)
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
409 (expand-file-name smtpmail-queue-index-file
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
410 smtpmail-queue-dir)))
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
411 (kill-buffer buffer-scratch)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
412 (kill-buffer buffer-data)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
413 (kill-buffer buffer-elisp))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
414 (kill-buffer tembuf)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
415 (if (bufferp errbuf)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
416 (kill-buffer errbuf)))))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
417
48419
03ac1463ec5e (smtpmail-send-queued-mail): Add autoload cookie.
Juanma Barranquero <lekktu@gmail.com>
parents: 47837
diff changeset
418 ;;;###autoload
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
419 (defun smtpmail-send-queued-mail ()
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
420 "Send mail that was queued as a result of setting `smtpmail-queue-mail'."
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
421 (interactive)
42225
8ef1ae58dc29 (smtpmail-send-queued-mail): Use
Eli Zaretskii <eliz@gnu.org>
parents: 41921
diff changeset
422 (with-temp-buffer
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
423 ;; Get index, get first mail, send it, update index, get second
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
424 ;; mail, send it, etc...
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
425 (let ((file-msg "")
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
426 (qfile (expand-file-name smtpmail-queue-index-file
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
427 smtpmail-queue-dir)))
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
428 (insert-file-contents qfile)
62621
078b075e8984 (smtpmail-open-stream): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
429 (goto-char (point-min))
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
430 (while (not (eobp))
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
431 (setq file-msg (buffer-substring (point) (line-end-position)))
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
432 (load file-msg)
41921
de4a90cd0a5f (smtpmail-send-queued-mail): Insert the enqueued messages literally.
Eli Zaretskii <eliz@gnu.org>
parents: 41716
diff changeset
433 ;; Insert the message literally: it is already encoded as per
de4a90cd0a5f (smtpmail-send-queued-mail): Insert the enqueued messages literally.
Eli Zaretskii <eliz@gnu.org>
parents: 41716
diff changeset
434 ;; the MIME headers, and code conversions might guess the
de4a90cd0a5f (smtpmail-send-queued-mail): Insert the enqueued messages literally.
Eli Zaretskii <eliz@gnu.org>
parents: 41716
diff changeset
435 ;; encoding wrongly.
42225
8ef1ae58dc29 (smtpmail-send-queued-mail): Use
Eli Zaretskii <eliz@gnu.org>
parents: 41921
diff changeset
436 (with-temp-buffer
8ef1ae58dc29 (smtpmail-send-queued-mail): Use
Eli Zaretskii <eliz@gnu.org>
parents: 41921
diff changeset
437 (let ((coding-system-for-read 'no-conversion))
8ef1ae58dc29 (smtpmail-send-queued-mail): Use
Eli Zaretskii <eliz@gnu.org>
parents: 41921
diff changeset
438 (insert-file-contents file-msg))
52347
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
439 (let ((smtpmail-mail-address
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
440 (or (and mail-specify-envelope-from (mail-envelope-from))
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
441 user-mail-address)))
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
442 (if (not (null smtpmail-recipient-address-list))
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
443 (if (not (smtpmail-via-smtp smtpmail-recipient-address-list
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
444 (current-buffer)))
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
445 (error "Sending failed; SMTP protocol error"))
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
446 (error "Sending failed; no recipients"))))
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
447 (delete-file file-msg)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
448 (delete-file (concat file-msg ".el"))
50931
0ef58c420b53 (smtpmail-send-queued-mail): Use point-at-bol instead of forward-line.
Juanma Barranquero <lekktu@gmail.com>
parents: 50912
diff changeset
449 (delete-region (point-at-bol) (point-at-bol 2)))
92129
1f3cc233058d Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents: 91844
diff changeset
450 (write-region (point-min) (point-max) qfile))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
451
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
452 ;; (defun smtpmail-via-smtp (host,port,sender,destination,smtpmail-text-buffer)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
453
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
454 (defun smtpmail-fqdn ()
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
455 (if smtpmail-local-domain
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
456 (concat (system-name) "." smtpmail-local-domain)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
457 (system-name)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
458
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
459 (defsubst smtpmail-cred-server (cred)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
460 (nth 0 cred))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
461
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
462 (defsubst smtpmail-cred-port (cred)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
463 (nth 1 cred))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
464
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
465 (defsubst smtpmail-cred-key (cred)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
466 (nth 2 cred))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
467
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
468 (defsubst smtpmail-cred-user (cred)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
469 (nth 2 cred))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
470
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
471 (defsubst smtpmail-cred-cert (cred)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
472 (nth 3 cred))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
473
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
474 (defsubst smtpmail-cred-passwd (cred)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
475 (nth 3 cred))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
476
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
477 (defun smtpmail-find-credentials (cred server port)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
478 (catch 'done
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
479 (let ((l cred) el)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
480 (while (setq el (pop l))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
481 (when (and (equal server (smtpmail-cred-server el))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
482 (equal port (smtpmail-cred-port el)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
483 (throw 'done el))))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
484
37800
9cddd888d25f (maybe-append-domain): Renamed to
Gerd Moellmann <gerd@gnu.org>
parents: 37600
diff changeset
485 (defun smtpmail-maybe-append-domain (recipient)
9cddd888d25f (maybe-append-domain): Renamed to
Gerd Moellmann <gerd@gnu.org>
parents: 37600
diff changeset
486 (if (or (not smtpmail-sendto-domain)
9cddd888d25f (maybe-append-domain): Renamed to
Gerd Moellmann <gerd@gnu.org>
parents: 37600
diff changeset
487 (string-match "@" recipient))
9cddd888d25f (maybe-append-domain): Renamed to
Gerd Moellmann <gerd@gnu.org>
parents: 37600
diff changeset
488 recipient
9cddd888d25f (maybe-append-domain): Renamed to
Gerd Moellmann <gerd@gnu.org>
parents: 37600
diff changeset
489 (concat recipient "@" smtpmail-sendto-domain)))
9cddd888d25f (maybe-append-domain): Renamed to
Gerd Moellmann <gerd@gnu.org>
parents: 37600
diff changeset
490
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
491 (defun smtpmail-intersection (list1 list2)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
492 (let ((result nil))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
493 (dolist (el2 list2)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
494 (when (memq el2 list1)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
495 (push el2 result)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
496 (nreverse result)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
497
62621
078b075e8984 (smtpmail-open-stream): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
498 (defvar starttls-extra-args)
078b075e8984 (smtpmail-open-stream): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
499 (defvar starttls-extra-arguments)
078b075e8984 (smtpmail-open-stream): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
500
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
501 (defun smtpmail-open-stream (process-buffer host port)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
502 (let ((cred (smtpmail-find-credentials
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
503 smtpmail-starttls-credentials host port)))
99478
7555ac1526bf (smtpmail-open-stream): Use `starttls-any-program-available'.
Teodor Zlatanov <tzz@lifelogs.com>
parents: 95626
diff changeset
504 (if (null (and cred (starttls-any-program-available)))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
505 ;; The normal case.
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
506 (open-network-stream "SMTP" process-buffer host port)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
507 (let* ((cred-key (smtpmail-cred-key cred))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
508 (cred-cert (smtpmail-cred-cert cred))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
509 (starttls-extra-args
57435
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
510 (append
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
511 starttls-extra-args
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
512 (when (and (stringp cred-key) (stringp cred-cert)
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
513 (file-regular-p
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
514 (setq cred-key (expand-file-name cred-key)))
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
515 (file-regular-p
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
516 (setq cred-cert (expand-file-name cred-cert))))
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
517 (list "--key-file" cred-key "--cert-file" cred-cert))))
55786
a4b0f825c65a (smtpmail-open-stream): Bind
Simon Josefsson <jas@extundo.com>
parents: 54763
diff changeset
518 (starttls-extra-arguments
57435
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
519 (append
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
520 starttls-extra-arguments
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
521 (when (and (stringp cred-key) (stringp cred-cert)
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
522 (file-regular-p
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
523 (setq cred-key (expand-file-name cred-key)))
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
524 (file-regular-p
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
525 (setq cred-cert (expand-file-name cred-cert))))
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
526 (list "--x509keyfile" cred-key "--x509certfile" cred-cert)))))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
527 (starttls-open-stream "SMTP" process-buffer host port)))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
528
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
529 ;; `password-read' autoloads password-cache.
91844
ee383bc4d019 (password-cache-add): Declare as function.
Glenn Morris <rgm@gnu.org>
parents: 91843
diff changeset
530 (declare-function password-cache-add "password-cache" (key password))
ee383bc4d019 (password-cache-add): Declare as function.
Glenn Morris <rgm@gnu.org>
parents: 91843
diff changeset
531
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
532 (defun smtpmail-try-auth-methods (process supported-extensions host port)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
533 (let* ((mechs (cdr-safe (assoc 'auth supported-extensions)))
102382
b83a02b58e7f (smtpmail-auth-supported): Mention that list is
Simon Josefsson <jas@extundo.com>
parents: 100908
diff changeset
534 (mech (car (smtpmail-intersection mechs smtpmail-auth-supported)))
95626
a9fc7556436a Remove unnecessary eval-and-compile.
Glenn Morris <rgm@gnu.org>
parents: 94880
diff changeset
535 (auth-user (auth-source-user-or-password
94880
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
536 "login" host (or port "smtp")))
95626
a9fc7556436a Remove unnecessary eval-and-compile.
Glenn Morris <rgm@gnu.org>
parents: 94880
diff changeset
537 (auth-pass (auth-source-user-or-password
94880
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
538 "password" host (or port "smtp")))
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
539 (cred (if (and auth-user auth-pass) ; try user-auth-* before netrc-*
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
540 (list host port auth-user auth-pass)
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
541 ;; else, if auth-source didn't return them...
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
542 (if (stringp smtpmail-auth-credentials)
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
543 (let* ((netrc (netrc-parse smtpmail-auth-credentials))
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
544 (port-name (format "%s" (or port "smtp")))
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
545 (hostentry (netrc-machine netrc host port-name
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
546 port-name)))
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
547 (when hostentry
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
548 (list host port
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
549 (netrc-get hostentry "login")
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
550 (netrc-get hostentry "password"))))
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
551 ;; else, try `smtpmail-find-credentials' since
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
552 ;; `smtpmail-auth-credentials' is not a string
94880
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
553 (smtpmail-find-credentials
e1d2da11b5ac Add autoload for
Teodor Zlatanov <tzz@lifelogs.com>
parents: 94674
diff changeset
554 smtpmail-auth-credentials host port))))
91820
f084b6fae1f0 * mail/smtpmail.el: Use password-cache.
Bastien Guerry <bzg@altern.org>
parents: 79712
diff changeset
555 (prompt (when cred (format "SMTP password for %s:%s: "
f084b6fae1f0 * mail/smtpmail.el: Use password-cache.
Bastien Guerry <bzg@altern.org>
parents: 79712
diff changeset
556 (smtpmail-cred-server cred)
f084b6fae1f0 * mail/smtpmail.el: Use password-cache.
Bastien Guerry <bzg@altern.org>
parents: 79712
diff changeset
557 (smtpmail-cred-port cred))))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
558 (passwd (when cred
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
559 (or (smtpmail-cred-passwd cred)
91820
f084b6fae1f0 * mail/smtpmail.el: Use password-cache.
Bastien Guerry <bzg@altern.org>
parents: 79712
diff changeset
560 (password-read prompt prompt))))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
561 ret)
53807
61abf9ce6838 (smtpmail-try-auth-methods): Pass port-name as defaultport to `netrc-machine'.
Sam Steingold <sds@gnu.org>
parents: 53641
diff changeset
562 (when (and cred mech)
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
563 (cond
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
564 ((eq mech 'cram-md5)
59159
e6d896f96885 Fix last commit.
Simon Josefsson <jas@extundo.com>
parents: 59098
diff changeset
565 (smtpmail-send-command process (upcase (format "AUTH %s" mech)))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
566 (if (or (null (car (setq ret (smtpmail-read-response process))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
567 (not (integerp (car ret)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
568 (>= (car ret) 400))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
569 (throw 'done nil))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
570 (when (eq (car ret) 334)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
571 (let* ((challenge (substring (cadr ret) 4))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
572 (decoded (base64-decode-string challenge))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
573 (hash (rfc2104-hash 'md5 64 16 passwd decoded))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
574 (response (concat (smtpmail-cred-user cred) " " hash))
73418
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
575 ;; Osamu Yamane <yamane@green.ocn.ne.jp>:
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
576 ;; SMTP auth fails because the SMTP server identifies
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
577 ;; only the first part of the string (delimited by
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
578 ;; new line characters) as a response from the
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
579 ;; client, and the rest as distinct commands.
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
580
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
581 ;; In my case, the response string is 80 characters
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
582 ;; long. Without the no-line-break option for
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
583 ;; `base64-encode-string', only the first 76 characters
73418
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
584 ;; are taken as a response to the server, and the
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
585 ;; authentication fails.
73148
6887b498642b * mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long
Chong Yidong <cyd@stupidchicken.com>
parents: 72671
diff changeset
586 (encoded (base64-encode-string response t)))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
587 (smtpmail-send-command process (format "%s" encoded))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
588 (if (or (null (car (setq ret (smtpmail-read-response process))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
589 (not (integerp (car ret)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
590 (>= (car ret) 400))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
591 (throw 'done nil)))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
592 ((eq mech 'login)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
593 (smtpmail-send-command process "AUTH LOGIN")
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
594 (if (or (null (car (setq ret (smtpmail-read-response process))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
595 (not (integerp (car ret)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
596 (>= (car ret) 400))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
597 (throw 'done nil))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
598 (smtpmail-send-command
73215
32b78c90379a 2006-10-02 MIYOSHI Masanori <miyoshi@meadowy.org> (tiny change)
Simon Josefsson <jas@extundo.com>
parents: 73148
diff changeset
599 process (base64-encode-string (smtpmail-cred-user cred) t))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
600 (if (or (null (car (setq ret (smtpmail-read-response process))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
601 (not (integerp (car ret)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
602 (>= (car ret) 400))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
603 (throw 'done nil))
73148
6887b498642b * mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long
Chong Yidong <cyd@stupidchicken.com>
parents: 72671
diff changeset
604 (smtpmail-send-command process (base64-encode-string passwd t))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
605 (if (or (null (car (setq ret (smtpmail-read-response process))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
606 (not (integerp (car ret)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
607 (>= (car ret) 400))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
608 (throw 'done nil)))
64414
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
609 ((eq mech 'plain)
68117
340b01243a62 Add comment describing AUTH PLAIN fix.
Simon Josefsson <jas@extundo.com>
parents: 67873
diff changeset
610 ;; We used to send an empty initial request, and wait for an
340b01243a62 Add comment describing AUTH PLAIN fix.
Simon Josefsson <jas@extundo.com>
parents: 67873
diff changeset
611 ;; empty response, and then send the password, but this
340b01243a62 Add comment describing AUTH PLAIN fix.
Simon Josefsson <jas@extundo.com>
parents: 67873
diff changeset
612 ;; violate a SHOULD in RFC 2222 paragraph 5.1. Note that this
340b01243a62 Add comment describing AUTH PLAIN fix.
Simon Josefsson <jas@extundo.com>
parents: 67873
diff changeset
613 ;; is not sent if the server did not advertise AUTH PLAIN in
340b01243a62 Add comment describing AUTH PLAIN fix.
Simon Josefsson <jas@extundo.com>
parents: 67873
diff changeset
614 ;; the EHLO response. See RFC 2554 for more info.
67873
51ca2759364a Fix AUTH PLAIN authentication.
Simon Josefsson <jas@extundo.com>
parents: 67424
diff changeset
615 (smtpmail-send-command process
51ca2759364a Fix AUTH PLAIN authentication.
Simon Josefsson <jas@extundo.com>
parents: 67424
diff changeset
616 (concat "AUTH PLAIN "
51ca2759364a Fix AUTH PLAIN authentication.
Simon Josefsson <jas@extundo.com>
parents: 67424
diff changeset
617 (base64-encode-string
64414
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
618 (concat "\0"
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
619 (smtpmail-cred-user cred)
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
620 "\0"
73148
6887b498642b * mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long
Chong Yidong <cyd@stupidchicken.com>
parents: 72671
diff changeset
621 passwd) t)))
64414
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
622 (if (or (null (car (setq ret (smtpmail-read-response process))))
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
623 (not (integerp (car ret)))
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
624 (not (equal (car ret) 235)))
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
625 (throw 'done nil)))
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
626
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
627 (t
64414
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
628 (error "Mechanism %s not implemented" mech)))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
629 ;; Remember the password.
91820
f084b6fae1f0 * mail/smtpmail.el: Use password-cache.
Bastien Guerry <bzg@altern.org>
parents: 79712
diff changeset
630 (when (null (smtpmail-cred-passwd cred))
f084b6fae1f0 * mail/smtpmail.el: Use password-cache.
Bastien Guerry <bzg@altern.org>
parents: 79712
diff changeset
631 (password-cache-add prompt passwd)))))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
632
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
633 (defun smtpmail-via-smtp (recipient smtpmail-text-buffer)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
634 (let ((process nil)
23142
98c430cac424 (smtpmail-send-it): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents: 22037
diff changeset
635 (host (or smtpmail-smtp-server
98c430cac424 (smtpmail-send-it): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents: 22037
diff changeset
636 (error "`smtpmail-smtp-server' not defined")))
15346
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
637 (port smtpmail-smtp-service)
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
638 ;; `smtpmail-mail-address' should be set to the appropriate
52347
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
639 ;; buffer-local value by the caller, but in case not:
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
640 (envelope-from (or smtpmail-mail-address
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
641 (and mail-specify-envelope-from
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
642 (mail-envelope-from))
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
643 user-mail-address))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
644 response-code
15346
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
645 greeting
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
646 process-buffer
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
647 (supported-extensions '()))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
648 (unwind-protect
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
649 (catch 'done
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
650 ;; get or create the trace buffer
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
651 (setq process-buffer
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
652 (get-buffer-create (format "*trace of SMTP session to %s*" host)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
653
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
654 ;; clear the trace buffer of old output
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
655 (with-current-buffer process-buffer
67424
02c3cfe8d00b (smtpmail-via-smtp): Disable undo in SMTP buffer.
Kim F. Storm <storm@cua.dk>
parents: 67347
diff changeset
656 (setq buffer-undo-list t)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
657 (erase-buffer))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
658
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
659 ;; open the connection to the server
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
660 (setq process (smtpmail-open-stream process-buffer host port))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
661 (and (null process) (throw 'done nil))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
662
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
663 ;; set the send-filter
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
664 (set-process-filter process 'smtpmail-process-filter)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
665
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
666 (with-current-buffer process-buffer
22037
cb95bfcd442a (smtpmail-via-smtp): Speciy process coding system.
Richard M. Stallman <rms@gnu.org>
parents: 21862
diff changeset
667 (set-buffer-process-coding-system 'raw-text-unix 'raw-text-unix)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
668 (make-local-variable 'smtpmail-read-point)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
669 (setq smtpmail-read-point (point-min))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
670
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
671
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
672 (if (or (null (car (setq greeting (smtpmail-read-response process))))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
673 (not (integerp (car greeting)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
674 (>= (car greeting) 400))
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
675 (throw 'done nil))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
676
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
677 (let ((do-ehlo t)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
678 (do-starttls t))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
679 (while do-ehlo
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
680 ;; EHLO
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
681 (smtpmail-send-command process (format "EHLO %s" (smtpmail-fqdn)))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
682
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
683 (if (or (null (car (setq response-code
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
684 (smtpmail-read-response process))))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
685 (not (integerp (car response-code)))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
686 (>= (car response-code) 400))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
687 (progn
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
688 ;; HELO
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
689 (smtpmail-send-command
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
690 process (format "HELO %s" (smtpmail-fqdn)))
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
691
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
692 (if (or (null (car (setq response-code
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
693 (smtpmail-read-response process))))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
694 (not (integerp (car response-code)))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
695 (>= (car response-code) 400))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
696 (throw 'done nil)))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
697 (dolist (line (cdr (cdr response-code)))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
698 (let ((name
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
699 (with-case-table ascii-case-table
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
700 (mapcar (lambda (s) (intern (downcase s)))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
701 (split-string (substring line 4) "[ ]")))))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
702 (and (eq (length name) 1)
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
703 (setq name (car name)))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
704 (and name
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
705 (cond ((memq (if (consp name) (car name) name)
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
706 '(verb xvrb 8bitmime onex xone
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
707 expn size dsn etrn
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
708 enhancedstatuscodes
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
709 help xusr
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
710 auth=login auth starttls))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
711 (setq supported-extensions
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
712 (cons name supported-extensions)))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
713 (smtpmail-warn-about-unknown-extensions
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
714 (message "Unknown extension %s" name)))))))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
715
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
716 (if (and do-starttls
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
717 (smtpmail-find-credentials smtpmail-starttls-credentials host port)
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
718 (member 'starttls supported-extensions)
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
719 (numberp (process-id process)))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
720 (progn
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
721 (smtpmail-send-command process (format "STARTTLS"))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
722 (if (or (null (car (setq response-code (smtpmail-read-response process))))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
723 (not (integerp (car response-code)))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
724 (>= (car response-code) 400))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
725 (throw 'done nil))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
726 (starttls-negotiate process)
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
727 (setq do-starttls nil))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
728 (setq do-ehlo nil))))
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
729
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
730 (smtpmail-try-auth-methods process supported-extensions host port)
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
731
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
732 (if (or (member 'onex supported-extensions)
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
733 (member 'xone supported-extensions))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
734 (progn
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
735 (smtpmail-send-command process (format "ONEX"))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
736 (if (or (null (car (setq response-code (smtpmail-read-response process))))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
737 (not (integerp (car response-code)))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
738 (>= (car response-code) 400))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
739 (throw 'done nil))))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
740
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
741 (if (and smtpmail-debug-verb
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
742 (or (member 'verb supported-extensions)
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
743 (member 'xvrb supported-extensions)))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
744 (progn
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
745 (smtpmail-send-command process (format "VERB"))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
746 (if (or (null (car (setq response-code (smtpmail-read-response process))))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
747 (not (integerp (car response-code)))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
748 (>= (car response-code) 400))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
749 (throw 'done nil))))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
750
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
751 (if (member 'xusr supported-extensions)
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
752 (progn
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
753 (smtpmail-send-command process (format "XUSR"))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
754 (if (or (null (car (setq response-code (smtpmail-read-response process))))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
755 (not (integerp (car response-code)))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
756 (>= (car response-code) 400))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
757 (throw 'done nil))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
758
52642
79320037f627 (smtpmail-via-smtp): Don't insert a space
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
759 ;; MAIL FROM:<sender>
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
760 (let ((size-part
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
761 (if (or (member 'size supported-extensions)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
762 (assoc 'size supported-extensions))
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
763 (format " SIZE=%d"
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
764 (with-current-buffer smtpmail-text-buffer
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
765 ;; size estimate:
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
766 (+ (- (point-max) (point-min))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
767 ;; Add one byte for each change-of-line
53641
e33121530d13 Jesper Harder <harder@ifa.au.dk>
Glenn Morris <rgm@gnu.org>
parents: 53619
diff changeset
768 ;; because of CR-LF representation:
e33121530d13 Jesper Harder <harder@ifa.au.dk>
Glenn Morris <rgm@gnu.org>
parents: 53619
diff changeset
769 (count-lines (point-min) (point-max)))))
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
770 ""))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
771 (body-part
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
772 (if (member '8bitmime supported-extensions)
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
773 ;; FIXME:
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
774 ;; Code should be added here that transforms
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
775 ;; the contents of the message buffer into
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
776 ;; something the receiving SMTP can handle.
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
777 ;; For a receiver that supports 8BITMIME, this
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
778 ;; may mean converting BINARY to BASE64, or
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
779 ;; adding Content-Transfer-Encoding and the
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
780 ;; other MIME headers. The code should also
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
781 ;; return an indication of what encoding the
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
782 ;; message buffer is now, i.e. ASCII or
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
783 ;; 8BITMIME.
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
784 (if nil
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
785 " BODY=8BITMIME"
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
786 "")
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
787 "")))
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
788 ;; (smtpmail-send-command process (format "MAIL FROM:%s@%s" (user-login-name) (smtpmail-fqdn)))
52642
79320037f627 (smtpmail-via-smtp): Don't insert a space
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
789 (smtpmail-send-command process (format "MAIL FROM:<%s>%s%s"
52347
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
790 envelope-from
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
791 size-part
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
792 body-part))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48846
diff changeset
793
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
794 (if (or (null (car (setq response-code (smtpmail-read-response process))))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
795 (not (integerp (car response-code)))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
796 (>= (car response-code) 400))
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
797 (throw 'done nil)))
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
798
52642
79320037f627 (smtpmail-via-smtp): Don't insert a space
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
799 ;; RCPT TO:<recipient>
15346
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
800 (let ((n 0))
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
801 (while (not (null (nth n recipient)))
52642
79320037f627 (smtpmail-via-smtp): Don't insert a space
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
802 (smtpmail-send-command process (format "RCPT TO:<%s>" (smtpmail-maybe-append-domain (nth n recipient))))
15346
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
803 (setq n (1+ n))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
804
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
805 (setq response-code (smtpmail-read-response process))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
806 (if (or (null (car response-code))
15346
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
807 (not (integerp (car response-code)))
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
808 (>= (car response-code) 400))
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
809 (throw 'done nil))))
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
810
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
811 ;; DATA
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
812 (smtpmail-send-command process "DATA")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
813
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
814 (if (or (null (car (setq response-code (smtpmail-read-response process))))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
815 (not (integerp (car response-code)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
816 (>= (car response-code) 400))
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
817 (throw 'done nil))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
818
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
819 ;; Mail contents
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
820 (smtpmail-send-data process smtpmail-text-buffer)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
821
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
822 ;; DATA end "."
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
823 (smtpmail-send-command process ".")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
824
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
825 (if (or (null (car (setq response-code (smtpmail-read-response process))))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
826 (not (integerp (car response-code)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
827 (>= (car response-code) 400))
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
828 (throw 'done nil))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
829
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
830 ;; QUIT
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
831 ;; (smtpmail-send-command process "QUIT")
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
832 ;; (and (null (car (smtpmail-read-response process)))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
833 ;; (throw 'done nil))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
834 t))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
835 (if process
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
836 (with-current-buffer (process-buffer process)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
837 (smtpmail-send-command process "QUIT")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
838 (smtpmail-read-response process)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
839
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
840 ;; (if (or (null (car (setq response-code (smtpmail-read-response process))))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
841 ;; (not (integerp (car response-code)))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
842 ;; (>= (car response-code) 400))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
843 ;; (throw 'done nil))
47117
c6c0e4cc9d0a (smtpmail-via-smtp): Delete process buffer
Simon Josefsson <jas@extundo.com>
parents: 45252
diff changeset
844 (delete-process process)
c6c0e4cc9d0a (smtpmail-via-smtp): Delete process buffer
Simon Josefsson <jas@extundo.com>
parents: 45252
diff changeset
845 (unless smtpmail-debug-info
c6c0e4cc9d0a (smtpmail-via-smtp): Delete process buffer
Simon Josefsson <jas@extundo.com>
parents: 45252
diff changeset
846 (kill-buffer process-buffer)))))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
847
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
848
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
849 (defun smtpmail-process-filter (process output)
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
850 (with-current-buffer (process-buffer process)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
851 (goto-char (point-max))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
852 (insert output)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
853
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
854 (defun smtpmail-read-response (process)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
855 (let ((case-fold-search nil)
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
856 (response-strings nil)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
857 (response-continue t)
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
858 (return-value '(nil ()))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
859 match-end)
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
860 (catch 'done
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
861 (while response-continue
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
862 (goto-char smtpmail-read-point)
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
863 (while (not (search-forward "\r\n" nil t))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
864 (unless (memq (process-status process) '(open run))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
865 (throw 'done nil))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
866 (accept-process-output process)
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
867 (goto-char smtpmail-read-point))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
868
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
869 (setq match-end (point))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
870 (setq response-strings
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
871 (cons (buffer-substring smtpmail-read-point (- match-end 2))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
872 response-strings))
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
873
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
874 (goto-char smtpmail-read-point)
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
875 (if (looking-at "[0-9]+ ")
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
876 (let ((begin (match-beginning 0))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
877 (end (match-end 0)))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
878 (if smtpmail-debug-info
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
879 (message "%s" (car response-strings)))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
880
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
881 (setq smtpmail-read-point match-end)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
882
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
883 ;; ignore lines that start with "0"
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
884 (if (looking-at "0[0-9]+ ")
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
885 nil
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
886 (setq response-continue nil)
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
887 (setq return-value
62402
a7e02ef1e3d6 Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents: 59996
diff changeset
888 (cons (string-to-number
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
889 (buffer-substring begin end))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
890 (nreverse response-strings)))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
891
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
892 (if (looking-at "[0-9]+-")
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
893 (progn (if smtpmail-debug-info
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
894 (message "%s" (car response-strings)))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
895 (setq smtpmail-read-point match-end)
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
896 (setq response-continue t))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
897 (progn
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
898 (setq smtpmail-read-point match-end)
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
899 (setq response-continue nil)
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
900 (setq return-value
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
901 (cons nil (nreverse response-strings)))))))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
902 (setq smtpmail-read-point match-end))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
903 return-value))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
904
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
905
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
906 (defun smtpmail-send-command (process command)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
907 (goto-char (point-max))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
908 (if (= (aref command 0) ?P)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
909 (insert "PASS <omitted>\r\n")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
910 (insert command "\r\n"))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
911 (setq smtpmail-read-point (point))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
912 (process-send-string process command)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
913 (process-send-string process "\r\n"))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
914
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
915 (defun smtpmail-send-data-1 (process data)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
916 (goto-char (point-max))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
917
24773
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
918 (if (and (multibyte-string-p data)
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
919 smtpmail-code-conv-from)
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
920 (setq data (string-as-multibyte
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
921 (encode-coding-string data smtpmail-code-conv-from))))
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
922
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
923 (if smtpmail-debug-info
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
924 (insert data "\r\n"))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
925
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
926 (setq smtpmail-read-point (point))
15676
46d74bda4351 (smtpmail-send-data-1): Escape "." at the start of
Karl Heuer <kwzh@gnu.org>
parents: 15648
diff changeset
927 ;; Escape "." at start of a line
46d74bda4351 (smtpmail-send-data-1): Escape "." at the start of
Karl Heuer <kwzh@gnu.org>
parents: 15648
diff changeset
928 (if (eq (string-to-char data) ?.)
46d74bda4351 (smtpmail-send-data-1): Escape "." at the start of
Karl Heuer <kwzh@gnu.org>
parents: 15648
diff changeset
929 (process-send-string process "."))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
930 (process-send-string process data)
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
931 (process-send-string process "\r\n"))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
932
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
933 (defun smtpmail-send-data (process buffer)
53619
f69d407a9996 Jesper Harder <harder@ifa.au.dk>
Glenn Morris <rgm@gnu.org>
parents: 52642
diff changeset
934 (let ((data-continue t) sending-data)
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
935 (with-current-buffer buffer
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
936 (goto-char (point-min)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
937 (while data-continue
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
938 (with-current-buffer buffer
53619
f69d407a9996 Jesper Harder <harder@ifa.au.dk>
Glenn Morris <rgm@gnu.org>
parents: 52642
diff changeset
939 (setq sending-data (buffer-substring (point-at-bol) (point-at-eol)))
f69d407a9996 Jesper Harder <harder@ifa.au.dk>
Glenn Morris <rgm@gnu.org>
parents: 52642
diff changeset
940 (end-of-line 2)
f69d407a9996 Jesper Harder <harder@ifa.au.dk>
Glenn Morris <rgm@gnu.org>
parents: 52642
diff changeset
941 (setq data-continue (not (eobp))))
f69d407a9996 Jesper Harder <harder@ifa.au.dk>
Glenn Morris <rgm@gnu.org>
parents: 52642
diff changeset
942 (smtpmail-send-data-1 process sending-data))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
943
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
944 (defun smtpmail-deduce-address-list (smtpmail-text-buffer header-start header-end)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
945 "Get address list suitable for smtp RCPT TO: <address>."
24663
39edc9c7b235 (smtpmail-deduce-address-list): Bind variables
Andrew Innes <andrewi@gnu.org>
parents: 24455
diff changeset
946 (unwind-protect
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
947 (with-current-buffer smtpmail-address-buffer
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
948 (erase-buffer)
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
949 (let ((case-fold-search t)
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
950 (simple-address-list "")
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
951 this-line
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
952 this-line-end
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
953 addr-regexp)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
954 (insert-buffer-substring smtpmail-text-buffer header-start header-end)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
955 (goto-char (point-min))
15648
2feeabc94834 (smtpmail-deduce-address-list): Handle RESENT-* fields.
Karl Heuer <kwzh@gnu.org>
parents: 15595
diff changeset
956 ;; RESENT-* fields should stop processing of regular fields.
2feeabc94834 (smtpmail-deduce-address-list): Handle RESENT-* fields.
Karl Heuer <kwzh@gnu.org>
parents: 15595
diff changeset
957 (save-excursion
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
958 (setq addr-regexp
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
959 (if (re-search-forward "^Resent-\\(to\\|cc\\|bcc\\):"
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
960 header-end t)
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
961 "^Resent-\\(to\\|cc\\|bcc\\):"
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
962 "^\\(To:\\|Cc:\\|Bcc:\\)")))
15648
2feeabc94834 (smtpmail-deduce-address-list): Handle RESENT-* fields.
Karl Heuer <kwzh@gnu.org>
parents: 15595
diff changeset
963
2feeabc94834 (smtpmail-deduce-address-list): Handle RESENT-* fields.
Karl Heuer <kwzh@gnu.org>
parents: 15595
diff changeset
964 (while (re-search-forward addr-regexp header-end t)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
965 (replace-match "")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
966 (setq this-line (match-beginning 0))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
967 (forward-line 1)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
968 ;; get any continuation lines
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
969 (while (and (looking-at "^[ \t]+") (< (point) header-end))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
970 (forward-line 1))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
971 (setq this-line-end (point-marker))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
972 (setq simple-address-list
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
973 (concat simple-address-list " "
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
974 (mail-strip-quoted-names (buffer-substring this-line this-line-end)))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
975 (erase-buffer)
41497
608d7b92d289 Simplify previous change.
Richard M. Stallman <rms@gnu.org>
parents: 41492
diff changeset
976 (insert " " simple-address-list "\n")
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
977 (subst-char-in-region (point-min) (point-max) 10 ? t) ; newline --> blank
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
978 (subst-char-in-region (point-min) (point-max) ?, ? t) ; comma --> blank
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
979 (subst-char-in-region (point-min) (point-max) 9 ? t) ; tab --> blank
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
980
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
981 (goto-char (point-min))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
982 ;; tidyness in case hook is not robust when it looks at this
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
983 (while (re-search-forward "[ \t]+" header-end t) (replace-match " "))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
984
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
985 (goto-char (point-min))
15346
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
986 (let (recipient-address-list)
15451
89c1e7fe879a (smtpmail-smtp-service): Use port 25 as default.
Richard M. Stallman <rms@gnu.org>
parents: 15372
diff changeset
987 (while (re-search-forward " \\([^ ]+\\) " (point-max) t)
15346
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
988 (backward-char 1)
15451
89c1e7fe879a (smtpmail-smtp-service): Use port 25 as default.
Richard M. Stallman <rms@gnu.org>
parents: 15372
diff changeset
989 (setq recipient-address-list (cons (buffer-substring (match-beginning 1) (match-end 1))
103287
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
990 recipient-address-list)))
e501499f857c * mail/smtpmail.el: Indent code properly to make it more readable.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 102382
diff changeset
991 (setq smtpmail-recipient-address-list recipient-address-list))))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
992
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
993 (defun smtpmail-do-bcc (header-end)
21683
dfb671ba22f8 (smtpmail-send-it): Deleted all code related to Resent-To: processing.
Richard M. Stallman <rms@gnu.org>
parents: 20058
diff changeset
994 "Delete [Resent-]BCC: and their continuation lines from the header area.
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
995 There may be multiple BCC: lines, and each may have arbitrarily
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
996 many continuation lines."
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
997 (let ((case-fold-search t))
24455
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
998 (save-excursion
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
999 (goto-char (point-min))
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1000 ;; iterate over all BCC: lines
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1001 (while (re-search-forward "^\\(RESENT-\\)?BCC:" header-end t)
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1002 (delete-region (match-beginning 0)
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1003 (progn (forward-line 1) (point)))
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1004 ;; get rid of any continuation lines
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1005 (while (and (looking-at "^[ \t].*\n") (< (point) header-end))
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1006 (replace-match ""))))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1007
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1008 (provide 'smtpmail)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1009
93975
1e3a407766b9 Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92129
diff changeset
1010 ;; arch-tag: a76992df-6d71-43b7-9e72-4bacc6c05466
17517
8f952e921136 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 17436
diff changeset
1011 ;;; smtpmail.el ends here