dovecot-1.0: Trying to user $USER environment didn't work before...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.0/rev/eb249c6e4fef
changeset: 5522:eb249c6e4fef
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Feb 29 11:18:02 2008 +0200
description:
Trying to user $USER environment didn't work before environment was already
cleared. Get it earlier. Patch by Chris Vogel.

diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
src/deliver/deliver.c |    2 +-

diffs (19 lines):

diff -r c9f075374410 -r eb249c6e4fef src/deliver/deliver.c
--- a/src/deliver/deliver.c	Fri Feb 29 11:15:29 2008 +0200
+++ b/src/deliver/deliver.c	Fri Feb 29 11:18:02 2008 +0200
@@ -616,6 +616,7 @@ int main(int argc, char *argv[])
 	/* Clean up environment. */
 	env_tz = getenv("TZ");
 	home = getenv("HOME");
+	user = getenv("USER");
 	env_clean();
 	if (env_tz != NULL)
 		env_put(t_strconcat("TZ=", env_tz, NULL));
@@ -678,7 +679,6 @@ int main(int argc, char *argv[])
 		/* we're non-root. get our username and possibly our home. */
 		struct passwd *pw;
 
-		user = getenv("USER");
 		pw = getpwuid(process_euid);
 		if (pw != NULL) {
 			user = t_strdup(pw->pw_name);