* Pass env from main() arguments instead of platform specific global environ

diff --git a/src/buffer.c b/src/buffer.c
index be6d2acc8122fc58bbd567c5cfa3fe6895f66530..6c68875576e6745fe53a4ee083c696f39ea7039a 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -44,8 +44,8 @@ sendfile_callback (rspamd_io_dispatcher_t *d)
 
 #ifdef HAVE_SENDFILE
 # if defined(FREEBSD) || defined(DARWIN)
-       #if defined(FREEBSD)
        off_t                           off = 0;
+       #if defined(FREEBSD)
        /* FreeBSD version */
        if (sendfile (d->sendfile_fd, d->fd, d->offset, 0, NULL, &off, 0) != 0) {
        #elif defined(DARWIN)

diff --git a/src/main.c b/src/main.c
index 37f2ac498e247dfafec013fae9adb20428bc287e..e75b468999b74033995886101f5508f69a155c1a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -762,7 +762,7 @@ main (int argc, char **argv, char **env)
        do_reopen_log = 0;
 
 #ifndef HAVE_SETPROCTITLE
-       init_title (argc, argv, environ);
+       init_title (argc, argv, env);
 #endif
 
        rspamd->stat = memory_pool_alloc_shared (rspamd->server_pool, sizeof (struct rspamd_stat));