From: Timo Sirainen <tss@iki.fi>
Date: Sat, 19 Nov 2011 20:29:31 +0000 (+0200)
Subject: env_clean(): Previous OSX compile fix broke the function completely.
X-Git-Tag: 2.1.rc1~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2afb37869c781a79601ba49abe0dd15fa0ffa72e;p=thirdparty%2Fdovecot%2Fcore.git

env_clean(): Previous OSX compile fix broke the function completely.
---

diff --git a/src/lib/env-util.c b/src/lib/env-util.c
index 1282f8fcca..079ed9d301 100644
--- a/src/lib/env-util.c
+++ b/src/lib/env-util.c
@@ -59,7 +59,7 @@ void env_clean(void)
 	if (clearenv() < 0)
 		i_fatal("clearenv() failed");
 #else
-	char **environ = *env_get_environ_p();
+	char ***environ_p = env_get_environ_p();
 
 	/* Try to clear the environment.
 
@@ -68,7 +68,7 @@ void env_clean(void)
 	   c) environ = emptyenv doesn't work on Haiku OS
 	   d) environ = calloc() should work everywhere
 	*/
-	environ = calloc(1, sizeof(*environ));
+	*environ_p = calloc(1, sizeof(**environ_p));
 #endif
 	if (env_pool != NULL)
 		p_clear(env_pool);