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

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

bk: 4cc3d171X1T5z0lUu8IrdLvFjEBCww

diff --cc ntpd/ntp_parser.c
index 5df6c4cfcc8035766394275e59085ecad5d943fb,248545f067c311810f04c9febc68acb6d42aa1bd..98a4edea2e95fda1ecc71f004a3f7a877fe2e7ac
--- 1/ntpd/ntp_parser.c
--- 2/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 057e96a35a1ededa00629685aa00e0de4b4af892,a3e7a075c1d40a58ad41fe6d2ab3729c88f0f11f..606becaddc2b5e8d84e398632da8e03995892063
--- 1/ntpd/ntp_parser.y
--- 2/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