From: Vsevolod Stakhov <vsevolod@rambler-co.ru>
Date: Tue, 22 Jun 2010 17:43:29 +0000 (+0400)
Subject: * Pass env from main() arguments instead of platform specific global environ
X-Git-Tag: 0.3.1~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80e9384ebfaca000eb7f0693a466795f51e3f29d;p=thirdparty%2Frspamd.git

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

diff --git a/src/buffer.c b/src/buffer.c
index be6d2acc81..6c68875576 100644
--- 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 37f2ac498e..e75b468999 100644
--- 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));