add envelope_from option so a valid user can be set

[debbugs.git] / Debbugs / Mail.pm

diff --git a/Debbugs/Mail.pm b/Debbugs/Mail.pm
index 01ae327798fd41e7f8c2e7125615b3c6ce456338..0a227b6aeaa944adb242047daabda85169418f17 100644 (file)
--- 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