Merge branch 'pull-1351'

This closes GH-1351

lib/puppet/defaults.rb

@@ -1298,6 +1298,16 @@ def self.default_diffargs
     :smtpserver => {
         :default  => "none",
         :desc     => "The server through which to send email reports.",
+    },
+    :smtpport => {
+        :default  => 25,
+        :desc     => "The TCP port through which to send email reports.",
+    },
+    :smtphelo => {
+        :default  => Facter["fqdn"].value,
+        :desc     => "The name by which we identify ourselves in SMTP HELO for reports.
+          If you send to a smtpserver which does strict HELO checking (as with Postfix's
+          `smtpd_helo_restrictions` access controls), you may need to ensure this resolves.",
     }
   )
 

lib/puppet/reports/tagmail.rb

@@ -133,7 +133,7 @@ def send(reports)
     pid = Puppet::Util.safe_posix_fork do
       if Puppet[:smtpserver] != "none"
         begin
-          Net::SMTP.start(Puppet[:smtpserver]) do |smtp|
+          Net::SMTP.start(Puppet[:smtpserver], Puppet[:smtpport], Puppet[:smtphelo]) do |smtp|
             reports.each do |emails, messages|
               smtp.open_message_stream(Puppet[:reportfrom], *emails) do |p|
                 p.puts "From: #{Puppet[:reportfrom]}"