Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.13703
diff -c -r1.13703 ChangeLog
*** ChangeLog	9 May 2008 20:17:48 -0000	1.13703
--- ChangeLog	9 May 2008 21:11:59 -0000
***************
*** 1,3 ****
--- 1,9 ----
+ 2008-05-09  Teodor Zlatanov  <address@hidden>
+ 
+ 	* mail/smtpmail.el: Add autoload for
+ 	`auth-source-user-or-password'.
+ 	(smtpmail-try-auth-methods): Use it.
+ 
  2008-05-09  Eric S. Raymond  <address@hidden>
  
  	* vc.el (vc-dir), vc-hooks.el: Tweak the VC directory bindings.
Index: mail/smtpmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/smtpmail.el,v
retrieving revision 1.103
diff -c -r1.103 smtpmail.el
*** mail/smtpmail.el	6 May 2008 07:22:29 -0000	1.103
--- mail/smtpmail.el	9 May 2008 21:11:59 -0000
***************
*** 78,83 ****
--- 78,86 ----
  (autoload 'netrc-get "netrc")
  (autoload 'password-read "password-cache")
  
+ (eval-and-compile
+   (autoload 'auth-source-user-or-password "auth-source"))
+ 
  ;;;
  (defgroup smtpmail nil
    "SMTP protocol for sending mail."
***************
*** 539,555 ****
  (defun smtpmail-try-auth-methods (process supported-extensions host port)
    (let* ((mechs (cdr-safe (assoc 'auth supported-extensions)))
  	 (mech (car (smtpmail-intersection smtpmail-auth-supported mechs)))
! 	 (cred (if (stringp smtpmail-auth-credentials)
! 		   (let* ((netrc (netrc-parse smtpmail-auth-credentials))
!                           (port-name (format "%s" (or port "smtp")))
! 			  (hostentry (netrc-machine netrc host port-name
!                                                     port-name)))
!                      (when hostentry
!                        (list host port
!                              (netrc-get hostentry "login")
!                              (netrc-get hostentry "password"))))
! 		 (smtpmail-find-credentials
! 		  smtpmail-auth-credentials host port)))
  	 (prompt (when cred (format "SMTP password for %s:%s: "
  				    (smtpmail-cred-server cred)
  				    (smtpmail-cred-port cred))))
--- 542,567 ----
  (defun smtpmail-try-auth-methods (process supported-extensions host port)
    (let* ((mechs (cdr-safe (assoc 'auth supported-extensions)))
  	 (mech (car (smtpmail-intersection smtpmail-auth-supported mechs)))
! 	 (auth-user (auth-source-user-or-password 
! 		     "login" host (or port "smtp")))
! 	 (auth-pass (auth-source-user-or-password 
! 		     "password" host (or port "smtp")))
! 	 (cred (if (and auth-user auth-pass) ; try user-auth-* before netrc-*
! 		   (list host port auth-user auth-pass)
! 		 ;; else, if auth-source didn't return them...
! 		 (if (stringp smtpmail-auth-credentials)
! 		     (let* ((netrc (netrc-parse smtpmail-auth-credentials))
! 			    (port-name (format "%s" (or port "smtp")))
! 			    (hostentry (netrc-machine netrc host port-name
! 						      port-name)))
! 		       (when hostentry
! 			 (list host port
! 			       (netrc-get hostentry "login")
! 			       (netrc-get hostentry "password"))))
! 		   ;; else, try smtpmail-find-credentials since
! 		   ;; smtpmail-auth-credentials is not a string
! 		   (smtpmail-find-credentials
! 		    smtpmail-auth-credentials host port))))
  	 (prompt (when cred (format "SMTP password for %s:%s: "
  				    (smtpmail-cred-server cred)
  				    (smtpmail-cred-port cred))))