From 2418c98f83104cdb87acb722c0916a6a0a8985ab Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Wed, 23 Mar 2005 03:16:06 +0000 Subject: [PATCH] pullup from trunk ticket: 2975 version_fixed: 1.4.1 component: krb5-libs git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17141 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/ChangeLog | 4 ++++ src/lib/krb5/krb/x-deltat.y | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 707870f04..bca160197 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,5 +1,9 @@ 2005-03-22 Tom Yu + * x-deltat.y (wsnum): Add missing semicolon following YYERROR, + which was preventing bison-1.75 from producing compilable C + output. + * gic_keytab.c (krb5_get_init_creds_keytab): When calling krb5_get_init_creds() for the second time (with use_master=1), also accept KRB5_REALM_UNKNOWN as a soft error, and use the result diff --git a/src/lib/krb5/krb/x-deltat.y b/src/lib/krb5/krb/x-deltat.y index 3082b8a5f..ccd956d10 100644 --- a/src/lib/krb5/krb/x-deltat.y +++ b/src/lib/krb5/krb/x-deltat.y @@ -138,7 +138,7 @@ posnum: NUM | LONGNUM ; num: posnum | '-' posnum { $$ = - $2; } ; ws: /* nothing */ | tok_WS ; wsnum: ws num { $$ = $2; } - | ws OVERFLOW { YYERROR }; + | ws OVERFLOW { YYERROR; }; deltat: wsnum 'd' opt_hms { DO ($1, 0, 0, $3); } | wsnum 'h' opt_ms { DO ( 0, $1, 0, $3); } -- 2.26.2