From: Robbie Harwood <rharwood@redhat.com>
Date: Tue, 25 Sep 2018 17:20:55 +0000 (-0400)
Subject: Fix getdate.y compatability with POSIX yacc
X-Git-Tag: krb5-1.17-beta1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F849%2Fhead;p=thirdparty%2Fkrb5.git

Fix getdate.y compatability with POSIX yacc

Commit 28fd0a934cdc7b3b42ce213c6d334d4edf1ab591 muted a warning from
bison about shift/reduce conflicts in the grammer.  However, the
extension for suppressing the warning is bison-only.  Revert that
portion of the change and live with the warning rather than adding
additional conditionalization.  Reported by Michael Osipov.
---

diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y
index cb039acb30..4f0fac2e3f 100644
--- a/src/kadmin/cli/getdate.y
+++ b/src/kadmin/cli/getdate.y
@@ -176,8 +176,9 @@ static time_t	yyRelSeconds;
 
 %}
 
-/* Mute shift/reduce warning as per header comment. */
-%expect 4
+/* This would mute the shift/reduce warnings as per header comment; however,
+ * it relies on bison extensions. */
+/* %expect 4 */
 
 %union {
     time_t		Number;