$OpenBSD: patch-spooler_DAgent_cpp,v 1.15 2019/07/22 16:10:27 robert Exp $

Index: spooler/DAgent.cpp
--- spooler/DAgent.cpp.orig
+++ spooler/DAgent.cpp
@@ -64,6 +64,11 @@
 #include <sys/mman.h>
 #include <pwd.h>
 
+#ifdef __OpenBSD__
+#include <sys/resource.h>
+extern char **environ;
+#endif
+
 /*
   This is actually from sysexits.h
   but since those windows lamers don't have it ..
@@ -3241,8 +3246,8 @@ int main(int argc, char **argv) try {
 	// Default settings
 	static const configsetting_t lpDefaults[] = {
 		{ "server_bind_intf", "" },
-		{ "run_as_user", "kopano" },
-		{ "run_as_group", "kopano" },
+		{ "run_as_user", "_kopano" },
+		{ "run_as_group", "_kopano" },
 		{ "pid_file", "/var/run/kopano/dagent.pid" },
 		{"coredump_enabled", "systemdefault"},
 		{"socketspec", "", CONFIGSETTING_OBSOLETE},
@@ -3262,12 +3267,12 @@ int main(int argc, char **argv) try {
 		{ "log_raw_message", "error", CONFIGSETTING_RELOADABLE },
 		{"log_raw_message_path", "/var/lib/kopano", CONFIGSETTING_RELOADABLE},
 		{ "archive_on_delivery", "no", CONFIGSETTING_RELOADABLE },
-		{ "mr_autoaccepter", "/usr/sbin/kopano-mr-accept", CONFIGSETTING_RELOADABLE },
-		{ "mr_autoprocessor", "/usr/sbin/kopano-mr-process", CONFIGSETTING_RELOADABLE },
-		{ "autoresponder", "/usr/sbin/kopano-autorespond", CONFIGSETTING_RELOADABLE },
+		{ "mr_autoaccepter", "/usr/local/sbin/kopano-mr-accept", CONFIGSETTING_RELOADABLE },
+		{ "mr_autoprocessor", "/usr/local/sbin/kopano-mr-process", CONFIGSETTING_RELOADABLE },
+		{ "autoresponder", "/usr/local/sbin/kopano-autorespond", CONFIGSETTING_RELOADABLE },
 		{"plugin_enabled", "no"},
-		{ "plugin_path", "/var/lib/kopano/dagent/plugins" },
-		{ "plugin_manager_path", "/usr/share/kopano-dagent/python" },
+		{ "plugin_path", "/var/db/kopano/dagent/plugins" },
+		{ "plugin_manager_path", "/usr/local/share/kopano-dagent/python" },
 		{ "default_charset", "us-ascii"},
 		{"insecure_html_join", "no", CONFIGSETTING_RELOADABLE},
 		{ "set_rule_headers", "yes", CONFIGSETTING_RELOADABLE },
