# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1248632509 14400
# Node ID 25650d7f6b85a96197f2251bb5663989f42c0907
# Parent  6a6091e473cc4252ed998a6d5ca6e6a5cb01298f
imap/pop3: If chdir() to home failed, euid was always logged as being root.

diff -r 6a6091e473cc -r 25650d7f6b85 src/master/mail-process.c
--- a/src/master/mail-process.c	Sun Jul 26 14:17:30 2009 -0400
+++ b/src/master/mail-process.c	Sun Jul 26 14:21:49 2009 -0400
@@ -819,11 +819,6 @@
 				  full_home_dir, CHDIR_TIMEOUT - left);
 		}
 
-		/* Change UID back. No need to change GID back, it doesn't
-		   really matter. */
-		if (uid != master_uid && seteuid(master_uid) < 0)
-			i_fatal("seteuid(%s) failed: %m", dec2str(master_uid));
-
 		/* If user's home directory doesn't exist and we're not
 		   trying to chroot anywhere, fallback to /tmp as the mails
 		   could be stored elsewhere. The ENOTDIR check is mostly for
@@ -840,6 +835,10 @@
 							       full_home_dir));
 			}
 		}
+		/* Change UID back. No need to change GID back, it doesn't
+		   really matter. */
+		if (uid != master_uid && seteuid(master_uid) < 0)
+			i_fatal("seteuid(%s) failed: %m", dec2str(master_uid));
 	}
 	if (ret < 0) {
 		/* We still have to change to some directory where we have