From: Timo Sirainen <tss@iki.fi>
Date: Tue, 24 Mar 2009 22:04:18 +0000 (-0400)
Subject: Fix to previous change: Log version mismatch after log initialization.
X-Git-Tag: 1.2.beta4~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d99b09539d38239fef05a47211a78ebc2fd59ce1;p=thirdparty%2Fdovecot%2Fcore.git

Fix to previous change: Log version mismatch after log initialization.

--HG--
branch : HEAD
---

diff --git a/src/login-common/main.c b/src/login-common/main.c
index db002e88a8..980f1abdea 100644
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -256,13 +256,6 @@ static void drop_privileges(unsigned int *max_fds_r)
 {
 	const char *value;
 
-	value = getenv("DOVECOT_VERSION");
-	if (value != NULL && strcmp(value, PACKAGE_VERSION) != 0) {
-		i_fatal("Dovecot version mismatch: "
-			"Master is v%s, login is v"PACKAGE_VERSION" "
-			"(if you don't care, set version_ignore=yes)", value);
-	}
-
 	if (!is_inetd)
 		i_set_failure_internal();
 	else {
@@ -272,6 +265,13 @@ static void drop_privileges(unsigned int *max_fds_r)
 				     value == NULL ? LOG_MAIL : atoi(value));
 	}
 
+	value = getenv("DOVECOT_VERSION");
+	if (value != NULL && strcmp(value, PACKAGE_VERSION) != 0) {
+		i_fatal("Dovecot version mismatch: "
+			"Master is v%s, login is v"PACKAGE_VERSION" "
+			"(if you don't care, set version_ignore=yes)", value);
+	}
+
 	value = getenv("LOGIN_DIR");
 	if (value == NULL)
 		i_fatal("LOGIN_DIR environment missing");