From: Simon Josefsson <jas@extundo.com>
Date: Mon, 11 Oct 2004 18:42:18 +0000 (+0000)
Subject: (smtpmail-open-stream): Look for
X-Git-Tag: ttn-vms-21-2-B4~4625
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/e8620cb6ee95b0649794ce977d65d1fb6b5d136a?ds=sidebyside

(smtpmail-open-stream): Look for
starttls-gnutls-program instead of starttls-program iff
starttls-use-gnutls is non-nil.
(smtpmail-open-stream): Don't overwrite user settings of
starttls-extra-arguments and starttls-extra-args.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 267307ed39..c050e2cd68 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-11  Simon Josefsson  <jas@extundo.com>
+
+	* mail/smtpmail.el (smtpmail-open-stream): Look for
+	starttls-gnutls-program instead of starttls-program iff
+	starttls-use-gnutls is non-nil.
+	(smtpmail-open-stream): Don't overwrite user settings of
+	starttls-extra-arguments and starttls-extra-args.
+
 2004-10-10  Kai Grossjohann  <kai.grossjohann@gmx.net>
 
 	* net/ange-ftp.el (ange-ftp-remote-shell): Remove variable.
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 84a6135014..d356979ea2 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -471,26 +471,32 @@ This is relative to `smtpmail-queue-dir'.")
     (if (null (and cred (condition-case ()
 			    (progn
 			      (require 'starttls)
-			      (call-process starttls-program))
+			      (call-process (if starttls-use-gnutls
+						starttls-gnutls-program
+					      starttls-program)))
 			  (error nil))))
 	;; The normal case.
 	(open-network-stream "SMTP" process-buffer host port)
       (let* ((cred-key (smtpmail-cred-key cred))
 	     (cred-cert (smtpmail-cred-cert cred))
 	     (starttls-extra-args
-	      (when (and (stringp cred-key) (stringp cred-cert)
-			 (file-regular-p
-			  (setq cred-key (expand-file-name cred-key)))
-			 (file-regular-p
-			  (setq cred-cert (expand-file-name cred-cert))))
-		(list "--key-file" cred-key "--cert-file" cred-cert)))
+	      (append
+	       starttls-extra-args
+	       (when (and (stringp cred-key) (stringp cred-cert)
+			  (file-regular-p
+			   (setq cred-key (expand-file-name cred-key)))
+			  (file-regular-p
+			   (setq cred-cert (expand-file-name cred-cert))))
+		 (list "--key-file" cred-key "--cert-file" cred-cert))))
 	     (starttls-extra-arguments
-	      (when (and (stringp cred-key) (stringp cred-cert)
-			 (file-regular-p
-			  (setq cred-key (expand-file-name cred-key)))
-			 (file-regular-p
-			  (setq cred-cert (expand-file-name cred-cert))))
-		(list "--x509keyfile" cred-key "--x509certfile" cred-cert))))
+	      (append
+	       starttls-extra-arguments
+	       (when (and (stringp cred-key) (stringp cred-cert)
+			  (file-regular-p
+			   (setq cred-key (expand-file-name cred-key)))
+			  (file-regular-p
+			   (setq cred-cert (expand-file-name cred-cert))))
+		 (list "--x509keyfile" cred-key "--x509certfile" cred-cert)))))
 	(starttls-open-stream "SMTP" process-buffer host port)))))
 
 (defun smtpmail-try-auth-methods (process supported-extensions host port)