fix bug #1701: implement smarthostport setting

diff --git a/PMG/Config.pm b/PMG/Config.pm
index 107cea50d3819bc1e84f4b87b389b433b783a556..07ea74868b8e942e418e9445f46a2cb5bd6b0c02 100755 (executable)
--- a/PMG/Config.pm
+++ b/PMG/Config.pm
@@ -467,6 +467,13 @@ sub properties {
            description => "When set, all outgoing mails are deliverd to the specified smarthost.",
            type => 'string', format => 'address',
        },
+       smarthostport => {
+           description => "SMTP port number for smarthost.",
+           type => 'integer',
+           minimum => 1,
+           maximum => 65535,
+           default => 25,
+       },
        banner => {
            description => "ESMTP banner.",
            type => 'string',
@@ -599,6 +606,7 @@ sub options {
        int_port => { optional => 1 },
        ext_port => { optional => 1 },
        smarthost => { optional => 1 },
+       smarthostport => { optional => 1 },
        relay => { optional => 1 },
        relayport => { optional => 1 },
        relaynomx => { optional => 1 },

diff --git a/templates/main.cf.in b/templates/main.cf.in
index a1785350f35e175847086c6e312d1a9421847ea3..7bf9afa7049a425d222fbfe49bd9e46528c4aeac 100644 (file)
--- a/templates/main.cf.in
+++ b/templates/main.cf.in
@@ -42,7 +42,7 @@ relay_transport = smtp:[% pmg.mail.relay %]:[% pmg.mail.relayport %]
 [% END %]
 
 [% IF pmg.mail.smarthost %]
-default_transport = smtp:[% pmg.mail.smarthost %]
+default_transport = smtp:[% pmg.mail.smarthost %]:[% pmg.mail.smarthostport %]
 [% END %]
 
 content_filter=scan:127.0.0.1:10024

diff --git a/templates/main.cf.in.demo b/templates/main.cf.in.demo
index 92a708e71d2f0f876f55a4580772ebfb13f55775..2c346ec07360beb3405c06290dc3dfa508f64368 100644 (file)
--- a/templates/main.cf.in.demo
+++ b/templates/main.cf.in.demo
@@ -42,7 +42,7 @@ relay_transport = smtp:[% pmg.mail.relay %]:[% pmg.mail.relayport %]
 [% END %]
 
 [% IF pmg.mail.smarthost %]
-default_transport = smtp:[% pmg.mail.smarthost %]
+default_transport = smtp:[% pmg.mail.smarthost %]:[% pmg.mail.smarthostport %]
 [% END %]
 
 mail_name = Proxmox