daemons: drop smtp_server_ip directive

The `outgoing_smtp_url` directive did not have a (string) default,
because the default (behavior) was to fallback to `smtp_server_ip`
and `smtp_server_port` when outgoing_smtp_url was absent. Because
`smtp_server_ip` itself defaulted to ::1, outgoing_smtp_url's default
effectively was `smtp://[::1]:25/`.

`smtp_server_ip` was marked deprecated in commit gromox-2.21~51
(2023-12-17), remove it now. Then we can set the default for
outgoing_smtp_url in source as it was documented. Users who still
have smtp_server_ip in *.cfg must replace it with
gromox.cfg:outgoing_smtp_url accordingly, and immediately so.

References: GXF-2020

Author: jengelh

doc/exchange_emsmdb.4gx

@@ -123,12 +123,6 @@ all ROPs. Note the daemon log level needs to be "debug" (6), too.
 .br
 Default: \fI0\fP
 .TP
-\fBsmtp_server_ip\fP
-Deprecated in favor of gromox.cfg:outgoing_smtp_url.
-.TP
-\fBsmtp_server_port\fP
-Deprecated in favor of gromox.cfg:outgoing_smtp_url.
-.TP
 \fBsubmit_command\fP
 Default: \fI/usr/bin/php /usr/share/gromox/sa/submit.php
 .TP

exch/emsmdb/main.cpp

@@ -44,6 +44,7 @@ static DCERPC_ENDPOINT *ep_6001;
 
 static constexpr cfg_directive emsmdb_gxcfg_dflt[] = {
 	{"backfill_transport_headers", "0", CFG_BOOL},
+	{"outgoing_smtp_url", "sendmail://localhost"},
 	{"reported_server_version", "15.00.0847.4040"},
 	CFG_TABLE_END,
 };
@@ -65,8 +66,6 @@ static constexpr cfg_directive emsmdb_cfg_defaults[] = {
 	{"max_mail_num", "1000000", CFG_SIZE, "1"},
 	{"max_rcpt_num", "256", CFG_SIZE, "1"},
 	{"rop_debug", "0"},
-	{"smtp_server_ip", "::1", CFG_DEPRECATED},
-	{"smtp_server_port", "25", CFG_DEPRECATED},
 	{"submit_command", "/usr/bin/php " PKGDATADIR "/sa/submit.php"},
 	{"x500_org_name", "Gromox default"},
 	CFG_TABLE_END,
@@ -174,24 +173,12 @@ BOOL PROC_exchange_emsmdb(enum plugin_op reason, const struct dlfuncs &ppdata)
 		HX_unit_size(max_length_s, std::size(max_length_s), max_length, 1024, 0);
 		auto str = gxcfg->get_value("outgoing_smtp_url");
 		std::string smtp_url;
-		if (str != nullptr) {
-			try {
-				smtp_url = vmime::utility::url(str);
-			} catch (const vmime::exceptions::malformed_url &e) {
-				mlog(LV_ERR, "Malformed URL: outgoing_smtp_url=\"%s\": %s",
-					str, e.what());
-				return false;
-			}
-		} else {
-			str = pfile->get_value("smtp_server_ip");
-			uint16_t port = pfile->get_ll("smtp_server_port");
-			try {
-				smtp_url = vmime::utility::url("smtp", str, port);
-			} catch (const vmime::exceptions::malformed_url &e) {
-				mlog(LV_ERR, "Malformed outgoing SMTP: [%s]:%hu: %s",
-					str, port, e.what());
-				return false;
-			}
+		try {
+			smtp_url = vmime::utility::url(str);
+		} catch (const vmime::exceptions::malformed_url &e) {
+			mlog(LV_ERR, "Malformed URL: outgoing_smtp_url=\"%s\": %s",
+				str, e.what());
+			return false;
 		}
 		gx_strlcpy(submit_command, pfile->get_value("submit_command"), std::size(submit_command));
 		async_num = pfile->get_ll("async_threads_num");

exch/ews/ews.cpp

@@ -458,12 +458,11 @@ static constexpr cfg_directive ews_cfg_defaults[] = {
 	{"ews_request_logging", "0"},
 	{"ews_response_logging", "0"},
 	{"ews_schema_version", "V2017_07_11"},
-	{"smtp_server_ip", "::1", CFG_DEPRECATED},
-	{"smtp_server_port", "25", CFG_DEPRECATED},
 	CFG_TABLE_END,
 };
 
 static constexpr struct cfg_directive ews_gxcfg_deflt[] = {
+	{"outgoing_smtp_url", "sendmail://localhost"},
 	{"reported_server_version", "15.00.0847.4040"},
 	CFG_TABLE_END,
 };
@@ -505,24 +504,12 @@ void EWSPlugin::loadConfig()
 	ver.schema = cfg->get_value("ews_schema_version");
 
 	str = gxcfg->get_value("outgoing_smtp_url");
-	if (str != nullptr) {
-		try {
-			smtp_url = vmime::utility::url(str);
-		} catch (const vmime::exceptions::malformed_url &e) {
-			mlog(LV_ERR, "Malformed URL: outgoing_smtp_url=\"%s\": %s",
-				str, e.what());
-			return;
-		}
-	} else {
-		str = cfg->get_value("smtp_server_ip");
-		uint16_t port = cfg->get_ll("smtp_server_port");
-		try {
-			smtp_url = vmime::utility::url("smtp", str, port);
-		} catch (const vmime::exceptions::malformed_url &e) {
-			mlog(LV_ERR, "Malformed outgoing SMTP: [%s]:%hu: %s",
-				str, port, e.what());
-			return;
-		}
+	try {
+		smtp_url = vmime::utility::url(str);
+	} catch (const vmime::exceptions::malformed_url &e) {
+		mlog(LV_ERR, "Malformed URL: outgoing_smtp_url=\"%s\": %s",
+			str, e.what());
+		return;
 	}
 
 	const char* logFilter = cfg->get_value("ews_log_filter");

exch/zcore/main.cpp

@@ -82,6 +82,7 @@ static constexpr static_module g_dfl_svc_plugins[] = {
 static constexpr cfg_directive zcore_gxcfg_dflt[] = {
 	{"backfill_transport_headers", "0", CFG_BOOL},
 	{"daemons_fd_limit", "zcore_fd_limit", CFG_ALIAS},
+	{"outgoing_smtp_url", "sendmail://localhost"},
 	{"zcore_fd_limit", "0", CFG_SIZE},
 	CFG_TABLE_END,
 };
@@ -101,8 +102,6 @@ static constexpr cfg_directive zcore_cfg_defaults[] = {
 	{"notify_stub_threads_num", "10", CFG_SIZE, "1", "100"},
 	{"oxcical_allday_ymd", "1", CFG_BOOL},
 	{"rpc_proxy_connection_num", "10", CFG_SIZE, "1", "100"},
-	{"smtp_server_ip", "::1", CFG_DEPRECATED},
-	{"smtp_server_port", "25", CFG_DEPRECATED},
 	{"submit_command", "/usr/bin/php " PKGDATADIR "/sa/submit.php"},
 	{"user_cache_interval", "1h", CFG_TIME, "1min", "1day"},
 	{"user_table_size", "5000", CFG_SIZE, "100", "50000"},
@@ -306,24 +305,12 @@ int main(int argc, char **argv)
 
 	auto str = gxconfig->get_value("outgoing_smtp_url");
 	std::string smtp_url;
-	if (str != nullptr) {
-		try {
-			smtp_url = vmime::utility::url(str);
-		} catch (const vmime::exceptions::malformed_url &e) {
-			mlog(LV_ERR, "Malformed URL: outgoing_smtp_url=\"%s\": %s",
-				str, e.what());
-			return EXIT_FAILURE;
-		}
-	} else {
-		str = pconfig->get_value("smtp_server_ip");
-		uint16_t port = pconfig->get_ll("smtp_server_port");
-		try {
-			smtp_url = vmime::utility::url("smtp", str, port);
-		} catch (const vmime::exceptions::malformed_url &e) {
-			mlog(LV_ERR, "Malformed outgoing SMTP: [%s]:%hu: %s",
-				str, port, e.what());
-			return EXIT_FAILURE;
-		}
+	try {
+		smtp_url = vmime::utility::url(str);
+	} catch (const vmime::exceptions::malformed_url &e) {
+		mlog(LV_ERR, "Malformed URL: outgoing_smtp_url=\"%s\": %s",
+			str, e.what());
+		return EXIT_FAILURE;
 	}
 	mlog(LV_NOTICE, "system: SMTP server is %s", smtp_url.c_str());
 

mda/delivery_app/main.cpp

@@ -54,6 +54,7 @@ static constexpr static_module g_dfl_svc_plugins[] = {
 static constexpr cfg_directive gromox_cfg_defaults[] = {
 	{"daemons_fd_limit", "lda_fd_limit", CFG_ALIAS},
 	{"lda_fd_limit", "0", CFG_SIZE},
+	{"outgoing_smtp_url", "sendmail://localhost"},
 	CFG_TABLE_END,
 };