37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 604fce63b468d0efce4438df4ba0286f00bfce8d Mon Sep 17 00:00:00 2001
|
|
From: Julien Rische <jrische@redhat.com>
|
|
Date: Tue, 21 Feb 2023 10:03:35 +0100
|
|
Subject: [PATCH] Fix meridian type in kadmin datetime parser
|
|
|
|
The meridian suffix is typed as "Number" in kadmin YACC file for
|
|
datetime parsing, while it should be using the "Meridian" enumeration
|
|
one.
|
|
|
|
This results in invalid Meridian value on 64-bit IBM zSystems (s390x),
|
|
causing core dumped errors on most kadmin commands where meridian
|
|
suffices are used.
|
|
|
|
Upstream PR:
|
|
https://github.com/krb5/krb5/pull/1290
|
|
---
|
|
src/kadmin/cli/getdate.y | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y
|
|
index b9dceec1ee..d14cf963c5 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
|
|
|
|
%%
|
|
--
|
|
2.39.1
|
|
|