Don't generate invalid POSIX TZ string for Asia/Dhaka timezone.

diff --git a/ChangeLog b/ChangeLog
index dd08e60249f7885786a998848ce450101a5f9edd..14fbf5110488086a663a2cc03589d257a8aad83c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-26  Andreas Schwab  <aschwab@redhat.com>
 
+       * timezone/zic.c (stringzone): Don't try to generate a POSIX TZ
+       string when the timezone ends in DST.
+
        * sysdeps/powerpc/powerpc32/____longjmp_chk.S (CHECK_SP): Save lr
        before call.
        * sysdeps/powerpc/powerpc64/____longjmp_chk.S (CHECK_SP):

diff --git a/timezone/zic.c b/timezone/zic.c
index 01d9f135bd7a8ec48f94396aa4be064a9a22cb60..76df6532a77fecdb53ff61ae92587e0cfb291ea9 100644 (file)
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -1921,7 +1921,7 @@ const int                 zonecount;
                if (stdrp != NULL && stdrp->r_hiyear == 2037)
                        return;
        }
-       if (stdrp == NULL && zp->z_nrules != 0)
+       if (stdrp == NULL && (zp->z_nrules != 0 || zp->z_stdoff != 0))
                return;
        abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar;
        doabbr(result, zp->z_format, abbrvar, FALSE, TRUE);