Allow the default sendmail options to be specified in the config file;

don't use -obq by default anymore.

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index eabb24eb4f13cc036e208b03812da1b4089b9c74..ae4c04fcc4ef6f09d51c967e091dca177ba0656f 100644 (file)
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -61,7 +61,7 @@ BEGIN {
                                 qw($gVersionTimeIndex),
                                 qw($gSimpleVersioning),
                                 qw($gCVETracker),
-                                qw($gSendmail $gLibPath $gSpamScan @gExcludeFromControl),
+                                qw($gSendmail @gSendmailArguments $gLibPath $gSpamScan @gExcludeFromControl),
                                 qw(%gSeverityDisplay @gTags @gSeverityList @gStrongSeverities),
                                 qw(%gTagsSingleLetter),
                                 qw(%gSearchEstraier),
@@ -849,6 +849,14 @@ Sets the sendmail binary to execute; defaults to /usr/lib/sendmail
 
 set_default(\%config,'sendmail','/usr/lib/sendmail');
 
+=item sendmail_arguments
+
+Default arguments to pass to sendmail. Defaults to C<qw(-oem -oi)>.
+
+=cut
+
+set_default(\%config,'sendmail_arguments',[qw(-oem -oi)]);
+
 =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 054b04c2bbb22ab3c92ebef1e8a3d88303e0c7f4..e9cb46e250e513d5993ee24fa21e02c0d3a278dd 100644 (file)
--- a/Debbugs/Mail.pm
+++ b/Debbugs/Mail.pm
@@ -310,7 +310,7 @@ using warn.
 sub send_mail_message{
      my %param = validate_with(params => \@_,
                               spec  => {sendmail_arguments => {type => ARRAYREF,
-                                                               default => [qw(-odq -oem -oi)],
+                                                               default => [$config{sendmail_arguments}],
                                                               },
                                         parse_for_recipients => {type => BOOLEAN,
                                                                  default => 0,
@@ -328,7 +328,7 @@ sub send_mail_message{
                                                                 },
                                        },
                              );
-     my @sendmail_arguments = qw(-odq -oem -oi);
+     my @sendmail_arguments = @{$param{sendmail_arguments}};
      push @sendmail_arguments, '-f', $param{envelope_from} if exists $param{envelope_from};
 
      my @recipients;

diff --git a/debian/changelog b/debian/changelog
index 9525c61ef1ec15ce95f4561e71d1376f90f6582e..6e0d97a3be56651cedfd4a17bc8202ba375e62ba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ debbugs (2.4.2~exp1) experimental; urgency=low
     maintainer (closes: #556863). Thanks to Yves-Alexis Perez.
   * Linkify CVE reports (closes: #568464). Thanks to Martin Zobel-Helas.
   * Fix noaffects option
+  * Allow the default sendmail options to be specified in the config file;
+    don't use -obq by default anymore.
 
  -- Don Armstrong <don@debian.org>  Wed, 26 Aug 2009 21:32:53 -0700