zcore: delete config directive "max_mail_num"

Administratively limiting the global message count per store can be
done in exmdb; there should be no need to (re-)do an additional check
within zcore.

Author: jengelh

doc/zcore.8gx

@@ -86,9 +86,6 @@ Default: \fI64M\fP
 \fBmax_ext_rule_length\fP
 Default: \fI510K\fP
 .TP
-\fBmax_mail_num\fP
-Default: \fI1000000\fP
-.TP
 \fBmax_rcpt_num\fP
 The maximum number of recipients that an e-mail is allowed to have.
 .br

exch/zcore/common_util.cpp

@@ -82,7 +82,7 @@ struct LANGMAP_ITEM {
 }
 
 size_t g_max_mail_len;
-unsigned int g_max_rcpt, g_max_message;
+unsigned int g_max_rcpt;
 unsigned int g_max_rule_len, g_max_extrule_len, zcore_backfill_transporthdr;
 static std::string g_smtp_url;
 char g_org_name[256];
@@ -329,13 +329,12 @@ BOOL common_util_exmdb_locinfo_from_string(
 }
 
 void common_util_init(const char *org_name, const char *default_charset,
-    unsigned int max_rcpt, unsigned int max_message, size_t max_mail_len,
+    unsigned int max_rcpt, size_t max_mail_len,
     unsigned int max_rule_len, std::string &&smtp_url, const char *submit_command)
 {
 	gx_strlcpy(g_org_name, org_name, std::size(g_org_name));
 	gx_strlcpy(g_default_charset, default_charset, std::size(g_default_charset));
 	g_max_rcpt = max_rcpt;
-	g_max_message = max_message;
 	g_max_mail_len = max_mail_len;
 	g_max_rule_len = g_max_extrule_len = max_rule_len;
 	g_smtp_url = std::move(smtp_url);

exch/zcore/common_util.hpp

@@ -78,7 +78,7 @@ struct message_content;
 struct message_object;
 struct store_object;
 
-extern void common_util_init(const char *org_name, const char *default_charset, unsigned int max_rcpt, unsigned int max_msg, size_t max_mail_len, unsigned int max_rule_len, std::string &&smtp_url, const char *submit_cmd);
+extern void common_util_init(const char *org_name, const char *default_charset, unsigned int max_rcpt, size_t max_mail_len, unsigned int max_rule_len, std::string &&smtp_url, const char *submit_cmd);
 extern int common_util_run(const char *data_path);
 BOOL common_util_verify_columns_and_sorts(
 	const PROPTAG_ARRAY *pcolumns,
@@ -162,7 +162,7 @@ extern ec_error_t cu_fbdata_to_ical(const char *, const char *, time_t, time_t,
 extern bool permrow_entryids_equal(const PERMISSION_ROW &, const uint32_t *, const BINARY *);
 
 extern size_t g_max_mail_len;
-extern unsigned int g_max_rcpt, g_max_message;
+extern unsigned int g_max_rcpt;
 extern unsigned int g_max_rule_len, g_max_extrule_len;
 extern unsigned int zcore_backfill_transporthdr;
 extern char g_org_name[256];

exch/zcore/main.cpp

@@ -97,7 +97,6 @@ static constexpr cfg_directive zcore_cfg_defaults[] = {
 	{"mail_max_length", "64M", CFG_SIZE, "1"},
 	{"mailbox_ping_interval", "5min", CFG_TIME, "1min", "1h"},
 	{"max_ext_rule_length", "510K", CFG_SIZE, "1"},
-	{"max_mail_num", "1000000", CFG_SIZE, "1"},
 	{"max_rcpt_num", "256", CFG_SIZE, "1"},
 	{"notify_stub_threads_num", "10", CFG_SIZE, "1", "100"},
 	{"oxcical_allday_ymd", "1", CFG_BOOL},
@@ -297,9 +296,6 @@ int main(int argc, char **argv)
 	auto max_rcpt = pconfig->get_ll("max_rcpt_num");
 	mlog(LV_INFO, "system: maximum rcpt number is %lld", max_rcpt);
 
-	auto max_mail = pconfig->get_ll("max_mail_num");
-	mlog(LV_INFO, "system: maximum mail number is %lld", max_mail);
-	
 	auto max_length = pconfig->get_ll("mail_max_length");
 	HX_unit_size(temp_buff, std::size(temp_buff), max_length, 1024, 0);
 	mlog(LV_INFO, "system: maximum mail length is %s", temp_buff);
@@ -321,7 +317,7 @@ int main(int argc, char **argv)
 
 	common_util_init(g_config_file->get_value("x500_org_name"),
 		g_config_file->get_value("default_charset"),
-		max_rcpt, max_mail, max_length, max_rule_len, std::move(smtp_url),
+		max_rcpt, max_length, max_rule_len, std::move(smtp_url),
 		g_config_file->get_value("submit_command"));
 
 	int proxy_num = pconfig->get_ll("rpc_proxy_connection_num");

exch/zcore/zserver.cpp

@@ -1561,13 +1561,6 @@ ec_error_t zs_createmessage(GUID hsession,
 	uint64_t total_size = lnum != nullptr ? *lnum : 0;
 	if (max_quota > 0 && total_size > static_cast<uint64_t>(max_quota))
 		return ecQuotaExceeded;
-	num = tmp_propvals.get<uint32_t>(PR_ASSOC_CONTENT_COUNT);
-	uint32_t total_mail = num != nullptr ? *num : 0;
-	num = tmp_propvals.get<uint32_t>(PR_CONTENT_COUNT);
-	if (num != nullptr)
-		total_mail += *num;
-	if (total_mail > g_max_message)
-		return ecQuotaExceeded;
 	if (!exmdb_client->allocate_message_id(pstore->get_dir(),
 	    folder_id, &message_id))
 		return ecError;