From: Dave Hart <hart@ntp.org>
Date: Sun, 24 Oct 2010 06:25:53 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1675
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=386df120b442d62b7ebb3c2b5bdffe4b44424c7a;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1675
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1675

bk: 4cc3d171X1T5z0lUu8IrdLvFjEBCww
---

386df120b442d62b7ebb3c2b5bdffe4b44424c7a
diff --cc ntpd/ntp_parser.c
index 5df6c4cfcc,248545f067..98a4edea2e
--- a/ntpd/ntp_parser.c
+++ b/ntpd/ntp_parser.c
@@@ -2517,8 -2465,15 +2517,15 @@@ yyreduce
    case 81:
  
  /* Line 1464 of yacc.c  */
 -#line 558 "ntp_parser.y"
 -    { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Double)); }
 +#line 595 "ntp_parser.y"
 +    { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); }
+     break;
+ 
+   case 82:
+ 
+ /* Line 1464 of yacc.c  */
+ #line 560 "ntp_parser.y"
 -    { (yyval.Attr_val) = create_attr_dval((yyvsp[(1) - (2)].Integer), (double)(yyvsp[(2) - (2)].Integer)); }
++    { (yyval.Attr_val) = create_attr_ival((yyvsp[(1) - (2)].Integer), (yyvsp[(2) - (2)].Integer)); }
      break;
  
    case 92:
diff --cc ntpd/ntp_parser.y
index 057e96a35a,a3e7a075c1..606becaddc
--- a/ntpd/ntp_parser.y
+++ b/ntpd/ntp_parser.y
@@@ -592,10 -557,9 +592,10 @@@ tos_optio
  	|	tos_option_dbl_keyword number
  			{ $$ = create_attr_dval($1, $2); }
  	|	T_Cohort boolean
- 			{ $$ = create_attr_ival($1, $2); }
+ 			{ $$ = create_attr_dval($1, (double)$2); }
  	;
  
 +
  tos_option_int_keyword
  	:	T_Ceiling
  	|	T_Floor