From: Timo Sirainen <tss@iki.fi>
Date: Tue, 21 Jul 2009 19:18:49 +0000 (-0400)
Subject: utc_offset() was broken with year's first/last day if struct tm.tm_gmtoff didn't... 
X-Git-Tag: 2.0.alpha1~405
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=197117ab6fda2ebae8281be52268650e09d8e628;p=thirdparty%2Fdovecot%2Fcore.git

utc_offset() was broken with year's first/last day if struct tm.tm_gmtoff didn't exist.

--HG--
branch : HEAD
---

diff --git a/src/lib/utc-offset.c b/src/lib/utc-offset.c
index 53362dcbcf..903c2f18f0 100644
--- a/src/lib/utc-offset.c
+++ b/src/lib/utc-offset.c
@@ -19,9 +19,11 @@ int utc_offset(struct tm *tm, time_t t ATTR_UNUSED)
 	gtm = *tm;
 
 	/* max offset of 24 hours */
-	if (ltm.tm_yday < gtm.tm_yday)
+	if ((ltm.tm_yday < gtm.tm_yday && ltm.tm_year == gtm.tm_year) ||
+	    ltm.tm_year < gtm.tm_year)
 		offset = -24 * 60;
-	else if (ltm.tm_yday > gtm.tm_yday)
+	else if ((ltm.tm_yday > gtm.tm_yday && ltm.tm_year == gtm.tm_year) ||
+		 ltm.tm_year > gtm.tm_year)
 		offset = 24 * 60;
 	else
 		offset = 0;