From: Sam Steingold Date: Wed, 4 Feb 2004 15:35:11 +0000 (+0000) Subject: (smtpmail-try-auth-methods): Pass port-name as defaultport to `netrc-machine'. X-Git-Tag: ttn-vms-21-2-B4~7750 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dbfa9ed49fe7fbe53fd45df861e7a86f171bf2fd;p=emacs.git (smtpmail-try-auth-methods): Pass port-name as defaultport to `netrc-machine'. Do not try authentication when no mechanism is available. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf8051e7c76..95a92f77e9f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2004-02-04 Sam Steingold + + * 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 * iswitchb.el (iswitchb-minibuffer-setup-hook): Update doc string diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index bd9d5d7dd39..1730d131f60 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -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))