Fix meridian type in getdate.y

Commit d3356bc42191c1896ab06835a2fb245e00471420 (ticket 8927)
incorrectly tagged tMERIDIAN as <Number>.  So while the lexer assigns
meridian values to the Meridian union field, the parser erroneously
reads them from the Number field.  On 64-bit IBM zSystems (s390x),
this can result in using the most recently read number as a meridian
value, leading to an abort in ToSeconds().

Fix the tMERIDIAN token type to be <Meridian>.

[ghudson@mit.edu: edited commit message]

ticket: 9087 (new)
tags: pullup
target_version: 1.20-next

diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y
index b9dceec1eeb61a8a8a5101fe29586e09627d9c6e..d14cf963c52d407a13b39cbce530ce41713a3260 100644 (file)
--- a/src/kadmin/cli/getdate.y
+++ b/src/kadmin/cli/getdate.y
@@ -181,7 +181,8 @@ static time_t       yyRelSeconds;
 
 %token                 tAGO tID tDST tNEVER
 %token <Number>        tDAY tDAYZONE tMINUTE_UNIT tMONTH tMONTH_UNIT
-%token <Number>        tSEC_UNIT tSNUMBER tUNUMBER tZONE tMERIDIAN
+%token <Number>        tSEC_UNIT tSNUMBER tUNUMBER tZONE
+%token <Meridian>      tMERIDIAN
 %type  <Meridian>      o_merid
 
 %%