Skip to content

Commit 5cb8b0f

Browse files
jengelhjengelh
committed
Merge branch 'prime'
2 parents 3b8ee19 + 1d5b730 commit 5cb8b0f

File tree

8 files changed

+37
-73
lines changed

8 files changed

+37
-73
lines changed

‎Makefile.am‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ libgxm_exmdb_local_la_LDFLAGS = ${default_SYFLAGS}
112112
libgxm_exmdb_local_la_LIBADD = -lpthread ${libHX_LIBS} ${jsoncpp_LIBS} libgromox_common.la libgromox_exrpc.la libgromox_mapi.la libgxs_mysql_adaptor.la
113113
EXTRA_libgxm_exmdb_local_la_DEPENDENCIES = default.sym
114114

115-
pop3_SOURCES = mra/midb_agent.hpp mra/pop3/cmd.cpp mra/pop3/main.cpp mra/pop3/parser.cpp mra/pop3/pop3.hpp mra/pop3/resource.cpp
115+
pop3_SOURCES = mra/pop3/cmd.cpp mra/pop3/main.cpp mra/pop3/parser.cpp mra/pop3/pop3.hpp mra/pop3/resource.cpp
116116
pop3_LDADD = -lpthread ${libcrypto_LIBS} ${libHX_LIBS} ${libssl_LIBS} libgromox_auth.la libgromox_authz.la libgromox_common.la libgromox_epoll.la libgromox_exrpc.la libgxs_event_proxy.la libgxs_midb_agent.la libgxs_mysql_adaptor.la
117-
imap_SOURCES = mra/midb_agent.hpp mra/imap/cmd.cpp mra/imap/imap.hpp mra/imap/main.cpp mra/imap/parser.cpp mra/imap/resource.cpp
117+
imap_SOURCES = mra/imap/cmd.cpp mra/imap/imap.hpp mra/imap/main.cpp mra/imap/parser.cpp mra/imap/resource.cpp
118118
imap_LDADD = -lpthread ${libcrypto_LIBS} ${fmt_LIBS} ${libHX_LIBS} ${jsoncpp_LIBS} ${libssl_LIBS} libgromox_auth.la libgromox_authz.la libgromox_common.la libgromox_epoll.la libgromox_exrpc.la libgromox_mapi.la libgxs_event_proxy.la libgxs_event_stub.la libgxs_midb_agent.la libgxs_mysql_adaptor.la
119119
libgxs_event_proxy_la_SOURCES = mra/event_proxy.cpp
120120
libgxs_event_proxy_la_LDFLAGS = ${default_SYFLAGS}
@@ -124,7 +124,7 @@ libgxs_event_stub_la_SOURCES = mra/event_stub.cpp
124124
libgxs_event_stub_la_LDFLAGS = ${default_SYFLAGS}
125125
libgxs_event_stub_la_LIBADD = -lpthread ${libHX_LIBS} libgromox_common.la
126126
EXTRA_libgxs_event_stub_la_DEPENDENCIES = default.sym
127-
libgxs_midb_agent_la_SOURCES = mra/midb_agent.cpp mra/midb_agent.hpp
127+
libgxs_midb_agent_la_SOURCES = mra/midb_agent.cpp
128128
libgxs_midb_agent_la_LDFLAGS = ${default_SYFLAGS}
129129
libgxs_midb_agent_la_LIBADD = -lpthread ${fmt_LIBS} ${libHX_LIBS} libgromox_common.la
130130
EXTRA_libgxs_midb_agent_la_DEPENDENCIES = default.sym
@@ -354,7 +354,7 @@ tzd_files += data/Greenwich.tzd data/Haiti.tzd data/Hawaiian.tzd data/India.tzd
354354
tzd_files += data/Saratov.tzd data/Singapore.tzd data/South_Africa.tzd data/South_Sudan.tzd data/Sri_Lanka.tzd data/Sudan.tzd data/Syria.tzd data/Taipei.tzd data/Tasmania.tzd data/Tocantins.tzd data/Tokyo.tzd data/Tomsk.tzd data/Tonga.tzd data/Transbaikal.tzd data/Turkey.tzd data/Turks_And_Caicos.tzd data/US_Eastern.tzd data/US_Mountain.tzd data/UTC+12.tzd data/UTC+13.tzd data/UTC-02.tzd data/UTC-08.tzd data/UTC-09.tzd data/UTC-11.tzd data/UTC.tzd data/Ulaanbaatar.tzd data/Venezuela.tzd data/Vladivostok.tzd data/Volgograd.tzd data/W__Australia.tzd data/W__Central_Africa.tzd data/W__Europe.tzd data/W__Mongolia.tzd data/West_Asia.tzd data/West_Bank.tzd data/West_Pacific.tzd data/Yakutsk.tzd data/Yukon.tzd
355355
tzd_files += data/windowsZones.xml
356356
header_files = include/gromox/ab_tree.hpp include/gromox/arcfour.hpp include/gromox/archive.hpp include/gromox/atomic.hpp include/gromox/authmgr.hpp include/gromox/bounce_gen.hpp include/gromox/clock.hpp include/gromox/common_types.hpp include/gromox/config_file.hpp include/gromox/contexts_pool.hpp include/gromox/cookie_parser.hpp include/gromox/cryptoutil.hpp include/gromox/database.h include/gromox/database_mysql.hpp include/gromox/dbop.h include/gromox/dcerpc.hpp include/gromox/defs.h include/gromox/double_list.hpp include/gromox/dsn.hpp include/gromox/eid_array.hpp include/gromox/element_data.hpp include/gromox/exmdb_client.hpp include/gromox/exmdb_common_util.hpp include/gromox/exmdb_ext.hpp include/gromox/exmdb_idef.hpp include/gromox/exmdb_provider_client.hpp include/gromox/exmdb_rpc.hpp include/gromox/exmdb_server.hpp include/gromox/ext_buffer.hpp
357-
header_files += include/gromox/fileio.h include/gromox/flusher_common.h include/gromox/freebusy.hpp include/gromox/gab.hpp include/gromox/generic_connection.hpp include/gromox/hook_common.h include/gromox/hpm_common.h include/gromox/http.hpp include/gromox/ical.hpp include/gromox/icase.hpp include/gromox/json.hpp include/gromox/list_file.hpp include/gromox/lzxpress.hpp include/gromox/mail.hpp include/gromox/mail_func.hpp include/gromox/mapi_types.hpp include/gromox/mapidefs.h include/gromox/mapierr.hpp include/gromox/mapitags.hpp include/gromox/midb.hpp include/gromox/mime.hpp include/gromox/mjson.hpp include/gromox/msgchg_grouping.hpp include/gromox/mysql_adaptor.hpp include/gromox/ndr.hpp include/gromox/ntlmssp.hpp include/gromox/oxcmail.hpp include/gromox/oxoabkt.hpp
357+
header_files += include/gromox/fileio.h include/gromox/flusher_common.h include/gromox/freebusy.hpp include/gromox/gab.hpp include/gromox/generic_connection.hpp include/gromox/hook_common.h include/gromox/hpm_common.h include/gromox/http.hpp include/gromox/ical.hpp include/gromox/icase.hpp include/gromox/json.hpp include/gromox/list_file.hpp include/gromox/lzxpress.hpp include/gromox/mail.hpp include/gromox/mail_func.hpp include/gromox/mapi_types.hpp include/gromox/mapidefs.h include/gromox/mapierr.hpp include/gromox/mapitags.hpp include/gromox/midb.hpp include/gromox/midb_agent.hpp include/gromox/mime.hpp include/gromox/mjson.hpp include/gromox/msgchg_grouping.hpp include/gromox/mysql_adaptor.hpp include/gromox/ndr.hpp include/gromox/ntlmssp.hpp include/gromox/oxcmail.hpp include/gromox/oxoabkt.hpp
358358
header_files += include/gromox/paths.h.in include/gromox/pcl.hpp include/gromox/plugin.hpp include/gromox/proc_common.h include/gromox/process.hpp include/gromox/proptag_array.hpp include/gromox/propval.hpp include/gromox/range_set.hpp include/gromox/resource_pool.hpp include/gromox/restriction.hpp include/gromox/rop_util.hpp include/gromox/rpc_types.hpp include/gromox/rule_actions.hpp include/gromox/safeint.hpp include/gromox/simple_tree.hpp include/gromox/sortorder_set.hpp include/gromox/stream.hpp include/gromox/svc_common.h include/gromox/svc_loader.hpp include/gromox/textmaps.hpp include/gromox/threads_pool.hpp include/gromox/tie.hpp include/gromox/tnef.hpp include/gromox/usercvt.hpp include/gromox/util.hpp include/gromox/vcard.hpp include/gromox/xarray2.hpp include/gromox/zcore_client.hpp include/gromox/zcore_rpc.hpp include/gromox/zz_ndr_stack.hpp
359359
header_files += lib/mapi/oxcmail_int.hpp
360360
list_files = data/cpid.txt data/exmdb_list.txt data/folder_names.txt data/lang_charset.txt data/lcid.txt data/mime_extension.txt data/propnames.txt

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([gromox], [2.43])
1+
AC_INIT([gromox], [2.44])
22
AC_CONFIG_AUX_DIR([build-aux])
33
AC_CONFIG_MACRO_DIR([build-aux])
44
AC_PREFIX_DEFAULT([/usr])

‎doc/changelog.rst‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Development 2.43.56
2-
===================
1+
Gromox 2.44 (2025-03-19)
2+
========================
33

44
Fixes:
55

@@ -13,6 +13,14 @@ Fixes:
1313
with the email address even if the user's common name was umlaut-free
1414
* ews: PR_LAST_MODIFIER_NAME was filled with the email address even if the
1515
user's common name was umlaut-free
16+
* mbop: make clear-profile nuke all profile parts again
17+
* The documented default value `outgoing_smtp_url=sendmail://localhost`
18+
is now in effect.
19+
20+
Behavioral changes:
21+
22+
* Recognition for the `smtp_server_ip` config directive has been removed.
23+
Users must upgrade to `outgoing_smtp_url` (added in Gromox 2.21).
1624

1725

1826
Gromox 2.43 (2025-03-06)

‎doc/exchange_emsmdb.4gx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,6 @@ all ROPs. Note the daemon log level needs to be "debug" (6), too.
123123
.br
124124
Default: \fI0\fP
125125
.TP
126-
\fBsmtp_server_ip\fP
127-
Deprecated in favor of gromox.cfg:outgoing_smtp_url.
128-
.TP
129-
\fBsmtp_server_port\fP
130-
Deprecated in favor of gromox.cfg:outgoing_smtp_url.
131-
.TP
132126
\fBsubmit_command\fP
133127
Default: \fI/usr/bin/php /usr/share/gromox/sa/submit.php
134128
.TP

‎exch/emsmdb/main.cpp‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ static DCERPC_ENDPOINT *ep_6001;
4444

4545
static constexpr cfg_directive emsmdb_gxcfg_dflt[] = {
4646
{"backfill_transport_headers", "0", CFG_BOOL},
47+
{"outgoing_smtp_url", "sendmail://localhost"},
4748
{"reported_server_version", "15.00.0847.4040"},
4849
CFG_TABLE_END,
4950
};
@@ -65,8 +66,6 @@ static constexpr cfg_directive emsmdb_cfg_defaults[] = {
6566
{"max_mail_num", "1000000", CFG_SIZE, "1"},
6667
{"max_rcpt_num", "256", CFG_SIZE, "1"},
6768
{"rop_debug", "0"},
68-
{"smtp_server_ip", "::1", CFG_DEPRECATED},
69-
{"smtp_server_port", "25", CFG_DEPRECATED},
7069
{"submit_command", "/usr/bin/php " PKGDATADIR "/sa/submit.php"},
7170
{"x500_org_name", "Gromox default"},
7271
CFG_TABLE_END,
@@ -174,24 +173,12 @@ BOOL PROC_exchange_emsmdb(enum plugin_op reason, const struct dlfuncs &ppdata)
174173
HX_unit_size(max_length_s, std::size(max_length_s), max_length, 1024, 0);
175174
auto str = gxcfg->get_value("outgoing_smtp_url");
176175
std::string smtp_url;
177-
if (str != nullptr) {
178-
try {
179-
smtp_url = vmime::utility::url(str);
180-
} catch (const vmime::exceptions::malformed_url &e) {
181-
mlog(LV_ERR, "Malformed URL: outgoing_smtp_url=\"%s\": %s",
182-
str, e.what());
183-
return false;
184-
}
185-
} else {
186-
str = pfile->get_value("smtp_server_ip");
187-
uint16_t port = pfile->get_ll("smtp_server_port");
188-
try {
189-
smtp_url = vmime::utility::url("smtp", str, port);
190-
} catch (const vmime::exceptions::malformed_url &e) {
191-
mlog(LV_ERR, "Malformed outgoing SMTP: [%s]:%hu: %s",
192-
str, port, e.what());
193-
return false;
194-
}
176+
try {
177+
smtp_url = vmime::utility::url(str);
178+
} catch (const vmime::exceptions::malformed_url &e) {
179+
mlog(LV_ERR, "Malformed URL: outgoing_smtp_url=\"%s\": %s",
180+
str, e.what());
181+
return false;
195182
}
196183
gx_strlcpy(submit_command, pfile->get_value("submit_command"), std::size(submit_command));
197184
async_num = pfile->get_ll("async_threads_num");

‎exch/ews/ews.cpp‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -458,12 +458,11 @@ static constexpr cfg_directive ews_cfg_defaults[] = {
458458
{"ews_request_logging", "0"},
459459
{"ews_response_logging", "0"},
460460
{"ews_schema_version", "V2017_07_11"},
461-
{"smtp_server_ip", "::1", CFG_DEPRECATED},
462-
{"smtp_server_port", "25", CFG_DEPRECATED},
463461
CFG_TABLE_END,
464462
};
465463

466464
static constexpr struct cfg_directive ews_gxcfg_deflt[] = {
465+
{"outgoing_smtp_url", "sendmail://localhost"},
467466
{"reported_server_version", "15.00.0847.4040"},
468467
CFG_TABLE_END,
469468
};
@@ -505,24 +504,12 @@ void EWSPlugin::loadConfig()
505504
ver.schema = cfg->get_value("ews_schema_version");
506505

507506
str = gxcfg->get_value("outgoing_smtp_url");
508-
if (str != nullptr) {
509-
try {
510-
smtp_url = vmime::utility::url(str);
511-
} catch (const vmime::exceptions::malformed_url &e) {
512-
mlog(LV_ERR, "Malformed URL: outgoing_smtp_url=\"%s\": %s",
513-
str, e.what());
514-
return;
515-
}
516-
} else {
517-
str = cfg->get_value("smtp_server_ip");
518-
uint16_t port = cfg->get_ll("smtp_server_port");
519-
try {
520-
smtp_url = vmime::utility::url("smtp", str, port);
521-
} catch (const vmime::exceptions::malformed_url &e) {
522-
mlog(LV_ERR, "Malformed outgoing SMTP: [%s]:%hu: %s",
523-
str, port, e.what());
524-
return;
525-
}
507+
try {
508+
smtp_url = vmime::utility::url(str);
509+
} catch (const vmime::exceptions::malformed_url &e) {
510+
mlog(LV_ERR, "Malformed URL: outgoing_smtp_url=\"%s\": %s",
511+
str, e.what());
512+
return;
526513
}
527514

528515
const char* logFilter = cfg->get_value("ews_log_filter");

‎exch/zcore/main.cpp‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ static constexpr static_module g_dfl_svc_plugins[] = {
8282
static constexpr cfg_directive zcore_gxcfg_dflt[] = {
8383
{"backfill_transport_headers", "0", CFG_BOOL},
8484
{"daemons_fd_limit", "zcore_fd_limit", CFG_ALIAS},
85+
{"outgoing_smtp_url", "sendmail://localhost"},
8586
{"zcore_fd_limit", "0", CFG_SIZE},
8687
CFG_TABLE_END,
8788
};
@@ -101,8 +102,6 @@ static constexpr cfg_directive zcore_cfg_defaults[] = {
101102
{"notify_stub_threads_num", "10", CFG_SIZE, "1", "100"},
102103
{"oxcical_allday_ymd", "1", CFG_BOOL},
103104
{"rpc_proxy_connection_num", "10", CFG_SIZE, "1", "100"},
104-
{"smtp_server_ip", "::1", CFG_DEPRECATED},
105-
{"smtp_server_port", "25", CFG_DEPRECATED},
106105
{"submit_command", "/usr/bin/php " PKGDATADIR "/sa/submit.php"},
107106
{"user_cache_interval", "1h", CFG_TIME, "1min", "1day"},
108107
{"user_table_size", "5000", CFG_SIZE, "100", "50000"},
@@ -306,24 +305,12 @@ int main(int argc, char **argv)
306305

307306
auto str = gxconfig->get_value("outgoing_smtp_url");
308307
std::string smtp_url;
309-
if (str != nullptr) {
310-
try {
311-
smtp_url = vmime::utility::url(str);
312-
} catch (const vmime::exceptions::malformed_url &e) {
313-
mlog(LV_ERR, "Malformed URL: outgoing_smtp_url=\"%s\": %s",
314-
str, e.what());
315-
return EXIT_FAILURE;
316-
}
317-
} else {
318-
str = pconfig->get_value("smtp_server_ip");
319-
uint16_t port = pconfig->get_ll("smtp_server_port");
320-
try {
321-
smtp_url = vmime::utility::url("smtp", str, port);
322-
} catch (const vmime::exceptions::malformed_url &e) {
323-
mlog(LV_ERR, "Malformed outgoing SMTP: [%s]:%hu: %s",
324-
str, port, e.what());
325-
return EXIT_FAILURE;
326-
}
308+
try {
309+
smtp_url = vmime::utility::url(str);
310+
} catch (const vmime::exceptions::malformed_url &e) {
311+
mlog(LV_ERR, "Malformed URL: outgoing_smtp_url=\"%s\": %s",
312+
str, e.what());
313+
return EXIT_FAILURE;
327314
}
328315
mlog(LV_NOTICE, "system: SMTP server is %s", smtp_url.c_str());
329316

‎mda/delivery_app/main.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ static constexpr static_module g_dfl_svc_plugins[] = {
5454
static constexpr cfg_directive gromox_cfg_defaults[] = {
5555
{"daemons_fd_limit", "lda_fd_limit", CFG_ALIAS},
5656
{"lda_fd_limit", "0", CFG_SIZE},
57+
{"outgoing_smtp_url", "sendmail://localhost"},
5758
CFG_TABLE_END,
5859
};
5960

0 commit comments

Comments
 (0)