From c1a1fd607093655de832d1bc3f2cd021792d3e75 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Fri, 6 Jul 2001 10:31:11 +0000 Subject: [PATCH] (mail-specify-envelope-from): Doc fix. (mail-envelope-from): New user option. (sendmail-send-it): Use it. --- lisp/ChangeLog | 6 ++++++ lisp/mail/sendmail.el | 19 ++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b3b86864de3..4b0ecfe26be 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2001-07-06 Simon Josefsson + + * mail/sendmail.el (mail-specify-envelope-from): Doc fix. + (mail-envelope-from): New user option. + (sendmail-send-it): Use it. + 2001-07-06 Vinicius Jose Latorre * ps-print.el: Use locale dependant date to print date in header. Doc diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index f354ddb59c5..1ff0453e62e 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -67,7 +67,8 @@ controlled by a separate variable, `mail-specify-envelope-from'." ;;;###autoload (defcustom mail-specify-envelope-from nil "*If non-nil, specify the envelope-from address when sending mail. -The value used to specify it is whatever is found in `user-mail-address'. +The value used to specify it is whatever is found in +`mail-envelope-from', with `user-mail-address' as fallback. On most systems, specifying the envelope-from address is a privileged operation." @@ -75,6 +76,14 @@ is a privileged operation." :type 'boolean :group 'sendmail) +(defcustom mail-envelope-from nil + "*If non-nil, designate the envelope-from address when sending mail. +If this is nil while `mail-specify-envelope-from' is non-nil, the +content of `user-mail-address' is used." + :version "21.1" + :type 'boolean + :group 'sendmail) + ;;;###autoload (defcustom mail-self-blind nil "\ *Non-nil means insert BCC to self in messages to be sent. @@ -801,8 +810,7 @@ external program defined by `sendmail-program'." (mailbuf (current-buffer)) (program (if (boundp 'sendmail-program) sendmail-program - "/usr/lib/sendmail")) - (originator user-mail-address)) + "/usr/lib/sendmail"))) (unwind-protect (save-excursion (set-buffer tembuf) @@ -968,8 +976,9 @@ external program defined by `sendmail-program'." (append (list (point-min) (point-max) program nil errbuf nil "-oi") - (and mail-specify-envelope-from - (list "-f" originator)) + (and mail-specify-envelope-from + (list "-f" (or mail-envelope-from + user-mail-address))) ;;; ;; Don't say "from root" if running under su. ;;; (and (equal (user-real-login-name) "root") ;;; (list "-f" (user-login-name))) -- 2.39.2