dovecot-1.2: expire-tool: Fix to previous change to actually use...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/6dec24ec8218
changeset: 9049:6dec24ec8218
user:      Timo Sirainen <tss at iki.fi>
date:      Sun May 17 20:05:36 2009 -0400
description:
expire-tool: Fix to previous change to actually use the mail_gid.

diffstat:

1 file changed, 5 insertions(+), 4 deletions(-)
src/plugins/expire/auth-client.c |    9 +++++----

diffs (26 lines):

diff -r cc484a16bbe4 -r 6dec24ec8218 src/plugins/expire/auth-client.c
--- a/src/plugins/expire/auth-client.c	Sun May 17 20:02:37 2009 -0400
+++ b/src/plugins/expire/auth-client.c	Sun May 17 20:05:36 2009 -0400
@@ -17,10 +17,6 @@ static void auth_set_env(const char *use
 	const char *const *fields, *key, *value;
 	unsigned int i, count;
 
-	if (reply->gid != (gid_t)-1 && getegid() != reply->gid) {
-		env_put(t_strconcat("RESTRICT_SETGID=",
-				    dec2str(reply->gid), NULL));
-	}
 	if (reply->chroot != NULL)
 		env_put(t_strconcat("RESTRICT_CHROOT=", reply->chroot, NULL));
 
@@ -42,6 +38,11 @@ static void auth_set_env(const char *use
 		i_error("userdb(%s) didn't return gid and mail_gid not set",
 			user);
 		return;
+	}
+
+	if (reply->gid != (gid_t)-1 && getegid() != reply->gid) {
+		env_put(t_strconcat("RESTRICT_SETGID=",
+				    dec2str(reply->gid), NULL));
 	}
 
 	if (reply->uid != current_uid && current_uid != 0) {