exchange.m4, config.m4: Arrange to listen on the submission port.

This involves mentioning the SMTP port too, so add a configuration knob
for it.

diff --git a/config.m4 b/config.m4
index 5901edcff9518136f472d970a8adf5b1e869b321..4678f2017c68d49d3ea04a8b464a35c30d495cb8 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -43,7 +43,9 @@ DEFCONF(spam_max, 50)
 DEFCONF(interfaces, m4_ifelse(MODE, satellite, 127.0.0.1 ; ::1,
                              0.0.0.0 ; ::0))
 
-## Submission port number.  (This is sometimes tweaked for testing.)
+## Main and submission port numbers.  (This is sometimes tweaked for
+## testing.)
+DEFCONF(smtp_port, 25)
 DEFCONF(submission_port, 587)
 
 ## Locations of other configuration files.

diff --git a/exchange.m4 b/exchange.m4
index d38e1371682c7180e0e0fe148e9435a254078bea..00f0b05d84df1ee0e300db7627de6cec34b4713a 100644 (file)
--- a/exchange.m4
+++ b/exchange.m4
@@ -24,6 +24,9 @@
 ###--------------------------------------------------------------------------
 ### Listen for incoming connections.
 
+SECTION(global, daemon)m4_dnl
+daemon_smtp_ports = CONF_smtp_port : CONF_submission_port
+
 SECTION(global, tls)m4_dnl
 tls_certificate = CONF_sysconf_dir/server.cert
 tls_privatekey = CONF_sysconf_dir/server.key