summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Rische <jrische@redhat.com>2023-02-21 10:03:35 +0100
committerGreg Hudson <ghudson@mit.edu>2023-02-27 18:51:10 -0500
commit0108d7d7fbb1111c062ac580e69e97103662fc2b (patch)
tree29b57f754df5c5ada630165f11e5df1b7115b32e
parent47c2a12830dbd7fb8e13c239ddc0ac74129a91f6 (diff)
downloadkrb5-0108d7d7fbb1111c062ac580e69e97103662fc2b.tar.gz
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
-rw-r--r--src/kadmin/cli/getdate.y3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y
index b9dceec1e..d14cf963c 100644
--- 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
%%