From e45e5c632e5bfc6e214048f4b87ab76ae79adf56 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 24 Jun 2017 19:51:19 -0700
Subject: [PATCH] add envelope_from option so a valid user can be set

---
 Debbugs/Config.pm | 9 +++++++++
 Debbugs/Mail.pm   | 7 +++++--
 debian/changelog  | 2 ++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index c40b74d..2266460 100644
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -877,6 +877,15 @@ Default arguments to pass to sendmail. Defaults to C<qw(-oem -oi)>.
 
 set_default(\%config,'sendmail_arguments',[qw(-oem -oi)]);
 
+=item envelope_from
+
+Envelope from to use for sent messages. If not set, whatever sendmail picks is
+used.
+
+=cut
+
+set_default(\%config,'envelope_from',undef);
+
 =item spam_scan
 
 Whether or not spamscan is being used; defaults to 0 (not being used
diff --git a/Debbugs/Mail.pm b/Debbugs/Mail.pm
index 01ae327..0a227b6 100644
--- a/Debbugs/Mail.pm
+++ b/Debbugs/Mail.pm
@@ -334,7 +334,7 @@ sub send_mail_message{
 					 message              => {type => SCALAR,
 								 },
 					 envelope_from        => {type => SCALAR,
-								  optional => 1,
+								  default => $config{envelope_from},
 								 },
 					 recipients           => {type => ARRAYREF|UNDEF,
 								  optional => 1,
@@ -342,7 +342,10 @@ sub send_mail_message{
 					},
 			      );
      my @sendmail_arguments = @{$param{sendmail_arguments}};
-     push @sendmail_arguments, '-f', $param{envelope_from} if exists $param{envelope_from};
+     push @sendmail_arguments, '-f', $param{envelope_from} if
+	 exists $param{envelope_from} and
+	 defined $param{envelope_from} and
+	 length $param{envelope_from};
 
      my @recipients;
      @recipients = @{$param{recipients}} if defined $param{recipients} and
diff --git a/debian/changelog b/debian/changelog
index 7a6fb5f..05a7e7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,8 @@ debbugs (2.6.0~exp1) UNRELEASED; urgency=low
   * Pluralize singular tag and usertag in pseudoheaders (Closes: #861234).
     Thanks to James Clarke
   * Include link to the location of the debbugs source (Closes: #721569).
+  * Add envelope_from configuration variable so sites can set a valid return
+    path if the sendmail default is wrong. (Closes: #719205)
 
   [ Niels Thykier ]
   * quitcgi() now returns 400/500 status codes instead of 200 (Closes: #584922)
-- 
2.39.2