From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 20 Mar 2004 00:38:50 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~18109
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c326621751a856cac5327457c94216780d2c903;p=external%2Fglibc.git

Update.

2004-03-19  Ulrich Drepper  <drepper@redhat.com>

	* time/tzfile.c (__tzfile_default): Correct setting of rule_stdoff
	and rule_dstoff after reading the posixrules file.
---

diff --git a/ChangeLog b/ChangeLog
index a339199..fdbb56e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-19  Ulrich Drepper  <drepper@redhat.com>
+
+	* time/tzfile.c (__tzfile_default): Correct setting of rule_stdoff
+	and rule_dstoff after reading the posixrules file.
+
 2004-03-18  Ulrich Drepper  <drepper@redhat.com>
 
 	* malloc/malloc.c (__posix_memalign): Correct alignment check.
diff --git a/Versions.def b/Versions.def
index 67f0e5e..33409f1 100644
--- a/Versions.def
+++ b/Versions.def
@@ -76,6 +76,7 @@ libpthread {
   GLIBC_2.2.6
   GLIBC_2.3.2
   GLIBC_2.3.3
+  GLIBC_2.3.4
   GLIBC_PRIVATE
 }
 libresolv {
diff --git a/time/tzfile.c b/time/tzfile.c
index e2d9f50..2c17825 100644
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1993, 1995-2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993,1995-2001,2003,2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -424,6 +424,12 @@ __tzfile_default (const char *std, const char *dst,
       isdst = trans_type->isdst;
     }
 
+  /* Now that we adjusted the transitions to the requested offsets,
+     reset the rule_stdoff and rule_dstoff values appropriately.  They
+     are used elsewhere.  */
+  rule_stdoff = stdoff;
+  rule_dstoff = dstoff;
+
   /* Reset types 0 and 1 to describe the user's settings.  */
   types[0].idx = 0;
   types[0].offset = stdoff;