Commit dbfa9ed4 authored by Sam Steingold's avatar Sam Steingold
Browse files

(smtpmail-try-auth-methods): Pass port-name as defaultport to `netrc-machine'.

Do not try authentication when no mechanism is available.
parent 12ad758a
2004-02-04 Sam Steingold <sds@gnu.org>
* mail/smtpmail.el (smtpmail-try-auth-methods):
Do not try authentication when no mechanism is available.
Pass port-name as defaultport to `netrc-machine'.
2004-02-04 Stephen Eglen <stephen@gnu.org>
* iswitchb.el (iswitchb-minibuffer-setup-hook): Update doc string
......
......@@ -488,15 +488,15 @@ This is relative to `smtpmail-queue-dir'.")
(mech (car (smtpmail-intersection smtpmail-auth-supported mechs)))
(cred (if (stringp smtpmail-auth-credentials)
(let* ((netrc (netrc-parse smtpmail-auth-credentials))
(hostentry (netrc-machine
netrc host (format "%s" (or port "smtp"))
"smtp")))
(port-name (format "%s" (or port "smtp")))
(hostentry (netrc-machine netrc host port-name
port-name)))
(when hostentry
(list host port
(netrc-get hostentry "login")
(netrc-get hostentry "password"))))
(smtpmail-find-credentials
smtpmail-auth-credentials host port)))
smtpmail-auth-credentiaals host port)))
(passwd (when cred
(or (smtpmail-cred-passwd cred)
(read-passwd
......@@ -504,7 +504,7 @@ This is relative to `smtpmail-queue-dir'.")
(smtpmail-cred-server cred)
(smtpmail-cred-port cred))))))
ret)
(when cred
(when (and cred mech)
(cond
((eq mech 'cram-md5)
(smtpmail-send-command process (format "AUTH %s" mech))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment