annotate lisp/mail/smtpmail.el @ 81058:b6ab0a86a34c

Add arch tagline
author Miles Bader <miles@gnu.org>
date Thu, 24 May 2007 02:09:52 +0000
parents 3c8672cf3035
children 8e27d63c45eb 4ef881a120fe
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
68648
067115a6e738 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 68250
diff changeset
3 ;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005,
75347
e3694f1cb928 Add 2007 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 74158
diff changeset
4 ;; 2006, 2007 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
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17 ;; GNU Emacs is free software; you can redistribute it and/or modify
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
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19 ;; the Free Software Foundation; either version 2, or (at your option)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20 ;; any later version.
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
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
28 ;; along with GNU Emacs; see the file COPYING. If not, write to the
64085
18a818a2ee7c Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 62621
diff changeset
29 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18a818a2ee7c Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 62621
diff changeset
30 ;; Boston, MA 02110-1301, USA.
15345
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 ;;; Commentary:
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
33
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
34 ;; Send Mail to smtp host from smtpmail temp buffer.
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 ;; Please add these lines in your .emacs(_emacs) or use customize.
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
37 ;;
23142
98c430cac424 (smtpmail-send-it): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents: 22037
diff changeset
38 ;;(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
39 ;;(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
40 ;;(setq smtpmail-default-smtp-server "YOUR SMTP HOST")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
41 ;;(setq smtpmail-local-domain "YOUR DOMAIN NAME")
26028
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
42 ;;(setq smtpmail-sendto-domain "YOUR DOMAIN NAME")
23142
98c430cac424 (smtpmail-send-it): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents: 22037
diff changeset
43 ;;(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
44 ;;(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
45 ;; '(("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
46 ;;(setq smtpmail-starttls-credentials
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
47 ;; '(("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
48 ;; 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
49 ;; integer or a string, just as long as they match (eq).
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
50
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
51 ;; To queue mail, set smtpmail-queue-mail to t and use
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
52 ;; smtpmail-send-queued-mail to send.
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
53
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
54 ;; 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
55 ;; 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
56 ;; 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
57 ;; 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
58 ;; support below.
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
59
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
60 ;; 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
61 ;; 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
62 ;; 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
63
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
64 ;; 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
65 ;; STARTTLS. Requires external program
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
66 ;; 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
67 ;; 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
68
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
69 ;;; Code:
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
70
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
71 (require 'sendmail)
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
72 (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
73 (autoload 'starttls-negotiate "starttls")
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
74 (autoload 'mail-strip-quoted-names "mail-utils")
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
75 (autoload 'message-make-date "message")
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
76 (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
77 (autoload 'rfc2104-hash "rfc2104")
44868
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
78 (autoload 'netrc-parse "netrc")
45179
6ff2c20da16e (netrc-machine, netrc-get): Add autoloads.
Richard M. Stallman <rms@gnu.org>
parents: 44883
diff changeset
79 (autoload 'netrc-machine "netrc")
6ff2c20da16e (netrc-machine, netrc-get): Add autoloads.
Richard M. Stallman <rms@gnu.org>
parents: 44883
diff changeset
80 (autoload 'netrc-get "netrc")
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
81
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
82 ;;;
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
83 (defgroup smtpmail nil
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
84 "SMTP protocol for sending mail."
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
85 :group 'mail)
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
86
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
87
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
88 (defcustom smtpmail-default-smtp-server nil
47396
d7fa9253971f (smtpmail-default-smtp-server): Doc fix.
Simon Josefsson <jas@extundo.com>
parents: 47225
diff changeset
89 "*Specify default SMTP server.
d7fa9253971f (smtpmail-default-smtp-server): Doc fix.
Simon Josefsson <jas@extundo.com>
parents: 47225
diff changeset
90 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
91 :type '(choice (const nil) string)
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
92 :group 'smtpmail)
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
93
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
94 (defcustom smtpmail-smtp-server
15451
89c1e7fe879a (smtpmail-smtp-service): Use port 25 as default.
Richard M. Stallman <rms@gnu.org>
parents: 15372
diff changeset
95 (or (getenv "SMTPSERVER") smtpmail-default-smtp-server)
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
96 "*The name of the host running SMTP server."
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
97 :type '(choice (const nil) string)
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
98 :group 'smtpmail)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
99
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
100 (defcustom smtpmail-smtp-service 25
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
101 "*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
102 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
103 :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
104 :group 'smtpmail)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
105
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
106 (defcustom smtpmail-local-domain nil
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
107 "*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
108 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
109 don't define this value."
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
110 :type '(choice (const nil) string)
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
111 :group 'smtpmail)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
112
26028
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
113 (defcustom smtpmail-sendto-domain nil
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
114 "*Local domain name without a host name.
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
115 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
116 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
117 \(Some configurations of sendmail require this.)
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
118
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
119 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
120 Sending failed; SMTP protocol error
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
121 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
122 buffer includes an exchange like:
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
123 RCPT TO: <someone>
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
124 501 <someone>: recipient address must contain a domain
a0126ac842dc (smtpmail-via-smtp): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 24871
diff changeset
125 "
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
17436
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
142 (defcustom smtpmail-code-conv-from nil ;; *junet*
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
143 "*smtpmail code convert from this code to *internal*..for tiny-mime.."
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
144 :type 'boolean
2a9fdbfcb993 Add defgroup; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16907
diff changeset
145 :group 'smtpmail)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
146
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
147 (defcustom smtpmail-queue-mail nil
75739
d6f3ca7298f7 (smtpmail-smtp-service, smtpmail-queue-index-file): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 75347
diff changeset
148 "*If set, mail is queued; otherwise it is sent immediately.
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
149 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
150 and sent with `smtpmail-send-queued-mail'."
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
151 :type 'boolean
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
152 :group 'smtpmail)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
153
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
154 (defcustom smtpmail-queue-dir "~/Mail/queued-mail/"
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
155 "*Directory where `smtpmail.el' stores queued mail."
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
156 :type 'directory
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
157 :group 'smtpmail)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
158
44868
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
159 (defcustom smtpmail-auth-credentials "~/.authinfo"
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
160 "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
161 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
162 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
163 `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
164 `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
165 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
166 looks like `user@realm'."
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
167 :type '(choice file
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
168 (repeat (list (string :tag "Server")
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
169 (integer :tag "Port")
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
170 (string :tag "Username")
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
171 (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
172 (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
173 :version "22.1"
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
174 :group 'smtpmail)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
175
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
176 (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
177 "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
178 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
179 `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
180 filename).
b1e05ba6e2b1 2006-09-06 Simon Josefsson <jas@extundo.com>
Simon Josefsson <jas@extundo.com>
parents: 68648
diff changeset
181 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
182 `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
183 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
184 connections."
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
185 :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
186 (integer :tag "Port")
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
187 (file :tag "Key")
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
188 (file :tag "Certificate")))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
189 :version "21.1"
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
190 :group 'smtpmail)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
191
37598
595c23d107f8 (smtpmail-warn-about-unknown-extensions): New
Gerd Moellmann <gerd@gnu.org>
parents: 26028
diff changeset
192 (defcustom smtpmail-warn-about-unknown-extensions nil
595c23d107f8 (smtpmail-warn-about-unknown-extensions): New
Gerd Moellmann <gerd@gnu.org>
parents: 26028
diff changeset
193 "*If set, print warnings about unknown SMTP extensions.
595c23d107f8 (smtpmail-warn-about-unknown-extensions): New
Gerd Moellmann <gerd@gnu.org>
parents: 26028
diff changeset
194 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
195 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
196 :type 'boolean
37600
20c37aac51cd (smtpmail-warn-about-unknown-extensions): Add :version.
Gerd Moellmann <gerd@gnu.org>
parents: 37598
diff changeset
197 :version "21.1"
37598
595c23d107f8 (smtpmail-warn-about-unknown-extensions): New
Gerd Moellmann <gerd@gnu.org>
parents: 26028
diff changeset
198 :group 'smtpmail)
595c23d107f8 (smtpmail-warn-about-unknown-extensions): New
Gerd Moellmann <gerd@gnu.org>
parents: 26028
diff changeset
199
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
200 (defvar 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
201 "File name of queued mail index.
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
202 This is relative to `smtpmail-queue-dir'.")
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
203
23444
a632871d7cfa (smtpmail-send-data-1): Use encode-coding-string.
Richard M. Stallman <rms@gnu.org>
parents: 23181
diff changeset
204 (defvar smtpmail-address-buffer)
a632871d7cfa (smtpmail-send-data-1): Use encode-coding-string.
Richard M. Stallman <rms@gnu.org>
parents: 23181
diff changeset
205 (defvar smtpmail-recipient-address-list)
a632871d7cfa (smtpmail-send-data-1): Use encode-coding-string.
Richard M. Stallman <rms@gnu.org>
parents: 23181
diff changeset
206
44864
c18dd95f6962 (smtpmail-queue-counter): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 42225
diff changeset
207 (defvar smtpmail-queue-counter 0)
c18dd95f6962 (smtpmail-queue-counter): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 42225
diff changeset
208
23444
a632871d7cfa (smtpmail-send-data-1): Use encode-coding-string.
Richard M. Stallman <rms@gnu.org>
parents: 23181
diff changeset
209 ;; Buffer-local variable.
a632871d7cfa (smtpmail-send-data-1): Use encode-coding-string.
Richard M. Stallman <rms@gnu.org>
parents: 23181
diff changeset
210 (defvar smtpmail-read-point)
a632871d7cfa (smtpmail-send-data-1): Use encode-coding-string.
Richard M. Stallman <rms@gnu.org>
parents: 23181
diff changeset
211
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
212 (defvar smtpmail-queue-index (concat smtpmail-queue-dir
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
213 smtpmail-queue-index-file))
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
214
64416
3b19cfc14a51 (smtpmail-auth-supported): Prefer PLAIN over LOGIN.
Simon Josefsson <jas@extundo.com>
parents: 64414
diff changeset
215 (defconst smtpmail-auth-supported '(cram-md5 plain login)
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
216 "List of supported SMTP AUTH mechanisms.")
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
217
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
218 ;;;
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
219 ;;;
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
220 ;;;
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
221
45252
ee1b06064fbb (smtpmail-mail-address): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 45204
diff changeset
222 (defvar smtpmail-mail-address nil
52321
e4b050573b12 (smtpmail-mail-address): Doc change.
Glenn Morris <rgm@gnu.org>
parents: 51895
diff changeset
223 "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
224
23142
98c430cac424 (smtpmail-send-it): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents: 22037
diff changeset
225 ;;;###autoload
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
226 (defun smtpmail-send-it ()
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
227 (let ((errbuf (if mail-interactive
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
228 (generate-new-buffer " smtpmail errors")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
229 0))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
230 (tembuf (generate-new-buffer " smtpmail temp"))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
231 (case-fold-search nil)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
232 delimline
24773
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
233 (mailbuf (current-buffer))
52347
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
234 ;; Examine this variable now, so that
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
235 ;; 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
236 (smtpmail-mail-address
e4b050573b12 (smtpmail-mail-address): Doc change.
Glenn Morris <rgm@gnu.org>
parents: 51895
diff changeset
237 (or (and mail-specify-envelope-from (mail-envelope-from))
e4b050573b12 (smtpmail-mail-address): Doc change.
Glenn Morris <rgm@gnu.org>
parents: 51895
diff changeset
238 user-mail-address))
24773
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
239 (smtpmail-code-conv-from
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
240 (if enable-multibyte-characters
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
241 (let ((sendmail-coding-system smtpmail-code-conv-from))
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
242 (select-message-coding-system)))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
243 (unwind-protect
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
244 (save-excursion
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
245 (set-buffer tembuf)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
246 (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
247 ;; Use the same buffer-file-coding-system as in the mail
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
248 ;; buffer, otherwise any write-region invocations (e.g., in
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))
15451
89c1e7fe879a (smtpmail-smtp-service): Use port 25 as default.
Richard M. Stallman <rms@gnu.org>
parents: 15372
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
dfb671ba22f8 (smtpmail-send-it): Deleted all code related to Resent-To: processing.
Richard M. Stallman <rms@gnu.org>
parents: 20058
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)
74158
07973a5d9639 (smtpmail-send-it): Copy buffer-file-coding-system from the mail buffer.
Eli Zaretskii <eliz@gnu.org>
parents: 73418
diff changeset
358 ;; Force mail-do-fcc to use the encoding of the mail
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 ;;
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
367 ;;
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
368 (setq smtpmail-address-buffer (generate-new-buffer "*smtp-mail*"))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
369 (setq smtpmail-recipient-address-list
21683
dfb671ba22f8 (smtpmail-send-it): Deleted all code related to Resent-To: processing.
Richard M. Stallman <rms@gnu.org>
parents: 20058
diff changeset
370 (smtpmail-deduce-address-list tembuf (point-min) delimline))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
371 (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
372
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
373 (smtpmail-do-bcc delimline)
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
374 ; Send or queue
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
375 (if (not smtpmail-queue-mail)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
376 (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
377 (if (not (smtpmail-via-smtp
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
378 smtpmail-recipient-address-list tembuf))
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
379 (error "Sending failed; SMTP protocol error"))
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
380 (error "Sending failed; no recipients"))
47436
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
381 (let* ((file-data
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
382 (expand-file-name
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
383 (format "%s_%i"
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
384 (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
385 (setq smtpmail-queue-counter
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
386 (1+ smtpmail-queue-counter)))
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
387 smtpmail-queue-dir))
dc7ce8219431 (smtpmail-send-it): Don't use : in filenames
Simon Josefsson <jas@extundo.com>
parents: 47396
diff changeset
388 (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
389 (file-elisp (concat file-data ".el"))
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
390 (buffer-data (create-file-buffer file-data))
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
391 (buffer-elisp (create-file-buffer file-elisp))
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
392 (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
393 (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
394 (make-directory smtpmail-queue-dir t))
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
395 (with-current-buffer buffer-data
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
396 (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
397 (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
398 (insert-buffer-substring tembuf)
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
399 (write-file file-data)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
400 (set-buffer buffer-elisp)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
401 (erase-buffer)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
402 (insert (concat
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
403 "(setq smtpmail-recipient-address-list '"
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
404 (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
405 ")\n"))
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
406 (write-file file-elisp)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
407 (set-buffer (generate-new-buffer buffer-scratch))
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
408 (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
409 (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
410 (point-max)
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
411 smtpmail-queue-index)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
412 )
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
413 (kill-buffer buffer-scratch)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
414 (kill-buffer buffer-data)
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
415 (kill-buffer buffer-elisp))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
416 (kill-buffer tembuf)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
417 (if (bufferp errbuf)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
418 (kill-buffer errbuf)))))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
419
48419
03ac1463ec5e (smtpmail-send-queued-mail): Add autoload cookie.
Juanma Barranquero <lekktu@gmail.com>
parents: 47837
diff changeset
420 ;;;###autoload
18094
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
421 (defun smtpmail-send-queued-mail ()
54cf1b43247b Include time-stamp.
Richard M. Stallman <rms@gnu.org>
parents: 18092
diff changeset
422 "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
423 (interactive)
42225
8ef1ae58dc29 (smtpmail-send-queued-mail): Use
Eli Zaretskii <eliz@gnu.org>
parents: 41921
diff changeset
424 (with-temp-buffer
8ef1ae58dc29 (smtpmail-send-queued-mail): Use
Eli Zaretskii <eliz@gnu.org>
parents: 41921
diff changeset
425 ;;; Get index, get first mail, send it, update index, get second
8ef1ae58dc29 (smtpmail-send-queued-mail): Use
Eli Zaretskii <eliz@gnu.org>
parents: 41921
diff changeset
426 ;;; mail, send it, etc...
8ef1ae58dc29 (smtpmail-send-queued-mail): Use
Eli Zaretskii <eliz@gnu.org>
parents: 41921
diff changeset
427 (let ((file-msg ""))
8ef1ae58dc29 (smtpmail-send-queued-mail): Use
Eli Zaretskii <eliz@gnu.org>
parents: 41921
diff changeset
428 (insert-file-contents smtpmail-queue-index)
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)))
42225
8ef1ae58dc29 (smtpmail-send-queued-mail): Use
Eli Zaretskii <eliz@gnu.org>
parents: 41921
diff changeset
450 (write-region (point-min) (point-max) smtpmail-queue-index))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
451
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
452 ;(defun smtpmail-via-smtp (host,port,sender,destination,smtpmail-text-buffer)
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)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
504 (if (null (and cred (condition-case ()
62621
078b075e8984 (smtpmail-open-stream): Use with-no-warnings.
Richard M. Stallman <rms@gnu.org>
parents: 62402
diff changeset
505 (with-no-warnings
50973
7f434a265bfa (smtpmail-open-stream): Don't hard code
Simon Josefsson <jas@extundo.com>
parents: 50931
diff changeset
506 (require 'starttls)
57435
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
507 (call-process (if starttls-use-gnutls
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
508 starttls-gnutls-program
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
509 starttls-program)))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
510 (error nil))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
511 ;; The normal case.
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
512 (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
513 (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
514 (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
515 (starttls-extra-args
57435
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
516 (append
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
517 starttls-extra-args
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
518 (when (and (stringp cred-key) (stringp cred-cert)
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
519 (file-regular-p
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
520 (setq cred-key (expand-file-name cred-key)))
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
521 (file-regular-p
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
522 (setq cred-cert (expand-file-name cred-cert))))
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
523 (list "--key-file" cred-key "--cert-file" cred-cert))))
55786
a4b0f825c65a (smtpmail-open-stream): Bind
Simon Josefsson <jas@extundo.com>
parents: 54763
diff changeset
524 (starttls-extra-arguments
57435
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
525 (append
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
526 starttls-extra-arguments
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
527 (when (and (stringp cred-key) (stringp cred-cert)
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
528 (file-regular-p
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
529 (setq cred-key (expand-file-name cred-key)))
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
530 (file-regular-p
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
531 (setq cred-cert (expand-file-name cred-cert))))
2b938e7f92a5 (smtpmail-open-stream): Look for
Simon Josefsson <jas@extundo.com>
parents: 55786
diff changeset
532 (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
533 (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
534
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
535 (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
536 (let* ((mechs (cdr-safe (assoc 'auth supported-extensions)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
537 (mech (car (smtpmail-intersection smtpmail-auth-supported mechs)))
44868
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
538 (cred (if (stringp smtpmail-auth-credentials)
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
539 (let* ((netrc (netrc-parse smtpmail-auth-credentials))
53807
61abf9ce6838 (smtpmail-try-auth-methods): Pass port-name as defaultport to `netrc-machine'.
Sam Steingold <sds@gnu.org>
parents: 53641
diff changeset
540 (port-name (format "%s" (or port "smtp")))
61abf9ce6838 (smtpmail-try-auth-methods): Pass port-name as defaultport to `netrc-machine'.
Sam Steingold <sds@gnu.org>
parents: 53641
diff changeset
541 (hostentry (netrc-machine netrc host port-name
61abf9ce6838 (smtpmail-try-auth-methods): Pass port-name as defaultport to `netrc-machine'.
Sam Steingold <sds@gnu.org>
parents: 53641
diff changeset
542 port-name)))
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
543 (when hostentry
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
544 (list host port
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
545 (netrc-get hostentry "login")
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
546 (netrc-get hostentry "password"))))
44868
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
547 (smtpmail-find-credentials
53919
095e499a14ad (smtpmail-try-auth-methods): Fix typo.
John Paul Wallington <jpw@pobox.com>
parents: 53807
diff changeset
548 smtpmail-auth-credentials host port)))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
549 (passwd (when cred
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
550 (or (smtpmail-cred-passwd cred)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
551 (read-passwd
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
552 (format "SMTP password for %s:%s: "
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
553 (smtpmail-cred-server cred)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
554 (smtpmail-cred-port cred))))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
555 ret)
53807
61abf9ce6838 (smtpmail-try-auth-methods): Pass port-name as defaultport to `netrc-machine'.
Sam Steingold <sds@gnu.org>
parents: 53641
diff changeset
556 (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
557 (cond
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
558 ((eq mech 'cram-md5)
59159
e6d896f96885 Fix last commit.
Simon Josefsson <jas@extundo.com>
parents: 59098
diff changeset
559 (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
560 (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
561 (not (integerp (car ret)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
562 (>= (car ret) 400))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
563 (throw 'done nil))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
564 (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
565 (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
566 (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
567 (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
568 (response (concat (smtpmail-cred-user cred) " " hash))
73418
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
569 ;; Osamu Yamane <yamane@green.ocn.ne.jp>:
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
570 ;; SMTP auth fails because the SMTP server identifies
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
571 ;; only the first part of the string (delimited by
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
572 ;; new line characters) as a response from the
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
573 ;; client, and the rest as distinct commands.
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
574
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
575 ;; In my case, the response string is 80 characters
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
576 ;; long. Without the no-line-break option for
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
577 ;; base64-encode-sting, only the first 76 characters
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
578 ;; are taken as a response to the server, and the
6018dbb5896c Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 73215
diff changeset
579 ;; authentication fails.
73148
6887b498642b * mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long
Chong Yidong <cyd@stupidchicken.com>
parents: 72671
diff changeset
580 (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
581 (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
582 (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
583 (not (integerp (car ret)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
584 (>= (car ret) 400))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
585 (throw 'done nil)))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
586 ((eq mech 'login)
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 "AUTH LOGIN")
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 (smtpmail-send-command
73215
32b78c90379a 2006-10-02 MIYOSHI Masanori <miyoshi@meadowy.org> (tiny change)
Simon Josefsson <jas@extundo.com>
parents: 73148
diff changeset
593 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
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))
73148
6887b498642b * mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long
Chong Yidong <cyd@stupidchicken.com>
parents: 72671
diff changeset
598 (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
599 (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
600 (not (integerp (car ret)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
601 (>= (car ret) 400))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
602 (throw 'done nil)))
64414
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
603 ((eq mech 'plain)
68117
340b01243a62 Add comment describing AUTH PLAIN fix.
Simon Josefsson <jas@extundo.com>
parents: 67873
diff changeset
604 ;; 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
605 ;; 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
606 ;; 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
607 ;; 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
608 ;; the EHLO response. See RFC 2554 for more info.
67873
51ca2759364a Fix AUTH PLAIN authentication.
Simon Josefsson <jas@extundo.com>
parents: 67424
diff changeset
609 (smtpmail-send-command process
51ca2759364a Fix AUTH PLAIN authentication.
Simon Josefsson <jas@extundo.com>
parents: 67424
diff changeset
610 (concat "AUTH PLAIN "
51ca2759364a Fix AUTH PLAIN authentication.
Simon Josefsson <jas@extundo.com>
parents: 67424
diff changeset
611 (base64-encode-string
64414
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
612 (concat "\0"
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
613 (smtpmail-cred-user cred)
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
614 "\0"
73148
6887b498642b * mail/smtpmail.el (smtpmail-try-auth-methods): Do not break long
Chong Yidong <cyd@stupidchicken.com>
parents: 72671
diff changeset
615 passwd) t)))
64414
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
616 (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
617 (not (integerp (car ret)))
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
618 (not (equal (car ret) 235)))
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
619 (throw 'done nil)))
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
620
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
621 (t
64414
84d21f8fafbb (smtpmail-auth-supported): Added the 'plain auth method
Simon Josefsson <jas@extundo.com>
parents: 64085
diff changeset
622 (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
623 ;; Remember the password.
44868
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
624 (when (and (not (stringp smtpmail-auth-credentials))
865b7fdda4bb (smtpmail-auth-credentials): Support netrc files as well.
Richard M. Stallman <rms@gnu.org>
parents: 44864
diff changeset
625 (null (smtpmail-cred-passwd cred)))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
626 (setcar (cdr (cdr (cdr cred))) passwd)))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
627
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
628 (defun smtpmail-via-smtp (recipient smtpmail-text-buffer)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
629 (let ((process nil)
23142
98c430cac424 (smtpmail-send-it): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents: 22037
diff changeset
630 (host (or smtpmail-smtp-server
98c430cac424 (smtpmail-send-it): Add autoload cookie.
Karl Heuer <kwzh@gnu.org>
parents: 22037
diff changeset
631 (error "`smtpmail-smtp-server' not defined")))
15346
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
632 (port smtpmail-smtp-service)
52347
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
633 ;; smtpmail-mail-address should be set to the appropriate
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
634 ;; buffer-local value by the caller, but in case not:
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
635 (envelope-from (or smtpmail-mail-address
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
636 (and mail-specify-envelope-from
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
637 (mail-envelope-from))
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
638 user-mail-address))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
639 response-code
15346
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
640 greeting
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
641 process-buffer
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
642 (supported-extensions '()))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
643 (unwind-protect
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
644 (catch 'done
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
645 ;; get or create the trace buffer
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
646 (setq process-buffer
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
647 (get-buffer-create (format "*trace of SMTP session to %s*" host)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
648
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
649 ;; clear the trace buffer of old output
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
650 (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
651 (setq buffer-undo-list t)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
652 (erase-buffer))
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 ;; 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
655 (setq process (smtpmail-open-stream process-buffer host port))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
656 (and (null process) (throw 'done nil))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
657
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
658 ;; set the send-filter
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
659 (set-process-filter process 'smtpmail-process-filter)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
660
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
661 (with-current-buffer process-buffer
22037
cb95bfcd442a (smtpmail-via-smtp): Speciy process coding system.
Richard M. Stallman <rms@gnu.org>
parents: 21862
diff changeset
662 (set-buffer-process-coding-system 'raw-text-unix 'raw-text-unix)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
663 (make-local-variable 'smtpmail-read-point)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
664 (setq smtpmail-read-point (point-min))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
665
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
666
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
667 (if (or (null (car (setq greeting (smtpmail-read-response process))))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
668 (not (integerp (car greeting)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
669 (>= (car greeting) 400))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
670 (throw 'done nil)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
671 )
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
672
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
673 (let ((do-ehlo t)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
674 (do-starttls t))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
675 (while do-ehlo
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
676 ;; EHLO
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
677 (smtpmail-send-command process (format "EHLO %s" (smtpmail-fqdn)))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
678
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
679 (if (or (null (car (setq response-code
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
680 (smtpmail-read-response process))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
681 (not (integerp (car response-code)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
682 (>= (car response-code) 400))
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
683 (progn
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
684 ;; HELO
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
685 (smtpmail-send-command
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
686 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
687
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
688 (if (or (null (car (setq response-code
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
689 (smtpmail-read-response process))))
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
690 (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
691 (>= (car response-code) 400))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
692 (throw 'done nil)))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
693 (dolist (line (cdr (cdr response-code)))
76942
3c8672cf3035 (smtpmail-via-smtp): Use ascii-case-table when downcasing.
Chong Yidong <cyd@stupidchicken.com>
parents: 76908
diff changeset
694 (let ((name
3c8672cf3035 (smtpmail-via-smtp): Use ascii-case-table when downcasing.
Chong Yidong <cyd@stupidchicken.com>
parents: 76908
diff changeset
695 (with-case-table ascii-case-table
3c8672cf3035 (smtpmail-via-smtp): Use ascii-case-table when downcasing.
Chong Yidong <cyd@stupidchicken.com>
parents: 76908
diff changeset
696 (mapcar (lambda (s) (intern (downcase s)))
3c8672cf3035 (smtpmail-via-smtp): Use ascii-case-table when downcasing.
Chong Yidong <cyd@stupidchicken.com>
parents: 76908
diff changeset
697 (split-string (substring line 4) "[ ]")))))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
698 (and (eq (length name) 1)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
699 (setq name (car name)))
76908
714d51db2c25 (smtpmail-via-smtp): Fix indentation.
Eli Zaretskii <eliz@gnu.org>
parents: 76902
diff changeset
700 (and name
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
701 (cond ((memq (if (consp name) (car name) name)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
702 '(verb xvrb 8bitmime onex xone
76908
714d51db2c25 (smtpmail-via-smtp): Fix indentation.
Eli Zaretskii <eliz@gnu.org>
parents: 76902
diff changeset
703 expn size dsn etrn
714d51db2c25 (smtpmail-via-smtp): Fix indentation.
Eli Zaretskii <eliz@gnu.org>
parents: 76902
diff changeset
704 enhancedstatuscodes
714d51db2c25 (smtpmail-via-smtp): Fix indentation.
Eli Zaretskii <eliz@gnu.org>
parents: 76902
diff changeset
705 help xusr
714d51db2c25 (smtpmail-via-smtp): Fix indentation.
Eli Zaretskii <eliz@gnu.org>
parents: 76902
diff changeset
706 auth=login auth starttls))
714d51db2c25 (smtpmail-via-smtp): Fix indentation.
Eli Zaretskii <eliz@gnu.org>
parents: 76902
diff changeset
707 (setq supported-extensions
714d51db2c25 (smtpmail-via-smtp): Fix indentation.
Eli Zaretskii <eliz@gnu.org>
parents: 76902
diff changeset
708 (cons name supported-extensions)))
714d51db2c25 (smtpmail-via-smtp): Fix indentation.
Eli Zaretskii <eliz@gnu.org>
parents: 76902
diff changeset
709 (smtpmail-warn-about-unknown-extensions
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
710 (message "Unknown extension %s" name)))))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
711
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
712 (if (and do-starttls
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
713 (smtpmail-find-credentials smtpmail-starttls-credentials host port)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
714 (member 'starttls supported-extensions)
47672
666b84b52b82 (smtpmail-via-smtp): Only negotiate starttls on
Simon Josefsson <jas@extundo.com>
parents: 47436
diff changeset
715 (numberp (process-id process)))
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
716 (progn
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
717 (smtpmail-send-command process (format "STARTTLS"))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
718 (if (or (null (car (setq response-code (smtpmail-read-response process))))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
719 (not (integerp (car response-code)))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
720 (>= (car response-code) 400))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
721 (throw 'done nil))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
722 (starttls-negotiate process)
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
723 (setq do-starttls nil))
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
724 (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
725
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
726 (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
727
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
728 (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
729 (member 'xone supported-extensions))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
730 (progn
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
731 (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
732 (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
733 (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
734 (>= (car response-code) 400))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
735 (throw 'done nil))))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
736
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
737 (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
738 (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
739 (member 'xvrb supported-extensions)))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
740 (progn
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
741 (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
742 (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
743 (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
744 (>= (car response-code) 400))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
745 (throw 'done nil))))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
746
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
747 (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
748 (progn
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
749 (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
750 (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
751 (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
752 (>= (car response-code) 400))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
753 (throw 'done nil))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
754
52642
79320037f627 (smtpmail-via-smtp): Don't insert a space
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
755 ;; MAIL FROM:<sender>
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
756 (let ((size-part
41221
b6fd3363a398 (smtpmail-cred-server, smtpmail-cred-port, smtpmail-cred-key)
Richard M. Stallman <rms@gnu.org>
parents: 40033
diff changeset
757 (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
758 (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
759 (format " SIZE=%d"
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
760 (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
761 ;; size estimate:
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
762 (+ (- (point-max) (point-min))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
763 ;; 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
764 ;; because of CR-LF representation:
e33121530d13 Jesper Harder <harder@ifa.au.dk>
Glenn Morris <rgm@gnu.org>
parents: 53619
diff changeset
765 (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
766 ""))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
767 (body-part
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
768 (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
769 ;; FIXME:
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
770 ;; 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
771 ;; 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
772 ;; 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
773 ;; 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
774 ;; 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
775 ;; 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
776 ;; 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
777 ;; 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
778 ;; 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
779 ;; 8BITMIME.
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
780 (if nil
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
781 " BODY=8BITMIME"
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
782 "")
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
783 "")))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
784 ; (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
785 (smtpmail-send-command process (format "MAIL FROM:<%s>%s%s"
52347
f38d6d97ed00 Fix previous change:
Glenn Morris <rgm@gnu.org>
parents: 52321
diff changeset
786 envelope-from
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
787 size-part
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
788 body-part))
49598
0d8b17d428b5 Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 48846
diff changeset
789
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
790 (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
791 (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
792 (>= (car response-code) 400))
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
793 (throw 'done nil)
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
794 ))
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
795
52642
79320037f627 (smtpmail-via-smtp): Don't insert a space
Eli Zaretskii <eliz@gnu.org>
parents: 52401
diff changeset
796 ;; RCPT TO:<recipient>
15346
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
797 (let ((n 0))
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
798 (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
799 (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
800 (setq n (1+ n))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
801
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
802 (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
803 (if (or (null (car response-code))
15346
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
804 (not (integerp (car response-code)))
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
805 (>= (car response-code) 400))
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
806 (throw 'done nil)
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
807 )
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
808 ))
44883
7d867b33aa2d (smtpmail-try-auth-methods): host is not in the authinfo/netrc => cred=nil.
Sam Steingold <sds@gnu.org>
parents: 44868
diff changeset
809
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
810 ;; DATA
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
811 (smtpmail-send-command process "DATA")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
812
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
813 (if (or (null (car (setq response-code (smtpmail-read-response process))))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
814 (not (integerp (car response-code)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
815 (>= (car response-code) 400))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
816 (throw 'done nil)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
817 )
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
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
822 ;;DATA end "."
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))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
828 (throw 'done nil)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
829 )
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
830
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
831 ;;QUIT
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
832 ; (smtpmail-send-command process "QUIT")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
833 ; (and (null (car (smtpmail-read-response process)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
834 ; (throw 'done nil))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
835 t ))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
836 (if process
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
837 (with-current-buffer (process-buffer process)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
838 (smtpmail-send-command process "QUIT")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
839 (smtpmail-read-response process)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
840
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
841 ; (if (or (null (car (setq response-code (smtpmail-read-response process))))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
842 ; (not (integerp (car response-code)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
843 ; (>= (car response-code) 400))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
844 ; (throw 'done nil)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
845 ; )
47117
c6c0e4cc9d0a (smtpmail-via-smtp): Delete process buffer
Simon Josefsson <jas@extundo.com>
parents: 45252
diff changeset
846 (delete-process process)
c6c0e4cc9d0a (smtpmail-via-smtp): Delete process buffer
Simon Josefsson <jas@extundo.com>
parents: 45252
diff changeset
847 (unless smtpmail-debug-info
c6c0e4cc9d0a (smtpmail-via-smtp): Delete process buffer
Simon Josefsson <jas@extundo.com>
parents: 45252
diff changeset
848 (kill-buffer process-buffer)))))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
849
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
850
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
851 (defun smtpmail-process-filter (process output)
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
852 (with-current-buffer (process-buffer process)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
853 (goto-char (point-max))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
854 (insert output)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
855
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
856 (defun smtpmail-read-response (process)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
857 (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
858 (response-strings nil)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
859 (response-continue t)
18092
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
860 (return-value '(nil ()))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
861 match-end)
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
862 (catch 'done
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
863 (while response-continue
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
864 (goto-char smtpmail-read-point)
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
865 (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
866 (unless (memq (process-status process) '(open run))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
867 (throw 'done nil))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
868 (accept-process-output process)
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
869 (goto-char smtpmail-read-point))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
870
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
871 (setq match-end (point))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
872 (setq response-strings
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
873 (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
874 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
875
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
876 (goto-char smtpmail-read-point)
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
877 (if (looking-at "[0-9]+ ")
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
878 (let ((begin (match-beginning 0))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
879 (end (match-end 0)))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
880 (if smtpmail-debug-info
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
881 (message "%s" (car response-strings)))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
882
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
883 (setq smtpmail-read-point match-end)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
884
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
885 ;; ignore lines that start with "0"
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
886 (if (looking-at "0[0-9]+ ")
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
887 nil
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
888 (setq response-continue nil)
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
889 (setq return-value
62402
a7e02ef1e3d6 Replace `string-to-int' by `string-to-number'.
Juanma Barranquero <lekktu@gmail.com>
parents: 59996
diff changeset
890 (cons (string-to-number
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
891 (buffer-substring begin end))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
892 (nreverse response-strings)))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
893
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
894 (if (looking-at "[0-9]+-")
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
895 (progn (if smtpmail-debug-info
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
896 (message "%s" (car response-strings)))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
897 (setq smtpmail-read-point match-end)
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
898 (setq response-continue t))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
899 (progn
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
900 (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
901 (setq response-continue nil)
8428d56cd207 (smtpmail-via-smtp): Recognize XVRB as a synonym for
Richard M. Stallman <rms@gnu.org>
parents: 17517
diff changeset
902 (setq return-value
54350
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
903 (cons nil (nreverse response-strings)))))))
e7ea873f6f2e (smtpmail-read-response): Abort if process has
Simon Josefsson <jas@extundo.com>
parents: 53919
diff changeset
904 (setq smtpmail-read-point match-end))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
905 return-value))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
906
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
907
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
908 (defun smtpmail-send-command (process command)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
909 (goto-char (point-max))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
910 (if (= (aref command 0) ?P)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
911 (insert "PASS <omitted>\r\n")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
912 (insert command "\r\n"))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
913 (setq smtpmail-read-point (point))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
914 (process-send-string process command)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
915 (process-send-string process "\r\n"))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
916
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
917 (defun smtpmail-send-data-1 (process data)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
918 (goto-char (point-max))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
919
24773
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
920 (if (and (multibyte-string-p data)
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
921 smtpmail-code-conv-from)
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
922 (setq data (string-as-multibyte
424bc3b2a6ef (smtpmail-send-it): Bind
Kenichi Handa <handa@m17n.org>
parents: 24663
diff changeset
923 (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
924
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
925 (if smtpmail-debug-info
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
926 (insert data "\r\n"))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
927
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
928 (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
929 ;; 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
930 (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
931 (process-send-string process "."))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
932 (process-send-string process data)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
933 (process-send-string process "\r\n")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
934 )
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
935
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
936 (defun smtpmail-send-data (process buffer)
53619
f69d407a9996 Jesper Harder <harder@ifa.au.dk>
Glenn Morris <rgm@gnu.org>
parents: 52642
diff changeset
937 (let ((data-continue t) sending-data)
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
938 (with-current-buffer buffer
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
939 (goto-char (point-min)))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
940 (while data-continue
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
941 (with-current-buffer buffer
53619
f69d407a9996 Jesper Harder <harder@ifa.au.dk>
Glenn Morris <rgm@gnu.org>
parents: 52642
diff changeset
942 (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
943 (end-of-line 2)
f69d407a9996 Jesper Harder <harder@ifa.au.dk>
Glenn Morris <rgm@gnu.org>
parents: 52642
diff changeset
944 (setq data-continue (not (eobp))))
f69d407a9996 Jesper Harder <harder@ifa.au.dk>
Glenn Morris <rgm@gnu.org>
parents: 52642
diff changeset
945 (smtpmail-send-data-1 process sending-data))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
946
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
947 (defun smtpmail-deduce-address-list (smtpmail-text-buffer header-start header-end)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
948 "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
949 (unwind-protect
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
950 (with-current-buffer smtpmail-address-buffer
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
951 (erase-buffer)
24663
39edc9c7b235 (smtpmail-deduce-address-list): Bind variables
Andrew Innes <andrewi@gnu.org>
parents: 24455
diff changeset
952 (let
39edc9c7b235 (smtpmail-deduce-address-list): Bind variables
Andrew Innes <andrewi@gnu.org>
parents: 24455
diff changeset
953 ((case-fold-search t)
39edc9c7b235 (smtpmail-deduce-address-list): Bind variables
Andrew Innes <andrewi@gnu.org>
parents: 24455
diff changeset
954 (simple-address-list "")
39edc9c7b235 (smtpmail-deduce-address-list): Bind variables
Andrew Innes <andrewi@gnu.org>
parents: 24455
diff changeset
955 this-line
39edc9c7b235 (smtpmail-deduce-address-list): Bind variables
Andrew Innes <andrewi@gnu.org>
parents: 24455
diff changeset
956 this-line-end
39edc9c7b235 (smtpmail-deduce-address-list): Bind variables
Andrew Innes <andrewi@gnu.org>
parents: 24455
diff changeset
957 addr-regexp)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
958 (insert-buffer-substring smtpmail-text-buffer header-start header-end)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
959 (goto-char (point-min))
15648
2feeabc94834 (smtpmail-deduce-address-list): Handle RESENT-* fields.
Karl Heuer <kwzh@gnu.org>
parents: 15595
diff changeset
960 ;; 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
961 (save-excursion
41716
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
962 (setq addr-regexp
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
963 (if (re-search-forward "^Resent-\\(to\\|cc\\|bcc\\):"
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
964 header-end t)
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
965 "^Resent-\\(to\\|cc\\|bcc\\):"
e467d0e8f243 Use with-current-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 41497
diff changeset
966 "^\\(To:\\|Cc:\\|Bcc:\\)")))
15648
2feeabc94834 (smtpmail-deduce-address-list): Handle RESENT-* fields.
Karl Heuer <kwzh@gnu.org>
parents: 15595
diff changeset
967
2feeabc94834 (smtpmail-deduce-address-list): Handle RESENT-* fields.
Karl Heuer <kwzh@gnu.org>
parents: 15595
diff changeset
968 (while (re-search-forward addr-regexp header-end t)
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
969 (replace-match "")
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
970 (setq this-line (match-beginning 0))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
971 (forward-line 1)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
972 ;; get any continuation lines
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
973 (while (and (looking-at "^[ \t]+") (< (point) header-end))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
974 (forward-line 1))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
975 (setq this-line-end (point-marker))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
976 (setq simple-address-list
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
977 (concat simple-address-list " "
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
978 (mail-strip-quoted-names (buffer-substring this-line this-line-end))))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
979 )
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
980 (erase-buffer)
41497
608d7b92d289 Simplify previous change.
Richard M. Stallman <rms@gnu.org>
parents: 41492
diff changeset
981 (insert " " simple-address-list "\n")
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
982 (subst-char-in-region (point-min) (point-max) 10 ? t);; newline --> blank
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
983 (subst-char-in-region (point-min) (point-max) ?, ? t);; comma --> blank
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
984 (subst-char-in-region (point-min) (point-max) 9 ? t);; tab --> blank
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
985
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
986 (goto-char (point-min))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
987 ;; tidyness in case hook is not robust when it looks at this
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
988 (while (re-search-forward "[ \t]+" header-end t) (replace-match " "))
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
989
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
990 (goto-char (point-min))
15346
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
991 (let (recipient-address-list)
15451
89c1e7fe879a (smtpmail-smtp-service): Use port 25 as default.
Richard M. Stallman <rms@gnu.org>
parents: 15372
diff changeset
992 (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
993 (backward-char 1)
15451
89c1e7fe879a (smtpmail-smtp-service): Use port 25 as default.
Richard M. Stallman <rms@gnu.org>
parents: 15372
diff changeset
994 (setq recipient-address-list (cons (buffer-substring (match-beginning 1) (match-end 1))
89c1e7fe879a (smtpmail-smtp-service): Use port 25 as default.
Richard M. Stallman <rms@gnu.org>
parents: 15372
diff changeset
995 recipient-address-list))
15346
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
996 )
4cd6ff2384dc (smtpmail-send-it): Fix error messages.
Richard M. Stallman <rms@gnu.org>
parents: 15345
diff changeset
997 (setq smtpmail-recipient-address-list recipient-address-list))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
998
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
999 )
24663
39edc9c7b235 (smtpmail-deduce-address-list): Bind variables
Andrew Innes <andrewi@gnu.org>
parents: 24455
diff changeset
1000 )
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1001 )
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1002 )
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1003
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1004
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1005 (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
1006 "Delete [Resent-]BCC: and their continuation lines from the header area.
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1007 There may be multiple BCC: lines, and each may have arbitrarily
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1008 many continuation lines."
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1009 (let ((case-fold-search t))
24455
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1010 (save-excursion
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1011 (goto-char (point-min))
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1012 ;; iterate over all BCC: lines
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1013 (while (re-search-forward "^\\(RESENT-\\)?BCC:" header-end t)
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1014 (delete-region (match-beginning 0)
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1015 (progn (forward-line 1) (point)))
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1016 ;; get rid of any continuation lines
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1017 (while (and (looking-at "^[ \t].*\n") (< (point) header-end))
013e22e5d30c (smtpmail-do-bcc): Fix regexp.
Karl Heuer <kwzh@gnu.org>
parents: 23444
diff changeset
1018 (replace-match ""))))))
15345
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1019
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1020
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1021 (provide 'smtpmail)
4eef6c1687f8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1022
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52347
diff changeset
1023 ;;; arch-tag: a76992df-6d71-43b7-9e72-4bacc6c05466
17517
8f952e921136 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 17436
diff changeset
1024 ;;; smtpmail.el ends here