$OpenBSD: patch-spooler_Spooler_cpp,v 1.10 2018/10/02 10:49:47 robert Exp $

Index: spooler/Spooler.cpp
--- spooler/Spooler.cpp.orig
+++ spooler/Spooler.cpp
@@ -219,7 +219,7 @@ static HRESULT StartSpoolerThread(SendData &&sd, const
 		return MAPI_E_CALL_FAILED;
 	}
 	th_arg.release();
-	ec_log_info("Worker thread 0x%lx started", static_cast<unsigned long>(tid));
+	ec_log_info("Worker thread 0x%lx started", reinterpret_cast<unsigned long>(tid));
 	return hrSuccess;
 }
 
@@ -906,10 +906,10 @@ int main(int argc, char **argv) try
 		{ "smtp_server","localhost", CONFIGSETTING_RELOADABLE },
 		{ "smtp_port","25", CONFIGSETTING_RELOADABLE },
 		{ "server_socket", "default:" },
-		{ "run_as_user", "kopano" },
-		{ "run_as_group", "kopano" },
+		{ "run_as_user", "_kopano" },
+		{ "run_as_group", "_kopano" },
 		{ "pid_file", "/var/run/kopano/spooler.pid" },
-		{"running_path", "/var/lib/kopano/empty", CONFIGSETTING_OBSOLETE},
+		{"running_path", "/var/empty", CONFIGSETTING_OBSOLETE},
 		{"coredump_enabled", "systemdefault"},
 		{"log_method", "auto", CONFIGSETTING_NONEMPTY},
 		{"log_file", ""},
@@ -933,8 +933,8 @@ int main(int argc, char **argv) try
 		{ "archive_on_send", "no", CONFIGSETTING_RELOADABLE },
 		{ "enable_dsn", "yes", CONFIGSETTING_RELOADABLE },
         { "plugin_enabled", "yes" },
-        { "plugin_path", "/var/lib/kopano/spooler/plugins" },
-        { "plugin_manager_path", "/usr/share/kopano-spooler/python" },
+        { "plugin_path", "/var/db/kopano/spooler/plugins" },
+        { "plugin_manager_path", "/usr/local/share/kopano-spooler/python" },
 		{ "z_statsd_stats", "/var/run/kopano/statsd.sock" },
 		{ "tmp_path", "/tmp" },
 		{"log_raw_message_path", "/var/lib/kopano", CONFIGSETTING_RELOADABLE},
