[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at whimsy.udel.edu
Wed Jun 20 05:47:59 UTC 2007


#### ChangeSet ####
2007-06-19 03:13:46-04:00, stenn at pogo.udel.edu 
  regenerated ntp_parser.c

==== ntpd/ntp_parser.c ====
2007-06-19 03:13:33-04:00, stenn at pogo.udel.edu +504 -493
  regenerated file

--- 1.12/ntpd/ntp_parser.c	2007-06-19 02:36:01 -04:00
+++ 1.13/ntpd/ntp_parser.c	2007-06-19 03:13:33 -04:00
@@ -1,4 +1,4 @@
-/* A Bison parser, made from /backroom/ntp-dev/A.whimsy/ntpd/../../ntpd/ntp_parser.y
+/* A Bison parser, made from /usa/neal/neal.ntp-dev/A.pogo/ntpd/../../ntpd/ntp_parser.y
    by GNU bison 1.35.  */
 
 #define YYBISON 1  /* Identify Bison output.  */
@@ -188,6 +188,7 @@
 
   #define YYERROR_VERBOSE
   void yyerror (char *msg);
+  extern int input_from_file;  /* 0=input from ntpq>config command buffer */
 
   /* SK: The following is a terrible hack to allow the NTP code to be built
    * without OPENSSL. The following symbols need to be defined in the 
@@ -212,7 +213,7 @@
  #define CRYPTO_CONF_IDENT 12    
 #endif
 
-#line 69 "ntp_parser.y"
+#line 70 "ntp_parser.y"
 #ifndef YYSTYPE
 typedef union {
     char   *String;
@@ -309,13 +310,13 @@ static const short yyprhs[] =
      327,   330,   334,   337,   339,   342,   345,   348,   351,   354,
      357,   360,   363,   366,   369,   372,   374,   376,   378,   380,
      382,   384,   386,   388,   391,   394,   396,   399,   402,   405,
-     408,   411,   414,   417,   421,   423,   426,   429,   432,   436,
-     439,   442,   445,   448,   451,   454,   458,   461,   462,   464,
-     469,   473,   476,   478,   481,   484,   487,   489,   492,   494,
-     496,   498,   500,   503,   505,   508,   510,   513,   515,   517,
-     519,   521,   523,   525,   531,   533,   537,   540,   544,   548,
-     551,   553,   559,   564,   568,   570,   572,   575,   577,   584,
-     588,   591,   595,   599,   603,   607
+     408,   411,   414,   417,   421,   423,   426,   429,   432,   435,
+     438,   441,   444,   447,   450,   453,   457,   460,   462,   465,
+     466,   471,   475,   478,   480,   483,   486,   489,   491,   494,
+     496,   498,   500,   502,   505,   507,   510,   512,   515,   517,
+     519,   521,   523,   525,   527,   533,   535,   539,   542,   546,
+     550,   553,   555,   561,   566,   570,   572,   574,   577,   579,
+     586,   590,   593,   597,   601,   605,   609
 };
 static const short yyrhs[] =
 {
@@ -362,25 +363,25 @@ static const short yyrhs[] =
      206,     0,    42,   206,     0,    46,   206,     0,    98,   206,
        0,   122,   206,     0,   123,   206,     0,    53,   125,   160,
        0,    33,     0,    13,   206,     0,    16,    54,     0,   127,
-     206,     0,    30,   125,   195,     0,   103,   125,     0,    65,
-     125,     0,     7,    54,     0,    64,   199,     0,   101,   203,
-       0,   117,   196,     0,   132,   164,   197,     0,   135,   202,
-       0,     0,    54,     0,   125,   153,   125,    25,     0,   125,
-     153,   125,     0,   197,   198,     0,   198,     0,   105,    54,
-       0,    55,   164,     0,   199,   200,     0,   200,     0,   201,
-     125,     0,   125,     0,   154,     0,   155,     0,   153,     0,
-     202,    54,     0,    54,     0,   203,   125,     0,   125,     0,
-     204,   163,     0,   163,     0,    54,     0,   133,     0,    34,
-       0,    54,     0,    29,     0,   208,   156,   209,   211,   157,
-       0,   143,     0,   209,   210,   142,     0,   210,   142,     0,
-     144,   153,   206,     0,   145,   153,   206,     0,   211,   212,
-       0,   212,     0,   214,   156,   213,   216,   157,     0,   146,
-     153,   206,   142,     0,   116,   153,   215,     0,   164,     0,
-     125,     0,   216,   217,     0,   217,     0,   147,   153,   206,
-     156,   218,   157,     0,   218,   219,   142,     0,   219,   142,
-       0,   148,   153,   206,     0,   149,   153,   206,     0,   150,
-     153,   206,     0,   151,   153,   206,     0,   152,   153,   206,
-       0
+     206,     0,    30,   195,     0,   103,   125,     0,    65,   125,
+       0,     7,    54,     0,    64,   199,     0,   101,   203,     0,
+     117,   196,     0,   132,   164,   197,     0,   135,   202,     0,
+     125,     0,   125,    54,     0,     0,   125,   153,   125,    25,
+       0,   125,   153,   125,     0,   197,   198,     0,   198,     0,
+     105,    54,     0,    55,   164,     0,   199,   200,     0,   200,
+       0,   201,   125,     0,   125,     0,   154,     0,   155,     0,
+     153,     0,   202,    54,     0,    54,     0,   203,   125,     0,
+     125,     0,   204,   163,     0,   163,     0,    54,     0,   133,
+       0,    34,     0,    54,     0,    29,     0,   208,   156,   209,
+     211,   157,     0,   143,     0,   209,   210,   142,     0,   210,
+     142,     0,   144,   153,   206,     0,   145,   153,   206,     0,
+     211,   212,     0,   212,     0,   214,   156,   213,   216,   157,
+       0,   146,   153,   206,   142,     0,   116,   153,   215,     0,
+     164,     0,   125,     0,   216,   217,     0,   217,     0,   147,
+     153,   206,   156,   218,   157,     0,   218,   219,   142,     0,
+     219,   142,     0,   148,   153,   206,     0,   149,   153,   206,
+       0,   150,   153,   206,     0,   151,   153,   206,     0,   152,
+     153,   206,     0
 };
 
 #endif
@@ -389,29 +390,29 @@ static const short yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
 static const short yyrline[] =
 {
-       0,   300,   304,   305,   310,   318,   319,   320,   321,   322,
-     323,   324,   325,   326,   327,   328,   329,   337,   343,   352,
-     353,   354,   355,   356,   360,   361,   362,   378,   379,   383,
-     384,   389,   390,   391,   392,   393,   394,   395,   396,   397,
-     398,   399,   400,   401,   411,   413,   415,   417,   428,   430,
-     432,   438,   440,   442,   444,   446,   451,   452,   456,   458,
-     460,   462,   464,   466,   468,   470,   472,   474,   484,   489,
-     490,   494,   496,   498,   500,   502,   504,   506,   508,   510,
-     512,   514,   524,   526,   528,   536,   537,   541,   543,   545,
-     547,   549,   551,   556,   557,   561,   562,   563,   564,   565,
-     566,   570,   571,   572,   573,   574,   575,   576,   585,   587,
-     592,   597,   605,   606,   610,   611,   612,   613,   614,   615,
-     616,   617,   618,   619,   620,   621,   625,   626,   630,   631,
-     632,   640,   645,   646,   650,   652,   654,   656,   658,   660,
-     662,   664,   673,   675,   680,   681,   685,   686,   687,   688,
-     689,   690,   692,   700,   704,   705,   709,   710,   711,   712,
-     713,   714,   715,   723,   739,   745,   747,   749,   751,   754,
-     756,   758,   761,   763,   765,   767,   769,   773,   774,   779,
-     781,   787,   788,   792,   793,   798,   799,   803,   804,   821,
-     822,   823,   832,   833,   837,   838,   842,   843,   847,   856,
-     857,   861,   862,   870,   885,   889,   890,   894,   895,   899,
-     900,   904,   909,   913,   917,   918,   922,   923,   927,   932,
-     933,   937,   939,   941,   943,   945
+       0,   301,   305,   306,   311,   321,   322,   323,   324,   325,
+     326,   327,   328,   329,   330,   331,   332,   340,   346,   355,
+     356,   357,   358,   359,   363,   364,   365,   381,   382,   386,
+     387,   392,   393,   394,   395,   396,   397,   398,   399,   400,
+     401,   402,   403,   404,   414,   416,   418,   420,   431,   433,
+     435,   441,   443,   445,   447,   449,   454,   455,   459,   461,
+     463,   465,   467,   469,   471,   473,   475,   477,   487,   492,
+     493,   497,   499,   501,   503,   505,   507,   509,   511,   513,
+     515,   517,   527,   529,   531,   539,   540,   544,   546,   548,
+     550,   552,   554,   559,   560,   564,   565,   566,   567,   568,
+     569,   573,   574,   575,   576,   577,   578,   579,   588,   590,
+     595,   600,   608,   609,   613,   614,   615,   616,   617,   618,
+     619,   620,   621,   622,   623,   624,   628,   629,   633,   634,
+     635,   643,   648,   649,   653,   655,   657,   659,   661,   663,
+     665,   667,   676,   678,   683,   684,   688,   689,   690,   691,
+     692,   693,   695,   703,   707,   708,   712,   713,   714,   715,
+     716,   717,   718,   726,   742,   748,   750,   752,   754,   757,
+     759,   761,   764,   766,   768,   770,   772,   776,   778,   781,
+     786,   788,   794,   795,   799,   800,   805,   806,   810,   811,
+     828,   829,   830,   839,   840,   844,   845,   849,   850,   854,
+     863,   864,   868,   869,   877,   892,   896,   897,   901,   902,
+     906,   907,   911,   916,   920,   924,   925,   929,   930,   934,
+     939,   940,   944,   946,   948,   950,   952
 };
 #endif
 
@@ -491,12 +492,12 @@ static const short yyr1[] =
      187,   187,   188,   188,   189,   189,   190,   190,   190,   190,
      190,   190,   190,   191,   192,   192,   193,   193,   193,   193,
      193,   193,   193,   194,   194,   194,   194,   194,   194,   194,
-     194,   194,   194,   194,   194,   194,   194,   195,   195,   196,
-     196,   197,   197,   198,   198,   199,   199,   200,   200,   201,
-     201,   201,   202,   202,   203,   203,   204,   204,   205,   205,
-     205,   206,   206,   207,   208,   209,   209,   210,   210,   211,
-     211,   212,   213,   214,   215,   215,   216,   216,   217,   218,
-     218,   219,   219,   219,   219,   219
+     194,   194,   194,   194,   194,   194,   194,   195,   195,   195,
+     196,   196,   197,   197,   198,   198,   199,   199,   200,   200,
+     201,   201,   201,   202,   202,   203,   203,   204,   204,   205,
+     205,   205,   206,   206,   207,   208,   209,   209,   210,   210,
+     211,   211,   212,   213,   214,   215,   215,   216,   216,   217,
+     218,   218,   219,   219,   219,   219,   219
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -518,13 +519,13 @@ static const short yyr2[] =
        2,     3,     2,     1,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     1,     1,     1,     1,     1,
        1,     1,     1,     2,     2,     1,     2,     2,     2,     2,
-       2,     2,     2,     3,     1,     2,     2,     2,     3,     2,
-       2,     2,     2,     2,     2,     3,     2,     0,     1,     4,
-       3,     2,     1,     2,     2,     2,     1,     2,     1,     1,
-       1,     1,     2,     1,     2,     1,     2,     1,     1,     1,
-       1,     1,     1,     5,     1,     3,     2,     3,     3,     2,
-       1,     5,     4,     3,     1,     1,     2,     1,     6,     3,
-       2,     3,     3,     3,     3,     3
+       2,     2,     2,     3,     1,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     3,     2,     1,     2,     0,
+       4,     3,     2,     1,     2,     2,     2,     1,     2,     1,
+       1,     1,     1,     2,     1,     2,     1,     2,     1,     1,
+       1,     1,     1,     1,     5,     1,     3,     2,     3,     3,
+       2,     1,     5,     4,     3,     1,     1,     2,     1,     6,
+       3,     2,     3,     3,     3,     3,     3
 };
 
 /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
@@ -533,223 +534,225 @@ static const short yyr2[] =
 static const short yydefact[] =
 {
        0,     0,     0,     0,    22,    44,     0,     0,     0,     0,
-       0,     0,     0,     0,   164,     0,     0,     0,     0,     0,
+       0,     0,   179,     0,   164,     0,     0,     0,     0,     0,
        0,     0,    23,     0,     0,    21,     0,     0,    20,     0,
        0,     0,    19,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   204,     1,     0,     6,     0,     7,     8,    11,
+       0,     0,   205,     1,     0,     6,     0,     7,     8,    11,
        9,    10,    12,    13,    14,    15,    16,     0,     4,    48,
-     171,    45,   202,   201,   165,   166,    49,     0,     0,     0,
+     171,    45,   203,   202,   165,   166,    49,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,    50,    57,   146,
      147,   148,   149,   150,   151,   152,   143,   145,     0,     0,
-       0,   108,   127,   177,   142,    87,    88,    89,    90,    91,
-      92,     0,    27,    28,     0,    25,     0,    24,     5,    51,
-      52,   188,   191,   189,   190,   172,   186,     0,   170,   197,
-      46,    47,   195,   173,   169,    53,   112,   112,    24,    54,
-       0,   174,    82,    86,    83,   167,     0,     0,     0,     0,
-       0,     0,     0,   153,   155,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    68,    70,     0,   193,
-      55,   176,     0,     3,    18,     0,    58,    65,    61,    63,
-      64,    59,    66,    67,    60,    62,    56,   144,   128,   129,
-     130,   126,   178,   168,   100,    99,     0,    97,    98,     0,
+       0,   108,   127,   177,   168,   142,    87,    88,    89,    90,
+      91,    92,     0,    27,    28,     0,    25,     0,    24,     5,
+      51,    52,   189,   192,   190,   191,   172,   187,     0,   170,
+     198,    46,    47,   196,   173,   169,    53,   112,   112,    24,
+      54,     0,   174,    82,    86,    83,   167,     0,     0,     0,
+       0,     0,     0,     0,   153,   155,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    68,    70,     0,
+     194,    55,   176,     0,     3,    18,     0,    58,    65,    61,
+      63,    64,    59,    66,    67,    60,    62,    56,   144,   128,
+     129,   130,   126,   178,   100,    99,     0,    97,    98,     0,
       84,    94,    26,     0,     0,     0,     0,     0,     0,     0,
-       0,   131,   133,   163,   185,   187,   196,   194,   110,   109,
+       0,   131,   133,   163,   186,   188,   197,   195,   110,   109,
        0,     0,    85,   156,   157,   158,   159,   160,   161,   162,
-     154,    80,    71,   200,   198,   199,    73,    72,    78,    76,
-      81,    77,    75,    79,    74,    69,     0,     0,   175,   182,
-     192,     2,    31,    32,    33,     0,     0,     0,     0,    37,
+     154,    80,    71,   201,   199,   200,    73,    72,    78,    76,
+      81,    77,    75,    79,    74,    69,     0,     0,   175,   183,
+     193,     2,    31,    32,    33,     0,     0,     0,     0,    37,
       38,    39,    40,     0,     0,    17,    30,     0,     0,     0,
        0,    95,   107,   103,   105,   101,   102,   104,   106,    96,
       93,   138,   139,   140,   141,   137,   136,   134,   135,   132,
      114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
-     124,   125,   113,   112,   180,   184,   183,   181,    34,    36,
+     124,   125,   113,   112,   181,   185,   184,   182,    34,    36,
       35,    42,    41,    43,    29,     0,     0,     0,     0,     0,
-     210,     0,   206,   111,   179,   207,   208,     0,   205,   203,
-     209,     0,   215,   214,   213,     0,     0,     0,     0,     0,
-     217,     0,     0,   211,   216,   212,     0,     0,     0,     0,
+     211,     0,   207,   111,   180,   208,   209,     0,   206,   204,
+     210,     0,   216,   215,   214,     0,     0,     0,     0,     0,
+     218,     0,     0,   212,   217,   213,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     218,     0,   220,   221,   222,   223,   224,   225,   219,     0,
+     219,     0,   221,   222,   223,   224,   225,   226,   220,     0,
        0,     0
 };
 
 static const short yydefgoto[] =
 {
-     359,    43,    44,    45,    46,   119,   107,   255,   256,    47,
-      48,    77,    78,    49,   156,   157,    50,   132,   101,   190,
+     359,    43,    44,    45,    46,   120,   108,   255,   256,    47,
+      48,    77,    78,    49,   157,   158,    50,   133,   102,   190,
      191,   269,    51,   208,   292,    91,    92,    52,   201,   202,
-      53,    86,    87,    54,   143,   144,    55,   183,   131,   238,
-     239,   115,   116,   117,   160,   123,   120,   226,    64,    56,
+      53,    86,    87,    54,   144,   145,    55,    94,   132,   238,
+     239,   116,   117,   118,   161,   124,   121,   226,    64,    56,
       57,   259,   260,   309,   310,   326,   311,   324,   329,   330,
      343,   344
 };
 
 static const short yypact[] =
 {
-       8,  -130,   -31,   -27,-32768,   -62,   -18,   -11,    -8,   190,
-      -2,    -3,   -77,    -2,-32768,    62,    40,   -66,   -60,   -54,
-      47,   -45,-32768,    40,    40,-32768,   -35,   -33,-32768,    30,
-      35,    32,-32768,   -17,    62,    -6,   -18,    22,   139,    15,
-      80,    80,-32768,   163,    -5,-32768,    40,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   -15,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,    21,    23,    33,
-      36,    46,    52,    53,    57,    58,    61,   190,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,    -2,-32768,    93,   103,
-     133,    -3,-32768,   137,    -2,-32768,-32768,-32768,-32768,-32768,
-  -32768,   -10,-32768,-32768,    67,-32768,   221,-32768,   308,-32768,
-  -32768,-32768,-32768,-32768,-32768,    47,-32768,    69,-32768,-32768,
-      40,    40,-32768,    72,-32768,-32768,-32768,-32768,   128,-32768,
-      50,-32768,    62,-32768,-32768,-32768,   -18,   -18,   -18,   -18,
-     -18,   -18,   -18,    22,-32768,   150,   151,     3,   155,   -18,
-     -18,   159,   -18,   -18,   165,   166,   139,-32768,   -49,-32768,
-     169,   169,    75,-32768,   325,   -48,-32768,-32768,-32768,-32768,
+      26,  -125,   -34,   -26,-32768,   -64,   -23,     0,     6,   363,
+      78,    -5,   -60,    78,-32768,    44,   -43,   -57,   -52,   -50,
+     -55,   -48,-32768,   -43,   -43,-32768,   -47,   -45,-32768,    27,
+     140,    32,-32768,   -37,    44,    -9,   -23,    15,   176,    -7,
+      35,    35,-32768,   203,   -46,-32768,   -43,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   -32,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,     1,     7,     8,
+      11,    21,    25,    41,    46,    47,    53,   363,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,    78,-32768,    77,    81,
+      97,    -5,-32768,    98,-32768,    78,-32768,-32768,-32768,-32768,
+  -32768,-32768,   -14,-32768,-32768,    55,-32768,   152,-32768,   336,
+  -32768,-32768,-32768,-32768,-32768,-32768,   -55,-32768,    57,-32768,
+  -32768,   -43,   -43,-32768,    59,-32768,-32768,-32768,-32768,   127,
+  -32768,    52,-32768,    44,-32768,-32768,-32768,   -23,   -23,   -23,
+     -23,   -23,   -23,   -23,    15,-32768,   150,   157,   -10,   164,
+     -23,   -23,   166,   -23,   -23,   167,   168,   176,-32768,   -41,
+  -32768,   169,   169,    64,-32768,   105,  -122,-32768,-32768,-32768,
   -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,    99,-32768,-32768,    28,
-     -10,-32768,-32768,     3,     3,     3,     3,   100,   172,   -18,
-     -18,   221,-32768,-32768,-32768,-32768,-32768,-32768,   385,   385,
-      15,   105,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,   101,-32768,-32768,    10,
+     -14,-32768,-32768,   -10,   -10,   -10,   -10,   102,   174,   -23,
+     -23,   152,-32768,-32768,-32768,-32768,-32768,-32768,   394,   394,
+      -7,   106,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
   -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,    15,   175,   -49,-32768,
-  -32768,-32768,-32768,-32768,-32768,   179,   183,   184,   185,-32768,
-  -32768,-32768,-32768,   188,   189,   325,-32768,    91,    92,   -46,
-     106,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,    -7,   178,   -41,-32768,
+  -32768,-32768,-32768,-32768,-32768,   180,   183,   187,   189,-32768,
+  -32768,-32768,-32768,   190,   191,   105,-32768,   100,   104,  -109,
+     108,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
   -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
   -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,   222,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,   -18,   -18,    96,   108,  -108,
-  -32768,   101,-32768,   385,-32768,-32768,-32768,   -30,-32768,-32768,
-  -32768,   117,-32768,-32768,-32768,   112,   121,   -18,   118,  -102,
-  -32768,   130,   -18,-32768,-32768,-32768,   119,   104,   120,   132,
-     134,   136,   148,   205,   141,   -18,   -18,   -18,   -18,   -18,
-  -32768,   144,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   281,
+  -32768,-32768,-32768,-32768,   229,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,   -23,   -23,   107,   116,   -91,
+  -32768,   103,-32768,   394,-32768,-32768,-32768,     3,-32768,-32768,
+  -32768,   117,-32768,-32768,-32768,   113,   128,   -23,   121,  -131,
+  -32768,   135,   -23,-32768,-32768,-32768,   122,   149,   126,   129,
+     130,   131,   132,    51,   145,   -23,   -23,   -23,   -23,   -23,
+  -32768,   147,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   290,
      292,-32768
 };
 
 static const short yypgoto[] =
 {
-  -32768,-32768,   -39,-32768,-32768,    12,   -29,-32768,    48,-32768,
-  -32768,-32768,   225,-32768,-32768,   160,-32768,-32768,    -1,-32768,
-     114,-32768,-32768,  -125,-32768,-32768,   216,-32768,-32768,   116,
-  -32768,   305,   -47,-32768,-32768,   180,-32768,-32768,-32768,-32768,
-      84,-32768,   210,-32768,   285,-32768,   303,   -41,   -36,-32768,
-  -32768,-32768,    73,-32768,    19,-32768,-32768,-32768,-32768,     7,
-  -32768,     0
+  -32768,-32768,   -35,-32768,-32768,    -1,   -29,-32768,    38,-32768,
+  -32768,-32768,   217,-32768,-32768,   138,-32768,-32768,   -25,-32768,
+     115,-32768,-32768,  -126,-32768,-32768,   212,-32768,-32768,   114,
+  -32768,   295,   -40,-32768,-32768,   170,-32768,-32768,-32768,-32768,
+      83,-32768,   207,-32768,   284,-32768,   302,   -19,   -36,-32768,
+  -32768,-32768,    68,-32768,    19,-32768,-32768,-32768,-32768,     2,
+  -32768,   -11
 };
 
 
-#define	YYLAST		522
+#define	YYLAST		531
 
 
 static const short yytable[] =
 {
-     135,   128,   209,    79,   162,    88,   236,    80,   307,     1,
-     158,    62,    58,    81,     2,     3,   184,   102,   103,     4,
-       5,     6,   185,    59,     7,   186,   136,    60,   106,     8,
-       9,   262,    61,   133,    10,    11,    63,   223,    12,   177,
-      13,    14,   127,    65,    15,   328,    66,   177,    93,   319,
-     137,    16,   263,   187,    82,   333,   237,   224,   164,   108,
-     126,    17,   102,   103,   138,   109,    18,    19,   139,   203,
-     307,   110,    20,    21,    89,   188,    22,    23,    90,    83,
-     118,    95,   102,   103,   125,    96,   129,   102,   103,   104,
-     122,    24,   124,    84,   104,   322,   257,   258,   257,   258,
-     213,   214,   215,   216,   217,   218,   219,    25,   130,    26,
-     264,    27,    28,   228,   229,   265,   231,   232,    85,   134,
-     140,    29,    30,    31,    32,    33,   189,    34,    97,    35,
-     266,   212,   206,   206,   159,    36,   225,   163,    37,    38,
-      39,   165,    40,    41,   141,   142,   166,   178,   167,   145,
-      -5,    42,   271,   272,   273,   274,   146,   179,   168,   147,
-     105,   169,    98,   277,   278,   105,   267,   268,   313,     2,
-       3,   170,   111,    99,     4,     5,     6,   171,   172,     7,
-     148,   293,   173,   174,     8,     9,   175,   180,   100,    10,
-      11,   182,   192,    12,   205,    13,    14,   207,   210,    15,
-     112,   113,   114,   211,   221,   222,    16,   295,    67,   227,
-     149,   150,   151,   230,   152,   153,    17,   241,   154,   233,
-     234,    18,    19,   240,   261,   275,   276,    20,    21,   296,
-     294,    22,    23,   298,    68,    69,   155,   299,   300,   301,
-      70,    71,   302,   303,   305,   306,    24,   314,   312,   317,
-     318,    72,   338,   339,   340,   341,   342,   321,   193,   194,
-     195,   196,    25,   325,    26,   327,    27,    28,   328,   315,
-     316,   332,   335,   345,    73,   337,    29,    30,    31,    32,
-      33,   360,    34,   352,    35,   346,   358,   347,   323,   348,
-      36,   331,   361,    37,    38,    39,   336,    40,    41,    74,
-      75,   349,   176,   304,   270,    -5,    42,   181,    76,   353,
-     354,   355,   356,   357,     2,     3,   235,   279,    94,     4,
-       5,     6,   297,   220,     7,   204,   161,   121,   320,     8,
-       9,   242,   308,   197,    10,    11,   334,     0,    12,   243,
-      13,    14,     0,   351,    15,   198,     0,     0,     0,   199,
-     200,    16,     0,   338,   339,   340,   341,   342,     0,     0,
-       0,    17,   350,     0,     0,     0,    18,    19,     0,     0,
-       0,     0,    20,    21,   244,     0,    22,    23,     0,     0,
-       0,     0,   245,     0,     0,     0,     0,     0,     0,     0,
-       0,    24,     0,     0,     0,     0,     0,     0,     0,   246,
-       0,     0,     0,   247,     0,   248,     0,    25,     0,    26,
-       0,    27,    28,     0,     0,   249,     0,     0,     0,     0,
-       0,    29,    30,    31,    32,    33,     0,    34,     0,    35,
-       0,     0,   250,   251,     0,    36,     0,   280,    37,    38,
-      39,     0,    40,    41,     0,   281,     0,   282,     0,     0,
-       0,    42,   283,     0,     0,     0,     0,     0,   252,     0,
-     253,     0,   254,     0,     0,     0,     0,     0,     0,     0,
-       0,   284,     0,   285,   286,     0,   287,   288,   289,     0,
-       0,   290,     0,     0,     0,     0,     0,     0,     0,     0,
+     136,   129,   209,    88,   103,   104,    62,   307,   163,   134,
+     159,   105,   184,   262,   236,   107,   328,    58,   185,   137,
+      59,   186,   257,   258,   223,   307,   333,     1,    60,   128,
+      61,    63,     2,     3,   263,   257,   258,     4,     5,     6,
+     103,   104,     7,   138,   224,   165,   178,     8,     9,   187,
+     103,   104,    10,    11,    65,   178,    12,   139,    13,    14,
+      66,   140,    15,    96,   237,    93,   319,    97,   109,    16,
+     112,   188,    89,   110,   203,   111,    90,   119,   123,    17,
+     125,   126,   106,    79,    18,    19,   130,    80,   131,   160,
+      20,    21,   264,    81,    22,    23,   164,   265,   113,   114,
+     115,   213,   214,   215,   216,   217,   218,   219,   212,    24,
+      98,   242,   266,   141,   228,   229,   135,   231,   232,   243,
+     206,   206,   189,   225,   166,    25,   167,    26,   322,    27,
+      28,   179,   168,   169,    82,   180,   170,   142,   143,    29,
+      30,    31,    32,    33,    99,    34,   171,    35,   267,   268,
+     172,   181,   183,    36,   244,   100,    37,    38,    39,    83,
+      40,    41,   245,   277,   278,   127,   173,   313,    -5,    42,
+     101,   174,   175,    84,   271,   272,   273,   274,   176,   246,
+     192,   293,   205,   247,   207,   248,   146,   103,   104,   193,
+     194,   195,   196,   147,   105,   249,   148,   210,    85,   338,
+     339,   340,   341,   342,   221,   211,   241,   295,   350,     2,
+       3,   222,   250,   251,     4,     5,     6,   149,   227,     7,
+     230,   233,   234,   240,     8,     9,   261,   275,   276,    10,
+      11,   294,   296,    12,   298,    13,    14,   299,   252,    15,
+     253,   300,   254,   301,   302,   303,    16,   150,   151,   152,
+     312,   153,   154,   305,   314,   155,    17,   306,   318,   321,
+     317,    18,    19,   325,   197,   106,   327,    20,    21,   315,
+     316,    22,    23,   156,   332,   328,   198,   335,   337,   345,
+     199,   200,   346,   347,   348,   349,    24,   352,   323,   358,
+     360,   331,   361,   304,   177,   235,   336,   338,   339,   340,
+     341,   342,    25,   182,    26,   270,    27,    28,    95,   353,
+     354,   355,   356,   357,   220,   279,    29,    30,    31,    32,
+      33,   297,    34,   204,    35,   162,   122,   308,   320,     0,
+      36,   334,   351,    37,    38,    39,     0,    40,    41,     0,
+       0,     0,     2,     3,     0,    -5,    42,     4,     5,     6,
+       0,     0,     7,     0,     0,     0,     0,     8,     9,     0,
+       0,     0,    10,    11,     0,     0,    12,     0,    13,    14,
+       0,     0,    15,     0,     0,     0,     0,     0,     0,    16,
+       0,    67,     0,     0,     0,     0,     0,     0,     0,    17,
+       0,     0,     0,     0,    18,    19,     0,     0,     0,     0,
+      20,    21,     0,     0,    22,    23,     0,    68,    69,     0,
+       0,     0,     0,    70,    71,     0,     0,     0,     0,    24,
+       0,     0,     0,     0,    72,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    25,     0,    26,     0,    27,
+      28,     0,     0,     0,     0,     0,   280,    73,     0,    29,
+      30,    31,    32,    33,   281,    34,   282,    35,     0,     0,
+       0,   283,     0,    36,     0,     0,    37,    38,    39,     0,
+      40,    41,    74,    75,     0,     0,     0,     0,     0,    42,
+     284,    76,   285,   286,     0,   287,   288,   289,     0,     0,
+     290,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   291
+       0,   291
 };
 
 static const short yycheck[] =
 {
-      36,    30,   127,     5,    43,     8,    55,     9,   116,     1,
-      39,    29,   142,    15,     6,     7,    26,    47,    48,    11,
-      12,    13,    32,    54,    16,    35,     4,    54,    16,    21,
-      22,     3,    94,    34,    26,    27,    54,    34,    30,    86,
-      32,    33,    30,    54,    36,   147,    54,    94,   125,   157,
-      28,    43,    24,    63,    56,   157,   105,    54,    46,   125,
-      25,    53,    47,    48,    42,   125,    58,    59,    46,   108,
-     116,   125,    64,    65,    77,    85,    68,    69,    81,    81,
-     125,    19,    47,    48,    54,    23,    54,    47,    48,    54,
-     125,    83,   125,    95,    54,   125,   144,   145,   144,   145,
-     136,   137,   138,   139,   140,   141,   142,    99,   125,   101,
-      82,   103,   104,   149,   150,    87,   152,   153,   120,   125,
-      98,   113,   114,   115,   116,   117,   136,   119,    66,   121,
-     102,   132,   120,   121,    54,   127,   133,   142,   130,   131,
-     132,   156,   134,   135,   122,   123,   125,    54,   125,    10,
-     142,   143,   193,   194,   195,   196,    17,    54,   125,    20,
-     125,   125,   100,   199,   200,   125,   138,   139,   293,     6,
-       7,   125,   125,   111,    11,    12,    13,   125,   125,    16,
-      41,   210,   125,   125,    21,    22,   125,    54,   126,    26,
-      27,    54,   125,    30,   125,    32,    33,   125,    70,    36,
-     153,   154,   155,   153,    54,    54,    43,   236,    18,    54,
-      71,    72,    73,    54,    75,    76,    53,   142,    79,    54,
-      54,    58,    59,    54,   125,   125,    54,    64,    65,    54,
-     125,    68,    69,    54,    44,    45,    97,    54,    54,    54,
-      50,    51,    54,    54,   153,   153,    83,    25,   142,   153,
-     142,    61,   148,   149,   150,   151,   152,   156,    37,    38,
-      39,    40,    99,   146,   101,   153,   103,   104,   147,   305,
-     306,   153,   142,   153,    84,   156,   113,   114,   115,   116,
-     117,     0,   119,   142,   121,   153,   142,   153,   317,   153,
-     127,   327,     0,   130,   131,   132,   332,   134,   135,   109,
-     110,   153,    77,   255,   190,   142,   143,    91,   118,   345,
-     346,   347,   348,   349,     6,     7,   156,   201,    13,    11,
-      12,    13,   238,   143,    16,   115,    41,    24,   309,    21,
-      22,     6,   259,   112,    26,    27,   329,    -1,    30,    14,
-      32,    33,    -1,   343,    36,   124,    -1,    -1,    -1,   128,
-     129,    43,    -1,   148,   149,   150,   151,   152,    -1,    -1,
-      -1,    53,   157,    -1,    -1,    -1,    58,    59,    -1,    -1,
-      -1,    -1,    64,    65,    49,    -1,    68,    69,    -1,    -1,
-      -1,    -1,    57,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    83,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    74,
-      -1,    -1,    -1,    78,    -1,    80,    -1,    99,    -1,   101,
-      -1,   103,   104,    -1,    -1,    90,    -1,    -1,    -1,    -1,
-      -1,   113,   114,   115,   116,   117,    -1,   119,    -1,   121,
-      -1,    -1,   107,   108,    -1,   127,    -1,    52,   130,   131,
-     132,    -1,   134,   135,    -1,    60,    -1,    62,    -1,    -1,
-      -1,   143,    67,    -1,    -1,    -1,    -1,    -1,   133,    -1,
-     135,    -1,   137,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    86,    -1,    88,    89,    -1,    91,    92,    93,    -1,
-      -1,    96,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      36,    30,   128,     8,    47,    48,    29,   116,    43,    34,
+      39,    54,    26,     3,    55,    16,   147,   142,    32,     4,
+      54,    35,   144,   145,    34,   116,   157,     1,    54,    30,
+      94,    54,     6,     7,    24,   144,   145,    11,    12,    13,
+      47,    48,    16,    28,    54,    46,    86,    21,    22,    63,
+      47,    48,    26,    27,    54,    95,    30,    42,    32,    33,
+      54,    46,    36,    19,   105,   125,   157,    23,   125,    43,
+     125,    85,    77,   125,   109,   125,    81,   125,   125,    53,
+     125,    54,   125,     5,    58,    59,    54,     9,   125,    54,
+      64,    65,    82,    15,    68,    69,   142,    87,   153,   154,
+     155,   137,   138,   139,   140,   141,   142,   143,   133,    83,
+      66,     6,   102,    98,   150,   151,   125,   153,   154,    14,
+     121,   122,   136,   133,   156,    99,   125,   101,   125,   103,
+     104,    54,   125,   125,    56,    54,   125,   122,   123,   113,
+     114,   115,   116,   117,   100,   119,   125,   121,   138,   139,
+     125,    54,    54,   127,    49,   111,   130,   131,   132,    81,
+     134,   135,    57,   199,   200,    25,   125,   293,   142,   143,
+     126,   125,   125,    95,   193,   194,   195,   196,   125,    74,
+     125,   210,   125,    78,   125,    80,    10,    47,    48,    37,
+      38,    39,    40,    17,    54,    90,    20,    70,   120,   148,
+     149,   150,   151,   152,    54,   153,   142,   236,   157,     6,
+       7,    54,   107,   108,    11,    12,    13,    41,    54,    16,
+      54,    54,    54,    54,    21,    22,   125,   125,    54,    26,
+      27,   125,    54,    30,    54,    32,    33,    54,   133,    36,
+     135,    54,   137,    54,    54,    54,    43,    71,    72,    73,
+     142,    75,    76,   153,    25,    79,    53,   153,   142,   156,
+     153,    58,    59,   146,   112,   125,   153,    64,    65,   305,
+     306,    68,    69,    97,   153,   147,   124,   142,   156,   153,
+     128,   129,   153,   153,   153,   153,    83,   142,   317,   142,
+       0,   327,     0,   255,    77,   157,   332,   148,   149,   150,
+     151,   152,    99,    91,   101,   190,   103,   104,    13,   345,
+     346,   347,   348,   349,   144,   201,   113,   114,   115,   116,
+     117,   238,   119,   116,   121,    41,    24,   259,   309,    -1,
+     127,   329,   343,   130,   131,   132,    -1,   134,   135,    -1,
+      -1,    -1,     6,     7,    -1,   142,   143,    11,    12,    13,
+      -1,    -1,    16,    -1,    -1,    -1,    -1,    21,    22,    -1,
+      -1,    -1,    26,    27,    -1,    -1,    30,    -1,    32,    33,
+      -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,    43,
+      -1,    18,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,
+      -1,    -1,    -1,    -1,    58,    59,    -1,    -1,    -1,    -1,
+      64,    65,    -1,    -1,    68,    69,    -1,    44,    45,    -1,
+      -1,    -1,    -1,    50,    51,    -1,    -1,    -1,    -1,    83,
+      -1,    -1,    -1,    -1,    61,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    99,    -1,   101,    -1,   103,
+     104,    -1,    -1,    -1,    -1,    -1,    52,    84,    -1,   113,
+     114,   115,   116,   117,    60,   119,    62,   121,    -1,    -1,
+      -1,    67,    -1,   127,    -1,    -1,   130,   131,   132,    -1,
+     134,   135,   109,   110,    -1,    -1,    -1,    -1,    -1,   143,
+      86,   118,    88,    89,    -1,    91,    92,    93,    -1,    -1,
+      96,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   137
+      -1,   137
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line 3 "/usr/local/gnu/share/bison/bison.simple"
@@ -1459,15 +1462,17 @@ yyreduce:
   switch (yyn) {
 
 case 4:
-#line 311 "ntp_parser.y"
+#line 312 "ntp_parser.y"
 { 
-                    fprintf(stderr, "PARSE ERROR!! At Line: %d\n", 
-                            ip_file->line_no);
-                    fprintf(stderr, "Line Ignored!!\n");
+					if (input_from_file == 1) {
+                    	msyslog(LOG_INFO, "parse error %s line %d ignored\n",
+                            ip_file->fname, ip_file->line_no);
+                	} else if (input_from_file != 0)
+						msyslog(LOG_INFO, "parse: bad boolean input flag\n"); 
                 }
     break;
 case 17:
-#line 338 "ntp_parser.y"
+#line 341 "ntp_parser.y"
 { 
                         struct peer_node *my_node =  create_peer_node(yyvsp[-2].Integer, yyvsp[-1].Address_node, yyvsp[0].Queue); 
                         if (my_node)
@@ -1475,7 +1480,7 @@ case 17:
                     }
     break;
 case 18:
-#line 344 "ntp_parser.y"
+#line 347 "ntp_parser.y"
 { 
                         struct peer_node *my_node = create_peer_node(yyvsp[-1].Integer, yyvsp[0].Address_node, NULL); 
                         if (my_node)
@@ -1483,35 +1488,35 @@ case 18:
                     }
     break;
 case 19:
-#line 352 "ntp_parser.y"
+#line 355 "ntp_parser.y"
 { yyval.Integer = T_Server; }
     break;
 case 20:
-#line 353 "ntp_parser.y"
+#line 356 "ntp_parser.y"
 { yyval.Integer = T_Pool; }
     break;
 case 21:
-#line 354 "ntp_parser.y"
+#line 357 "ntp_parser.y"
 { yyval.Integer = T_Peer; }
     break;
 case 22:
-#line 355 "ntp_parser.y"
+#line 358 "ntp_parser.y"
 { yyval.Integer = T_Broadcast; }
     break;
 case 23:
-#line 356 "ntp_parser.y"
+#line 359 "ntp_parser.y"
 { yyval.Integer = T_Manycastclient; }
     break;
 case 24:
-#line 360 "ntp_parser.y"
+#line 363 "ntp_parser.y"
 { yyval.Address_node = yyvsp[0].Address_node; }
     break;
 case 25:
-#line 361 "ntp_parser.y"
+#line 364 "ntp_parser.y"
 { yyval.Address_node = create_address_node(yyvsp[0].String, default_ai_family); }
     break;
 case 26:
-#line 363 "ntp_parser.y"
+#line 366 "ntp_parser.y"
 {
                         if (yyvsp[-1].Integer == -4)
                             yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET);
@@ -1524,99 +1529,99 @@ case 26:
                     }
     break;
 case 27:
-#line 378 "ntp_parser.y"
+#line 381 "ntp_parser.y"
 { yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET); }
     break;
 case 28:
-#line 379 "ntp_parser.y"
+#line 382 "ntp_parser.y"
 { yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET6); }
     break;
 case 29:
-#line 383 "ntp_parser.y"
+#line 386 "ntp_parser.y"
 { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 case 30:
-#line 384 "ntp_parser.y"
+#line 387 "ntp_parser.y"
 { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 case 31:
-#line 389 "ntp_parser.y"
+#line 392 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_SKEY | FLAG_AUTHENABLE); }
     break;
 case 32:
-#line 390 "ntp_parser.y"
+#line 393 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_BURST); }
     break;
 case 33:
-#line 391 "ntp_parser.y"
+#line 394 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_IBURST); }
     break;
 case 34:
-#line 392 "ntp_parser.y"
+#line 395 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Key, yyvsp[0].Integer); }
     break;
 case 35:
-#line 393 "ntp_parser.y"
+#line 396 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Minpoll, yyvsp[0].Integer); }
     break;
 case 36:
-#line 394 "ntp_parser.y"
+#line 397 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Maxpoll, yyvsp[0].Integer); }
     break;
 case 37:
-#line 395 "ntp_parser.y"
+#line 398 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_NOSELECT);}
     break;
 case 38:
-#line 396 "ntp_parser.y"
+#line 399 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREEMPT); }
     break;
 case 39:
-#line 397 "ntp_parser.y"
+#line 400 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREFER); }
     break;
 case 40:
-#line 398 "ntp_parser.y"
+#line 401 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_TRUE); }
     break;
 case 41:
-#line 399 "ntp_parser.y"
+#line 402 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Ttl, yyvsp[0].Integer); }
     break;
 case 42:
-#line 400 "ntp_parser.y"
+#line 403 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Mode, yyvsp[0].Integer); }
     break;
 case 43:
-#line 401 "ntp_parser.y"
+#line 404 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Version, yyvsp[0].Integer); }
     break;
 case 44:
-#line 412 "ntp_parser.y"
+#line 415 "ntp_parser.y"
 { my_config.broadcastclient = SIMPLE; }
     break;
 case 45:
-#line 414 "ntp_parser.y"
+#line 417 "ntp_parser.y"
 { my_config.broadcastclient = NOVOLLEY;  }
     break;
 case 46:
-#line 416 "ntp_parser.y"
+#line 419 "ntp_parser.y"
 { append_queue(my_config.manycastserver, yyvsp[0].Queue);  }
     break;
 case 47:
-#line 418 "ntp_parser.y"
+#line 421 "ntp_parser.y"
 { append_queue(my_config.multicastclient, yyvsp[0].Queue);  }
     break;
 case 48:
-#line 429 "ntp_parser.y"
+#line 432 "ntp_parser.y"
 { my_config.auth.autokey = yyvsp[0].Integer;  }
     break;
 case 49:
-#line 431 "ntp_parser.y"
+#line 434 "ntp_parser.y"
 { my_config.auth.control_key = yyvsp[0].Integer;  }
     break;
 case 50:
-#line 433 "ntp_parser.y"
+#line 436 "ntp_parser.y"
 { if (my_config.auth.crypto_cmd_list != NULL) 
 					append_queue(my_config.auth.crypto_cmd_list, yyvsp[0].Queue); 
 		 		else 
@@ -1624,467 +1629,467 @@ case 50:
 			}
     break;
 case 51:
-#line 439 "ntp_parser.y"
+#line 442 "ntp_parser.y"
 { my_config.auth.keys = yyvsp[0].String;  }
     break;
 case 52:
-#line 441 "ntp_parser.y"
+#line 444 "ntp_parser.y"
 { my_config.auth.keysdir = yyvsp[0].String;  }
     break;
 case 53:
-#line 443 "ntp_parser.y"
+#line 446 "ntp_parser.y"
 { my_config.auth.requested_key = yyvsp[0].Integer;  }
     break;
 case 54:
-#line 445 "ntp_parser.y"
+#line 448 "ntp_parser.y"
 { my_config.auth.revoke = yyvsp[0].Integer;  }
     break;
 case 55:
-#line 447 "ntp_parser.y"
+#line 450 "ntp_parser.y"
 { my_config.auth.trusted_key_list = yyvsp[0].Queue;  }
     break;
 case 56:
-#line 451 "ntp_parser.y"
+#line 454 "ntp_parser.y"
 { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 case 57:
-#line 452 "ntp_parser.y"
+#line 455 "ntp_parser.y"
 { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 case 58:
-#line 457 "ntp_parser.y"
+#line 460 "ntp_parser.y"
 { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_CERT, yyvsp[0].String); }
     break;
 case 59:
-#line 459 "ntp_parser.y"
+#line 462 "ntp_parser.y"
 { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_LEAP, yyvsp[0].String); }
     break;
 case 60:
-#line 461 "ntp_parser.y"
+#line 464 "ntp_parser.y"
 { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_RAND, yyvsp[0].String); }
     break;
 case 61:
-#line 463 "ntp_parser.y"
+#line 466 "ntp_parser.y"
 { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PRIV, yyvsp[0].String); }
     break;
 case 62:
-#line 465 "ntp_parser.y"
+#line 468 "ntp_parser.y"
 { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_SIGN, yyvsp[0].String); }
     break;
 case 63:
-#line 467 "ntp_parser.y"
+#line 470 "ntp_parser.y"
 { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IDENT, yyvsp[0].String); }
     break;
 case 64:
-#line 469 "ntp_parser.y"
+#line 472 "ntp_parser.y"
 { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IFFPAR, yyvsp[0].String); }
     break;
 case 65:
-#line 471 "ntp_parser.y"
+#line 474 "ntp_parser.y"
 { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_GQPAR, yyvsp[0].String); }
     break;
 case 66:
-#line 473 "ntp_parser.y"
+#line 476 "ntp_parser.y"
 { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_MVPAR, yyvsp[0].String); }
     break;
 case 67:
-#line 475 "ntp_parser.y"
+#line 478 "ntp_parser.y"
 { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PW, yyvsp[0].String); }
     break;
 case 68:
-#line 485 "ntp_parser.y"
+#line 488 "ntp_parser.y"
 { append_queue(my_config.orphan_cmds,yyvsp[0].Queue);  }
     break;
 case 69:
-#line 489 "ntp_parser.y"
+#line 492 "ntp_parser.y"
 { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 case 70:
-#line 490 "ntp_parser.y"
+#line 493 "ntp_parser.y"
 { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 case 71:
-#line 495 "ntp_parser.y"
+#line 498 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(PROTO_CEILING, (double)yyvsp[0].Integer); }
     break;
 case 72:
-#line 497 "ntp_parser.y"
+#line 500 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(PROTO_FLOOR, (double)yyvsp[0].Integer); }
     break;
 case 73:
-#line 499 "ntp_parser.y"
+#line 502 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(PROTO_COHORT, (double)yyvsp[0].Integer); }
     break;
 case 74:
-#line 501 "ntp_parser.y"
+#line 504 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(PROTO_ORPHAN, (double)yyvsp[0].Integer); }
     break;
 case 75:
-#line 503 "ntp_parser.y"
+#line 506 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(PROTO_MINDISP, yyvsp[0].Double); }
     break;
 case 76:
-#line 505 "ntp_parser.y"
+#line 508 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(PROTO_MAXDIST, yyvsp[0].Double); }
     break;
 case 77:
-#line 507 "ntp_parser.y"
+#line 510 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(PROTO_MINCLOCK, yyvsp[0].Double); }
     break;
 case 78:
-#line 509 "ntp_parser.y"
+#line 512 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(PROTO_MAXCLOCK, yyvsp[0].Double); }
     break;
 case 79:
-#line 511 "ntp_parser.y"
+#line 514 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(PROTO_MINSANE, (double)yyvsp[0].Integer); }
     break;
 case 80:
-#line 513 "ntp_parser.y"
+#line 516 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(PROTO_BEACON, (double)yyvsp[0].Integer); }
     break;
 case 81:
-#line 515 "ntp_parser.y"
+#line 518 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(PROTO_MAXHOP, (double)yyvsp[0].Integer); }
     break;
 case 82:
-#line 525 "ntp_parser.y"
+#line 528 "ntp_parser.y"
 { append_queue(my_config.stats_list, yyvsp[0].Queue);  }
     break;
 case 83:
-#line 527 "ntp_parser.y"
+#line 530 "ntp_parser.y"
 { my_config.stats_dir = yyvsp[0].String;  }
     break;
 case 84:
-#line 529 "ntp_parser.y"
+#line 532 "ntp_parser.y"
 {
                         enqueue(my_config.filegen_opts, 
                                 create_filegen_node(yyvsp[-1].VoidPtr, yyvsp[0].Queue));                         
                     }
     break;
 case 85:
-#line 536 "ntp_parser.y"
+#line 539 "ntp_parser.y"
 { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
     break;
 case 86:
-#line 537 "ntp_parser.y"
+#line 540 "ntp_parser.y"
 { yyval.Queue = enqueue_in_new_queue(yyvsp[0].VoidPtr); }
     break;
 case 87:
-#line 542 "ntp_parser.y"
+#line 545 "ntp_parser.y"
 { yyval.VoidPtr = create_pval("clockstats"); }
     break;
 case 88:
-#line 544 "ntp_parser.y"
+#line 547 "ntp_parser.y"
 { yyval.VoidPtr = create_pval("cryptostats"); }
     break;
 case 89:
-#line 546 "ntp_parser.y"
+#line 549 "ntp_parser.y"
 { yyval.VoidPtr = create_pval("loopstats"); }
     break;
 case 90:
-#line 548 "ntp_parser.y"
+#line 551 "ntp_parser.y"
 { yyval.VoidPtr = create_pval("peerstats"); }
     break;
 case 91:
-#line 550 "ntp_parser.y"
+#line 553 "ntp_parser.y"
 { yyval.VoidPtr = create_pval("rawstats"); }
     break;
 case 92:
-#line 552 "ntp_parser.y"
+#line 555 "ntp_parser.y"
 { yyval.VoidPtr = create_pval("sysstats"); }
     break;
 case 93:
-#line 556 "ntp_parser.y"
+#line 559 "ntp_parser.y"
 { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 case 94:
-#line 557 "ntp_parser.y"
+#line 560 "ntp_parser.y"
 { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 case 95:
-#line 561 "ntp_parser.y"
+#line 564 "ntp_parser.y"
 { yyval.Attr_val = create_attr_sval(T_File, yyvsp[0].String); }
     break;
 case 96:
-#line 562 "ntp_parser.y"
+#line 565 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Type, yyvsp[0].Integer); }
     break;
 case 97:
-#line 563 "ntp_parser.y"
+#line 566 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, T_Link); }
     break;
 case 98:
-#line 564 "ntp_parser.y"
+#line 567 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, T_Nolink); }
     break;
 case 99:
-#line 565 "ntp_parser.y"
+#line 568 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, T_Enable); }
     break;
 case 100:
-#line 566 "ntp_parser.y"
+#line 569 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, T_Disable); }
     break;
 case 101:
-#line 570 "ntp_parser.y"
+#line 573 "ntp_parser.y"
 { yyval.Integer = FILEGEN_NONE; }
     break;
 case 102:
-#line 571 "ntp_parser.y"
+#line 574 "ntp_parser.y"
 { yyval.Integer = FILEGEN_PID; }
     break;
 case 103:
-#line 572 "ntp_parser.y"
+#line 575 "ntp_parser.y"
 { yyval.Integer = FILEGEN_DAY; }
     break;
 case 104:
-#line 573 "ntp_parser.y"
+#line 576 "ntp_parser.y"
 { yyval.Integer = FILEGEN_WEEK; }
     break;
 case 105:
-#line 574 "ntp_parser.y"
+#line 577 "ntp_parser.y"
 { yyval.Integer = FILEGEN_MONTH; }
     break;
 case 106:
-#line 575 "ntp_parser.y"
+#line 578 "ntp_parser.y"
 { yyval.Integer = FILEGEN_YEAR; }
     break;
 case 107:
-#line 576 "ntp_parser.y"
+#line 579 "ntp_parser.y"
 { yyval.Integer = FILEGEN_AGE; }
     break;
 case 108:
-#line 586 "ntp_parser.y"
+#line 589 "ntp_parser.y"
 {   append_queue(my_config.discard_opts, yyvsp[0].Queue); }
     break;
 case 109:
-#line 588 "ntp_parser.y"
+#line 591 "ntp_parser.y"
 { 
                         enqueue(my_config.restrict_opts, 
                                 create_restrict_node(yyvsp[-1].Address_node, NULL, yyvsp[0].Queue, ip_file->line_no));                          
                     }
     break;
 case 110:
-#line 593 "ntp_parser.y"
+#line 596 "ntp_parser.y"
 { 
                         enqueue(my_config.restrict_opts, 
                                 create_restrict_node(NULL, NULL, yyvsp[0].Queue, ip_file->line_no)); 
                     }
     break;
 case 111:
-#line 598 "ntp_parser.y"
+#line 601 "ntp_parser.y"
 { 
                         enqueue(my_config.restrict_opts, 
                                 create_restrict_node(yyvsp[-3].Address_node, yyvsp[-1].Address_node, yyvsp[0].Queue, ip_file->line_no)); 
                     }
     break;
 case 112:
-#line 605 "ntp_parser.y"
+#line 608 "ntp_parser.y"
 { yyval.Queue = create_queue(); }
     break;
 case 113:
-#line 606 "ntp_parser.y"
+#line 609 "ntp_parser.y"
 { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
     break;
 case 114:
-#line 610 "ntp_parser.y"
+#line 613 "ntp_parser.y"
 { yyval.VoidPtr = create_ival(RES_IGNORE); }
     break;
 case 115:
-#line 611 "ntp_parser.y"
+#line 614 "ntp_parser.y"
 { yyval.VoidPtr = create_ival(RES_DEMOBILIZE); }
     break;
 case 116:
-#line 612 "ntp_parser.y"
+#line 615 "ntp_parser.y"
 { yyval.VoidPtr = create_ival(RES_LIMITED); }
     break;
 case 117:
-#line 613 "ntp_parser.y"
+#line 616 "ntp_parser.y"
 { yyval.VoidPtr = create_ival(RES_LPTRAP); }
     break;
 case 118:
-#line 614 "ntp_parser.y"
+#line 617 "ntp_parser.y"
 { yyval.VoidPtr = create_ival(RES_NOMODIFY); }
     break;
 case 119:
-#line 615 "ntp_parser.y"
+#line 618 "ntp_parser.y"
 { yyval.VoidPtr = create_ival(RES_NOPEER); }
     break;
 case 120:
-#line 616 "ntp_parser.y"
+#line 619 "ntp_parser.y"
 { yyval.VoidPtr = create_ival(RES_NOQUERY); }
     break;
 case 121:
-#line 617 "ntp_parser.y"
+#line 620 "ntp_parser.y"
 { yyval.VoidPtr = create_ival(RES_DONTSERVE); }
     break;
 case 122:
-#line 618 "ntp_parser.y"
+#line 621 "ntp_parser.y"
 { yyval.VoidPtr = create_ival(RES_NOTRAP); }
     break;
 case 123:
-#line 619 "ntp_parser.y"
+#line 622 "ntp_parser.y"
 { yyval.VoidPtr = create_ival(RES_DONTTRUST); }
     break;
 case 124:
-#line 620 "ntp_parser.y"
+#line 623 "ntp_parser.y"
 { yyval.VoidPtr = create_ival(RESM_NTPONLY); }
     break;
 case 125:
-#line 621 "ntp_parser.y"
+#line 624 "ntp_parser.y"
 { yyval.VoidPtr = create_ival(RES_VERSION); }
     break;
 case 126:
-#line 625 "ntp_parser.y"
+#line 628 "ntp_parser.y"
 { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 case 127:
-#line 626 "ntp_parser.y"
+#line 629 "ntp_parser.y"
 { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 case 128:
-#line 630 "ntp_parser.y"
+#line 633 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Average, yyvsp[0].Integer); }
     break;
 case 129:
-#line 631 "ntp_parser.y"
+#line 634 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Minimum, yyvsp[0].Integer); }
     break;
 case 130:
-#line 632 "ntp_parser.y"
+#line 635 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Monitor, yyvsp[0].Integer); }
     break;
 case 131:
-#line 641 "ntp_parser.y"
+#line 644 "ntp_parser.y"
 { enqueue(my_config.fudge, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
     break;
 case 132:
-#line 645 "ntp_parser.y"
+#line 648 "ntp_parser.y"
 { enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 case 133:
-#line 646 "ntp_parser.y"
+#line 649 "ntp_parser.y"
 { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 case 134:
-#line 651 "ntp_parser.y"
+#line 654 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(CLK_HAVETIME1, yyvsp[0].Double); }
     break;
 case 135:
-#line 653 "ntp_parser.y"
+#line 656 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(CLK_HAVETIME2, yyvsp[0].Double); }
     break;
 case 136:
-#line 655 "ntp_parser.y"
+#line 658 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(CLK_HAVEVAL1,  yyvsp[0].Integer); }
     break;
 case 137:
-#line 657 "ntp_parser.y"
+#line 660 "ntp_parser.y"
 { yyval.Attr_val = create_attr_sval(CLK_HAVEVAL2,  yyvsp[0].String); }
     break;
 case 138:
-#line 659 "ntp_parser.y"
+#line 662 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG1, yyvsp[0].Integer); }
     break;
 case 139:
-#line 661 "ntp_parser.y"
+#line 664 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG2, yyvsp[0].Integer); }
     break;
 case 140:
-#line 663 "ntp_parser.y"
+#line 666 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG3, yyvsp[0].Integer); }
     break;
 case 141:
-#line 665 "ntp_parser.y"
+#line 668 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG4, yyvsp[0].Integer); }
     break;
 case 142:
-#line 674 "ntp_parser.y"
+#line 677 "ntp_parser.y"
 { append_queue(my_config.enable_opts,yyvsp[0].Queue);  }
     break;
 case 143:
-#line 676 "ntp_parser.y"
+#line 679 "ntp_parser.y"
 { append_queue(my_config.disable_opts,yyvsp[0].Queue);  }
     break;
 case 144:
-#line 680 "ntp_parser.y"
+#line 683 "ntp_parser.y"
 { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 case 145:
-#line 681 "ntp_parser.y"
+#line 684 "ntp_parser.y"
 { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 case 146:
-#line 685 "ntp_parser.y"
+#line 688 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); }
     break;
 case 147:
-#line 686 "ntp_parser.y"
+#line 689 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_BROADCLIENT); }
     break;
 case 148:
-#line 687 "ntp_parser.y"
+#line 690 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_CAL); }
     break;
 case 149:
-#line 688 "ntp_parser.y"
+#line 691 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_KERNEL); }
     break;
 case 150:
-#line 689 "ntp_parser.y"
+#line 692 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_MONITOR); }
     break;
 case 151:
-#line 690 "ntp_parser.y"
+#line 693 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_NTP); }
     break;
 case 152:
-#line 692 "ntp_parser.y"
+#line 695 "ntp_parser.y"
 { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_FILEGEN); }
     break;
 case 153:
-#line 700 "ntp_parser.y"
+#line 703 "ntp_parser.y"
 { append_queue(my_config.tinker, yyvsp[0].Queue);  }
     break;
 case 154:
-#line 704 "ntp_parser.y"
+#line 707 "ntp_parser.y"
 { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 case 155:
-#line 705 "ntp_parser.y"
+#line 708 "ntp_parser.y"
 { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 case 156:
-#line 709 "ntp_parser.y"
+#line 712 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(LOOP_ALLAN, yyvsp[0].Double); }
     break;
 case 157:
-#line 710 "ntp_parser.y"
+#line 713 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(LOOP_PHI, yyvsp[0].Double); }
     break;
 case 158:
-#line 711 "ntp_parser.y"
+#line 714 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(LOOP_FREQ, yyvsp[0].Double); }
     break;
 case 159:
-#line 712 "ntp_parser.y"
+#line 715 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(LOOP_HUFFPUFF, yyvsp[0].Double); }
     break;
 case 160:
-#line 713 "ntp_parser.y"
+#line 716 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(LOOP_PANIC, yyvsp[0].Double); }
     break;
 case 161:
-#line 714 "ntp_parser.y"
+#line 717 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(LOOP_MAX, yyvsp[0].Double); }
     break;
 case 162:
-#line 715 "ntp_parser.y"
+#line 718 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(LOOP_MINSTEP, yyvsp[0].Double); }
     break;
 case 163:
-#line 724 "ntp_parser.y"
+#line 727 "ntp_parser.y"
 {
                     if (curr_include_level >= MAXINCLUDELEVEL) {
                         fprintf(stderr, "getconfig: Maximum include file level exceeded.\n");
@@ -2102,106 +2107,112 @@ case 163:
                 }
     break;
 case 164:
-#line 740 "ntp_parser.y"
+#line 743 "ntp_parser.y"
 {
                     while (curr_include_level != -1) 
                         FCLOSE(fp[curr_include_level--]);
                 }
     break;
 case 165:
-#line 746 "ntp_parser.y"
+#line 749 "ntp_parser.y"
 { enqueue(my_config.vars, create_attr_dval(T_Broadcastdelay, yyvsp[0].Double));  }
     break;
 case 166:
-#line 748 "ntp_parser.y"
+#line 751 "ntp_parser.y"
 { enqueue(my_config.vars, create_attr_ival(T_Calldelay, yyvsp[0].Integer));  }
     break;
 case 167:
-#line 750 "ntp_parser.y"
+#line 753 "ntp_parser.y"
 { enqueue(my_config.vars, create_attr_dval(T_Tick, yyvsp[0].Double));  }
     break;
 case 168:
-#line 752 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[-1].String)); }
+#line 755 "ntp_parser.y"
+{ /* Null action, possibly all null parms */ }
     break;
 case 169:
-#line 755 "ntp_parser.y"
+#line 758 "ntp_parser.y"
 { enqueue(my_config.vars, create_attr_sval(T_Pidfile, yyvsp[0].String));  }
     break;
 case 170:
-#line 757 "ntp_parser.y"
+#line 760 "ntp_parser.y"
 { enqueue(my_config.vars, create_attr_sval(T_Logfile, yyvsp[0].String));  }
     break;
 case 171:
-#line 759 "ntp_parser.y"
+#line 762 "ntp_parser.y"
 { enqueue(my_config.vars, create_attr_ival(T_Automax, yyvsp[0].Integer));  }
     break;
 case 172:
-#line 762 "ntp_parser.y"
+#line 765 "ntp_parser.y"
 { append_queue(my_config.logconfig, yyvsp[0].Queue);  }
     break;
 case 173:
-#line 764 "ntp_parser.y"
+#line 767 "ntp_parser.y"
 { append_queue(my_config.phone, yyvsp[0].Queue);  }
     break;
 case 174:
-#line 766 "ntp_parser.y"
+#line 769 "ntp_parser.y"
 { enqueue(my_config.setvar, yyvsp[0].Set_var);  }
     break;
 case 175:
-#line 768 "ntp_parser.y"
+#line 771 "ntp_parser.y"
 { enqueue(my_config.trap, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
     break;
 case 176:
-#line 770 "ntp_parser.y"
+#line 773 "ntp_parser.y"
 { append_queue(my_config.ttl, yyvsp[0].Queue); }
     break;
 case 177:
-#line 773 "ntp_parser.y"
-{ /* Null command */ }
+#line 777 "ntp_parser.y"
+{ enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[0].String)); }
     break;
 case 178:
-#line 775 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_ival(T_DriftMinutes, yyvsp[0].Integer)); }
+#line 779 "ntp_parser.y"
+{ enqueue(my_config.vars, create_attr_ival(T_DriftMinutes, yyvsp[0].Integer)); 
+		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[-1].String)); }
     break;
 case 179:
-#line 780 "ntp_parser.y"
-{ yyval.Set_var = create_setvar_node(yyvsp[-3].String, yyvsp[-1].String, DEF); }
+#line 781 "ntp_parser.y"
+{ /* Null driftfile,  indicated by null string "\0" */ 
+		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, "\0")); }
     break;
 case 180:
-#line 782 "ntp_parser.y"
-{ yyval.Set_var = create_setvar_node(yyvsp[-2].String, yyvsp[0].String, 0); }
+#line 787 "ntp_parser.y"
+{ yyval.Set_var = create_setvar_node(yyvsp[-3].String, yyvsp[-1].String, DEF); }
     break;
 case 181:
-#line 787 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+#line 789 "ntp_parser.y"
+{ yyval.Set_var = create_setvar_node(yyvsp[-2].String, yyvsp[0].String, 0); }
     break;
 case 182:
-#line 788 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+#line 794 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 case 183:
-#line 792 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Port, yyvsp[0].Integer); }
+#line 795 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 case 184:
-#line 793 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_pval(T_Interface, yyvsp[0].Address_node); }
+#line 799 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_ival(T_Port, yyvsp[0].Integer); }
     break;
 case 185:
-#line 798 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+#line 800 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_pval(T_Interface, yyvsp[0].Address_node); }
     break;
 case 186:
-#line 799 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+#line 805 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 case 187:
-#line 803 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(yyvsp[-1].Integer, yyvsp[0].String); }
+#line 806 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 case 188:
-#line 805 "ntp_parser.y"
+#line 810 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_sval(yyvsp[-1].Integer, yyvsp[0].String); }
+    break;
+case 189:
+#line 812 "ntp_parser.y"
 { 
                     /* YUCK!! This is needed because '+' and '-' are not special characters 
                      * while '=' is. 
@@ -2216,44 +2227,44 @@ case 188:
                         yyval.Attr_val = create_attr_sval(prefix, type);
                 }
     break;
-case 189:
-#line 821 "ntp_parser.y"
+case 190:
+#line 828 "ntp_parser.y"
 { yyval.Integer = '+'; }
     break;
-case 190:
-#line 822 "ntp_parser.y"
+case 191:
+#line 829 "ntp_parser.y"
 { yyval.Integer = '-'; }
     break;
-case 191:
-#line 823 "ntp_parser.y"
+case 192:
+#line 830 "ntp_parser.y"
 { yyval.Integer = '='; }
     break;
-case 192:
-#line 832 "ntp_parser.y"
+case 193:
+#line 839 "ntp_parser.y"
 { yyval.Queue = enqueue(yyvsp[-1].Queue, create_ival(yyvsp[0].Integer)); }
     break;
-case 193:
-#line 833 "ntp_parser.y"
+case 194:
+#line 840 "ntp_parser.y"
 { yyval.Queue = enqueue_in_new_queue(create_ival(yyvsp[0].Integer)); }
     break;
-case 194:
-#line 837 "ntp_parser.y"
+case 195:
+#line 844 "ntp_parser.y"
 { yyval.Queue = enqueue(yyvsp[-1].Queue, create_pval(yyvsp[0].String)); }
     break;
-case 195:
-#line 838 "ntp_parser.y"
+case 196:
+#line 845 "ntp_parser.y"
 { yyval.Queue = enqueue_in_new_queue(create_pval(yyvsp[0].String)); }
     break;
-case 196:
-#line 842 "ntp_parser.y"
+case 197:
+#line 849 "ntp_parser.y"
 { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Address_node); }
     break;
-case 197:
-#line 843 "ntp_parser.y"
+case 198:
+#line 850 "ntp_parser.y"
 { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Address_node); }
     break;
-case 198:
-#line 848 "ntp_parser.y"
+case 199:
+#line 855 "ntp_parser.y"
 { 
                     if (yyvsp[0].Integer != 0 && yyvsp[0].Integer != 1) {
                         yyerror("Integer value is not boolean (0 or 1). Assuming 1");
@@ -2263,24 +2274,24 @@ case 198:
                         yyval.Integer = yyvsp[0].Integer; 
                 }
     break;
-case 199:
-#line 856 "ntp_parser.y"
+case 200:
+#line 863 "ntp_parser.y"
 { yyval.Integer = 1; }
     break;
-case 200:
-#line 857 "ntp_parser.y"
+case 201:
+#line 864 "ntp_parser.y"
 { yyval.Integer = 0; }
     break;
-case 201:
-#line 861 "ntp_parser.y"
+case 202:
+#line 868 "ntp_parser.y"
 { yyval.Double = (double)yyvsp[0].Integer; }
     break;
-case 202:
-#line 862 "ntp_parser.y"
+case 203:
+#line 869 "ntp_parser.y"
 { yyval.Double = yyvsp[0].Double; }
     break;
-case 203:
-#line 871 "ntp_parser.y"
+case 204:
+#line 878 "ntp_parser.y"
 {
                  my_config.sim_details = create_sim_node(yyvsp[-2].Queue, yyvsp[-1].Queue);
 
@@ -2288,92 +2299,92 @@ case 203:
                  old_config_style = 1;
              }
     break;
-case 204:
-#line 885 "ntp_parser.y"
-{ old_config_style = 0; }
-    break;
 case 205:
-#line 889 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
+#line 892 "ntp_parser.y"
+{ old_config_style = 0; }
     break;
 case 206:
-#line 890 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
+#line 896 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
     break;
 case 207:
-#line 894 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Beep_Delay, yyvsp[0].Double); }
+#line 897 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
     break;
 case 208:
-#line 895 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Sim_Duration, yyvsp[0].Double); }
+#line 901 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Beep_Delay, yyvsp[0].Double); }
     break;
 case 209:
-#line 899 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_server); }
+#line 902 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Sim_Duration, yyvsp[0].Double); }
     break;
 case 210:
-#line 900 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_server); }
+#line 906 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_server); }
     break;
 case 211:
-#line 905 "ntp_parser.y"
-{ yyval.Sim_server = create_sim_server(yyvsp[-4].Address_node, yyvsp[-2].Double, yyvsp[-1].Queue); }
+#line 907 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_server); }
     break;
 case 212:
-#line 909 "ntp_parser.y"
-{ yyval.Double = yyvsp[-1].Double; }
+#line 912 "ntp_parser.y"
+{ yyval.Sim_server = create_sim_server(yyvsp[-4].Address_node, yyvsp[-2].Double, yyvsp[-1].Queue); }
     break;
 case 213:
-#line 913 "ntp_parser.y"
-{ yyval.Address_node = yyvsp[0].Address_node; }
+#line 916 "ntp_parser.y"
+{ yyval.Double = yyvsp[-1].Double; }
     break;
 case 214:
-#line 917 "ntp_parser.y"
+#line 920 "ntp_parser.y"
 { yyval.Address_node = yyvsp[0].Address_node; }
     break;
 case 215:
-#line 918 "ntp_parser.y"
-{ yyval.Address_node = create_address_node(yyvsp[0].String, T_String); }
+#line 924 "ntp_parser.y"
+{ yyval.Address_node = yyvsp[0].Address_node; }
     break;
 case 216:
-#line 922 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_script); }
+#line 925 "ntp_parser.y"
+{ yyval.Address_node = create_address_node(yyvsp[0].String, T_String); }
     break;
 case 217:
-#line 923 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_script); }
+#line 929 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_script); }
     break;
 case 218:
-#line 928 "ntp_parser.y"
-{ yyval.Sim_script = create_sim_script_info(yyvsp[-3].Double, yyvsp[-1].Queue); }
+#line 930 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_script); }
     break;
 case 219:
-#line 932 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
+#line 935 "ntp_parser.y"
+{ yyval.Sim_script = create_sim_script_info(yyvsp[-3].Double, yyvsp[-1].Queue); }
     break;
 case 220:
-#line 933 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
+#line 939 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
     break;
 case 221:
-#line 938 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Freq_Offset, yyvsp[0].Double); }
+#line 940 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
     break;
 case 222:
-#line 940 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Wander, yyvsp[0].Double); }
+#line 945 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Freq_Offset, yyvsp[0].Double); }
     break;
 case 223:
-#line 942 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Jitter, yyvsp[0].Double); }
+#line 947 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Wander, yyvsp[0].Double); }
     break;
 case 224:
-#line 944 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Prop_Delay, yyvsp[0].Double); }
+#line 949 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Jitter, yyvsp[0].Double); }
     break;
 case 225:
-#line 946 "ntp_parser.y"
+#line 951 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_dval(T_Prop_Delay, yyvsp[0].Double); }
+    break;
+case 226:
+#line 953 "ntp_parser.y"
 { yyval.Attr_val = create_attr_dval(T_Proc_Delay, yyvsp[0].Double); }
     break;
 }
@@ -2609,7 +2620,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 950 "ntp_parser.y"
+#line 957 "ntp_parser.y"
 
 
 /* KEYWORDS

#### ChangeSet ####
2007-06-12 18:03:45-04:00, neal at pogo.udel.edu 
  Many files:
    allow null driftfile.

==== ChangeLog ====
2007-06-12 18:03:21-04:00, neal at pogo.udel.edu +1 -0
  allow null driftfile.

--- 1.66/ChangeLog	2007-06-10 03:25:11 -04:00
+++ 1.66.1.1/ChangeLog	2007-06-12 18:03:21 -04:00
@@ -1,3 +1,4 @@
+* Allow null driftfile.
 * Use a char for DIR_SEP, not a string.
 * [Bug 850] driftfile parsing changes.
 * driftfile maintenance changes from Dave Mills.  Use clock_phi instead of

==== ntpd/ntp_config.c ====
2007-06-12 17:59:35-04:00, neal at pogo.udel.edu +10 -2
  allow null driftfile.

--- 1.155/ntpd/ntp_config.c	2007-06-07 10:44:57 -04:00
+++ 1.156/ntpd/ntp_config.c	2007-06-12 17:59:35 -04:00
@@ -182,6 +182,7 @@ int old_config_style = 1;    /* A boolea
                               */
 
 extern int sys_maxclock;
+extern char *stats_drift_file;	/* name of the driftfile */
 
 /* FUNCTION PROTOTYPES */
 
@@ -354,6 +355,8 @@ create_attr_sval(
 	my_val = (struct attr_val *)
 	    get_node(sizeof(struct attr_val));
 	my_val->attr = attr;
+	if (s == NULL) 
+		s = "\0";	/* free() and strdup() glow on NULL */
 	my_val->value.s = strdup(s);
 	my_val->type = T_String;
 	return my_val;
@@ -1558,8 +1561,13 @@ config_vars(void)
 			proto_config(PROTO_ADJ, 0, curr_var->value.d, NULL);
 			break;
 		    case T_Driftfile:
-			stats_config(STATS_FREQ_FILE, curr_var->value.s);
-			free(curr_var->value.s);
+			if (!strcmp(curr_var->value.s, "\0")) { 
+				stats_drift_file = 0;
+				msyslog(LOG_INFO, "config: driftfile disabled\n");
+			} else { 
+				stats_config(STATS_FREQ_FILE, curr_var->value.s);
+				free(curr_var->value.s);
+			}
 			break;
 			case T_DriftMinutes:
 			stats_write_period = 60 * curr_var->value.i;

==== ntpd/ntp_parser.c ====
2007-06-12 18:00:48-04:00, neal at pogo.udel.edu +507 -509
  allow null driftfile.

--- 1.10/ntpd/ntp_parser.c	2007-06-07 10:45:14 -04:00
+++ 1.11/ntpd/ntp_parser.c	2007-06-12 18:00:48 -04:00
@@ -389,6 +389,7 @@
 
   struct FILE_INFO *ip_file;   /* Pointer to the configuration file stream */
   void yyerror (char *msg);
+  extern int input_from_file;  /* 0=input from ntpq>config command buffer */
 
   /* SK: The following is a terrible hack to allow the NTP code to be built
    * without OPENSSL. The following symbols need to be defined in the 
@@ -428,7 +429,7 @@
 #endif
 
 #ifndef YYSTYPE
-#line 67 "ntp_parser.y"
+#line 68 "ntp_parser.y"
 typedef union {
     char   *String;
     double  Double;
@@ -444,7 +445,7 @@ typedef union {
     script_info *Sim_script;
 } yystype;
 /* Line 193 of /usr/local/share/bison/yacc.c.  */
-#line 448 "ntp_parser.c"
+#line 449 "ntp_parser.c"
 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
@@ -465,7 +466,7 @@ typedef struct yyltype
 
 
 /* Line 213 of /usr/local/share/bison/yacc.c.  */
-#line 469 "ntp_parser.c"
+#line 470 "ntp_parser.c"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
@@ -562,15 +563,15 @@ union yyalloc
 #endif
 
 /* YYFINAL -- State number of the termination state. */
-#define YYFINAL  163
-#define YYLAST   524
+#define YYFINAL  164
+#define YYLAST   464
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  158
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  63
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  226
+#define YYNRULES  227
 /* YYNRULES -- Number of states. */
 #define YYNSTATES  361
 
@@ -649,12 +650,12 @@ static const unsigned short yyprhs[] =
      357,   360,   363,   366,   369,   372,   375,   377,   379,   381,
      383,   385,   387,   389,   391,   394,   397,   399,   402,   405,
      408,   411,   414,   417,   420,   424,   426,   429,   432,   435,
-     439,   442,   445,   448,   451,   454,   457,   461,   464,   465,
-     467,   472,   476,   479,   481,   484,   487,   490,   492,   495,
-     497,   499,   501,   503,   506,   508,   511,   513,   516,   518,
-     520,   522,   524,   526,   528,   534,   536,   540,   543,   547,
-     551,   554,   556,   562,   567,   571,   573,   575,   578,   580,
-     587,   591,   594,   598,   602,   606,   610
+     438,   441,   444,   447,   450,   453,   456,   460,   463,   465,
+     468,   469,   474,   478,   481,   483,   486,   489,   492,   494,
+     497,   499,   501,   503,   505,   508,   510,   513,   515,   518,
+     520,   522,   524,   526,   528,   530,   536,   538,   542,   545,
+     549,   553,   556,   558,   564,   569,   573,   575,   577,   580,
+     582,   589,   593,   596,   600,   604,   608,   612
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -703,53 +704,53 @@ static const short yyrhs[] =
      207,    -1,    28,   207,    -1,    42,   207,    -1,    46,   207,
       -1,    98,   207,    -1,   122,   207,    -1,   123,   207,    -1,
       53,   125,   161,    -1,    33,    -1,    13,   207,    -1,    16,
-      54,    -1,   127,   207,    -1,    30,   125,   196,    -1,   103,
-     125,    -1,    65,   125,    -1,     7,    54,    -1,    64,   200,
-      -1,   101,   204,    -1,   117,   197,    -1,   132,   165,   198,
-      -1,   135,   203,    -1,    -1,    54,    -1,   125,   153,   125,
-      25,    -1,   125,   153,   125,    -1,   198,   199,    -1,   199,
-      -1,   105,    54,    -1,    55,   165,    -1,   200,   201,    -1,
-     201,    -1,   202,   125,    -1,   125,    -1,   154,    -1,   155,
-      -1,   153,    -1,   203,    54,    -1,    54,    -1,   204,   125,
-      -1,   125,    -1,   205,   164,    -1,   164,    -1,    54,    -1,
-     133,    -1,    34,    -1,    54,    -1,    29,    -1,   209,   156,
-     210,   212,   157,    -1,   143,    -1,   210,   211,   142,    -1,
-     211,   142,    -1,   144,   153,   207,    -1,   145,   153,   207,
-      -1,   212,   213,    -1,   213,    -1,   215,   156,   214,   217,
-     157,    -1,   146,   153,   207,   142,    -1,   116,   153,   216,
-      -1,   165,    -1,   125,    -1,   217,   218,    -1,   218,    -1,
-     147,   153,   207,   156,   219,   157,    -1,   219,   220,   142,
-      -1,   220,   142,    -1,   148,   153,   207,    -1,   149,   153,
-     207,    -1,   150,   153,   207,    -1,   151,   153,   207,    -1,
-     152,   153,   207,    -1
+      54,    -1,   127,   207,    -1,    30,   196,    -1,   103,   125,
+      -1,    65,   125,    -1,     7,    54,    -1,    64,   200,    -1,
+     101,   204,    -1,   117,   197,    -1,   132,   165,   198,    -1,
+     135,   203,    -1,   125,    -1,   125,    54,    -1,    -1,   125,
+     153,   125,    25,    -1,   125,   153,   125,    -1,   198,   199,
+      -1,   199,    -1,   105,    54,    -1,    55,   165,    -1,   200,
+     201,    -1,   201,    -1,   202,   125,    -1,   125,    -1,   154,
+      -1,   155,    -1,   153,    -1,   203,    54,    -1,    54,    -1,
+     204,   125,    -1,   125,    -1,   205,   164,    -1,   164,    -1,
+      54,    -1,   133,    -1,    34,    -1,    54,    -1,    29,    -1,
+     209,   156,   210,   212,   157,    -1,   143,    -1,   210,   211,
+     142,    -1,   211,   142,    -1,   144,   153,   207,    -1,   145,
+     153,   207,    -1,   212,   213,    -1,   213,    -1,   215,   156,
+     214,   217,   157,    -1,   146,   153,   207,   142,    -1,   116,
+     153,   216,    -1,   165,    -1,   125,    -1,   217,   218,    -1,
+     218,    -1,   147,   153,   207,   156,   219,   157,    -1,   219,
+     220,   142,    -1,   220,   142,    -1,   148,   153,   207,    -1,
+     149,   153,   207,    -1,   150,   153,   207,    -1,   151,   153,
+     207,    -1,   152,   153,   207,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short yyrline[] =
 {
-       0,   298,   298,   302,   303,   308,   316,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   327,   335,   341,
-     350,   351,   352,   353,   354,   358,   359,   360,   376,   377,
-     381,   382,   387,   388,   389,   390,   391,   392,   393,   394,
-     395,   396,   397,   398,   399,   409,   411,   413,   415,   426,
-     428,   430,   436,   438,   440,   442,   444,   449,   450,   454,
-     456,   458,   460,   462,   464,   466,   468,   470,   472,   482,
-     487,   488,   492,   494,   496,   498,   500,   502,   504,   506,
-     508,   510,   512,   522,   524,   526,   534,   535,   539,   541,
-     543,   545,   547,   549,   554,   555,   559,   560,   561,   562,
-     563,   564,   568,   569,   570,   571,   572,   573,   574,   583,
-     585,   590,   595,   603,   604,   608,   609,   610,   611,   612,
-     613,   614,   615,   616,   617,   618,   619,   623,   624,   628,
-     629,   630,   638,   643,   644,   648,   650,   652,   654,   656,
-     658,   660,   662,   671,   673,   678,   679,   683,   684,   685,
-     686,   687,   688,   690,   698,   702,   703,   707,   708,   709,
-     710,   711,   712,   713,   721,   737,   743,   745,   747,   749,
-     752,   754,   756,   759,   761,   763,   765,   767,   771,   772,
-     777,   779,   785,   786,   790,   791,   796,   797,   801,   802,
-     819,   820,   821,   830,   831,   835,   836,   840,   841,   845,
-     854,   855,   859,   860,   868,   883,   887,   888,   892,   893,
-     897,   898,   902,   907,   911,   915,   916,   920,   921,   925,
-     930,   931,   935,   937,   939,   941,   943
+       0,   299,   299,   303,   304,   309,   319,   320,   321,   322,
+     323,   324,   325,   326,   327,   328,   329,   330,   338,   344,
+     353,   354,   355,   356,   357,   361,   362,   363,   379,   380,
+     384,   385,   390,   391,   392,   393,   394,   395,   396,   397,
+     398,   399,   400,   401,   402,   412,   414,   416,   418,   429,
+     431,   433,   439,   441,   443,   445,   447,   452,   453,   457,
+     459,   461,   463,   465,   467,   469,   471,   473,   475,   485,
+     490,   491,   495,   497,   499,   501,   503,   505,   507,   509,
+     511,   513,   515,   525,   527,   529,   537,   538,   542,   544,
+     546,   548,   550,   552,   557,   558,   562,   563,   564,   565,
+     566,   567,   571,   572,   573,   574,   575,   576,   577,   586,
+     588,   593,   598,   606,   607,   611,   612,   613,   614,   615,
+     616,   617,   618,   619,   620,   621,   622,   626,   627,   631,
+     632,   633,   641,   646,   647,   651,   653,   655,   657,   659,
+     661,   663,   665,   674,   676,   681,   682,   686,   687,   688,
+     689,   690,   691,   693,   701,   705,   706,   710,   711,   712,
+     713,   714,   715,   716,   724,   740,   746,   748,   750,   752,
+     755,   757,   759,   762,   764,   766,   768,   770,   774,   776,
+     779,   784,   786,   792,   793,   797,   798,   803,   804,   808,
+     809,   826,   827,   828,   837,   838,   842,   843,   847,   848,
+     852,   861,   862,   866,   867,   875,   890,   894,   895,   899,
+     900,   904,   905,   909,   914,   918,   922,   923,   927,   928,
+     932,   937,   938,   942,   944,   946,   948,   950
 };
 #endif
 
@@ -854,11 +855,11 @@ static const unsigned char yyr1[] =
      191,   191,   191,   191,   192,   193,   193,   194,   194,   194,
      194,   194,   194,   194,   195,   195,   195,   195,   195,   195,
      195,   195,   195,   195,   195,   195,   195,   195,   196,   196,
-     197,   197,   198,   198,   199,   199,   200,   200,   201,   201,
-     202,   202,   202,   203,   203,   204,   204,   205,   205,   206,
-     206,   206,   207,   207,   208,   209,   210,   210,   211,   211,
-     212,   212,   213,   214,   215,   216,   216,   217,   217,   218,
-     219,   219,   220,   220,   220,   220,   220
+     196,   197,   197,   198,   198,   199,   199,   200,   200,   201,
+     201,   202,   202,   202,   203,   203,   204,   204,   205,   205,
+     206,   206,   206,   207,   207,   208,   209,   210,   210,   211,
+     211,   212,   212,   213,   214,   215,   216,   216,   217,   217,
+     218,   219,   219,   220,   220,   220,   220,   220
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -880,13 +881,13 @@ static const unsigned char yyr2[] =
        2,     2,     3,     2,     1,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     1,     1,     1,     1,
        1,     1,     1,     1,     2,     2,     1,     2,     2,     2,
-       2,     2,     2,     2,     3,     1,     2,     2,     2,     3,
-       2,     2,     2,     2,     2,     2,     3,     2,     0,     1,
-       4,     3,     2,     1,     2,     2,     2,     1,     2,     1,
-       1,     1,     1,     2,     1,     2,     1,     2,     1,     1,
-       1,     1,     1,     1,     5,     1,     3,     2,     3,     3,
-       2,     1,     5,     4,     3,     1,     1,     2,     1,     6,
-       3,     2,     3,     3,     3,     3,     3
+       2,     2,     2,     2,     3,     1,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     3,     2,     1,     2,
+       0,     4,     3,     2,     1,     2,     2,     2,     1,     2,
+       1,     1,     1,     1,     2,     1,     2,     1,     2,     1,
+       1,     1,     1,     1,     1,     5,     1,     3,     2,     3,
+       3,     2,     1,     5,     4,     3,     1,     1,     2,     1,
+       6,     3,     2,     3,     3,     3,     3,     3
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -895,110 +896,110 @@ static const unsigned char yyr2[] =
 static const unsigned char yydefact[] =
 {
        0,     0,     0,     0,    23,    45,     0,     0,     0,     0,
-       0,     0,     0,     0,   165,     0,     0,     0,     0,     0,
+       0,     0,   180,     0,   165,     0,     0,     0,     0,     0,
        0,     0,    24,     0,     0,    22,     0,     0,    21,     0,
        0,     0,    20,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   205,     0,     2,     0,     7,     0,     8,     9,
+       0,     0,   206,     0,     2,     0,     7,     0,     8,     9,
       12,    10,    11,    13,    14,    15,    16,    17,     0,     5,
-      49,   172,    46,   203,   202,   166,   167,    50,     0,     0,
+      49,   172,    46,   204,   203,   166,   167,    50,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    51,    58,
      147,   148,   149,   150,   151,   152,   153,   144,   146,     0,
-       0,     0,   109,   128,   178,   143,    88,    89,    90,    91,
-      92,    93,     0,    28,    29,     0,    26,     0,    25,     6,
-      52,    53,   189,   192,   190,   191,   173,   187,     0,   171,
-     198,    47,    48,   196,   174,   170,    54,   113,   113,    25,
-      55,     0,   175,    83,    87,    84,   168,     0,     0,     0,
-       0,     0,     0,     0,   154,   156,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    69,    71,     0,
-     194,    56,   177,     1,     0,     4,    19,     0,    59,    66,
-      62,    64,    65,    60,    67,    68,    61,    63,    57,   145,
-     129,   130,   131,   127,   179,   169,   101,   100,     0,    98,
+       0,     0,   109,   128,   178,   169,   143,    88,    89,    90,
+      91,    92,    93,     0,    28,    29,     0,    26,     0,    25,
+       6,    52,    53,   190,   193,   191,   192,   173,   188,     0,
+     171,   199,    47,    48,   197,   174,   170,    54,   113,   113,
+      25,    55,     0,   175,    83,    87,    84,   168,     0,     0,
+       0,     0,     0,     0,     0,   154,   156,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    69,    71,
+       0,   195,    56,   177,     1,     0,     4,    19,     0,    59,
+      66,    62,    64,    65,    60,    67,    68,    61,    63,    57,
+     145,   129,   130,   131,   127,   179,   101,   100,     0,    98,
       99,     0,    85,    95,    27,     0,     0,     0,     0,     0,
-       0,     0,     0,   132,   134,   164,   186,   188,   197,   195,
+       0,     0,     0,   132,   134,   164,   187,   189,   198,   196,
      111,   110,     0,     0,    86,   157,   158,   159,   160,   161,
-     162,   163,   155,    81,    72,   201,   199,   200,    74,    73,
+     162,   163,   155,    81,    72,   202,   200,   201,    74,    73,
       79,    77,    82,    78,    76,    80,    75,    70,     0,     0,
-     176,   183,   193,     3,    32,    33,    34,     0,     0,     0,
+     176,   184,   194,     3,    32,    33,    34,     0,     0,     0,
        0,    38,    39,    40,    41,     0,     0,    18,    31,     0,
        0,     0,     0,    96,   108,   104,   106,   102,   103,   105,
      107,    97,    94,   139,   140,   141,   142,   138,   137,   135,
      136,   133,   115,   116,   117,   118,   119,   120,   121,   122,
-     123,   124,   125,   126,   114,   113,   181,   185,   184,   182,
+     123,   124,   125,   126,   114,   113,   182,   186,   185,   183,
       35,    37,    36,    43,    42,    44,    30,     0,     0,     0,
-       0,     0,   211,     0,   207,   112,   180,   208,   209,     0,
-     206,   204,   210,     0,   216,   215,   214,     0,     0,     0,
-       0,     0,   218,     0,     0,   212,   217,   213,     0,     0,
+       0,     0,   212,     0,   208,   112,   181,   209,   210,     0,
+     207,   205,   211,     0,   217,   216,   215,     0,     0,     0,
+       0,     0,   219,     0,     0,   213,   218,   214,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   219,     0,   221,   222,   223,   224,   225,   226,
-     220
+       0,     0,   220,     0,   222,   223,   224,   225,   226,   227,
+     221
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short yydefgoto[] =
 {
-      -1,    43,    44,    45,    46,    47,   120,   108,   257,   258,
-      48,    49,    78,    79,    50,   157,   158,    51,   133,   102,
+      -1,    43,    44,    45,    46,    47,   121,   109,   257,   258,
+      48,    49,    78,    79,    50,   158,   159,    51,   134,   103,
      192,   193,   271,    52,   210,   294,    92,    93,    53,   203,
-     204,    54,    87,    88,    55,   144,   145,    56,   185,   132,
-     240,   241,   116,   117,   118,   161,   124,   121,   228,    65,
+     204,    54,    87,    88,    55,   145,   146,    56,    95,   133,
+     240,   241,   117,   118,   119,   162,   125,   122,   228,    65,
       57,    58,   261,   262,   311,   312,   328,   313,   326,   331,
      332,   345,   346
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -133
+#define YYPACT_NINF -135
 static const short yypact[] =
 {
-      25,  -120,   -30,   -14,  -133,   -55,   -24,   -10,    -9,   192,
-      54,    -2,   -76,    54,  -133,    53,   -40,   -75,   -72,   -63,
-      86,   -61,  -133,   -40,   -40,  -133,   -60,   -58,  -133,    17,
-     178,    19,  -133,   -48,    53,   -45,   -24,    14,   141,   -19,
-      28,    28,  -133,    87,   165,   -56,  -133,   -40,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,   -64,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,   -37,   -28,
-     -27,   -25,   -16,     0,     2,     6,     7,     8,   192,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,    54,  -133,    41,
-      62,    69,    -2,  -133,    89,    54,  -133,  -133,  -133,  -133,
-    -133,  -133,   -15,  -133,  -133,    20,  -133,   223,  -133,   310,
-    -133,  -133,  -133,  -133,  -133,  -133,    86,  -133,    29,  -133,
-    -133,   -40,   -40,  -133,    45,  -133,  -133,  -133,  -133,    80,
-    -133,    22,  -133,    53,  -133,  -133,  -133,   -24,   -24,   -24,
-     -24,   -24,   -24,   -24,    14,  -133,   119,   126,   -11,   130,
-     -24,   -24,   131,   -24,   -24,   134,   135,   141,  -133,   -39,
-    -133,   136,   136,  -133,    51,  -133,   327,  -110,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,    71,  -133,
-    -133,     9,   -15,  -133,  -133,   -11,   -11,   -11,   -11,    74,
-     140,   -24,   -24,   223,  -133,  -133,  -133,  -133,  -133,  -133,
-     387,   387,   -19,    75,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,   -19,   148,
-     -39,  -133,  -133,  -133,  -133,  -133,  -133,   152,   153,   161,
-     167,  -133,  -133,  -133,  -133,   168,   173,   327,  -133,    66,
-      78,    18,    93,  -133,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,   203,  -133,  -133,  -133,
-    -133,  -133,  -133,  -133,  -133,  -133,  -133,   -24,   -24,    96,
-     108,  -103,  -133,    95,  -133,   387,  -133,  -133,  -133,   -44,
-    -133,  -133,  -133,   113,  -133,  -133,  -133,    99,   118,   -24,
-     114,  -132,  -133,   128,   -24,  -133,  -133,  -133,   117,   106,
-     121,   122,   124,   132,   138,   207,   145,   -24,   -24,   -24,
-     -24,   -24,  -133,   146,  -133,  -133,  -133,  -133,  -133,  -133,
-    -133
+      10,  -134,   -41,   -34,  -135,   -66,   -15,   -19,    -7,   129,
+       0,    -4,   -75,     0,  -135,    32,    42,   -73,   -71,   -65,
+      50,   -49,  -135,    42,    42,  -135,   -43,   -33,  -135,    26,
+      37,    47,  -135,     5,    32,    13,   -15,    -1,   179,    39,
+      56,    56,  -135,   135,   165,     4,  -135,    42,  -135,  -135,
+    -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,    -6,  -135,
+    -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,    24,    29,
+      34,    35,    36,    44,    45,    63,    68,    69,   129,  -135,
+    -135,  -135,  -135,  -135,  -135,  -135,  -135,     0,  -135,   103,
+     146,   148,    -4,  -135,   152,  -135,     0,  -135,  -135,  -135,
+    -135,  -135,  -135,    -2,  -135,  -135,    82,  -135,    27,  -135,
+     310,  -135,  -135,  -135,  -135,  -135,  -135,    50,  -135,    87,
+    -135,  -135,    42,    42,  -135,    94,  -135,  -135,  -135,  -135,
+     151,  -135,    72,  -135,    32,  -135,  -135,  -135,   -15,   -15,
+     -15,   -15,   -15,   -15,   -15,    -1,  -135,   168,   172,   -16,
+     173,   -15,   -15,   174,   -15,   -15,   177,   178,   179,  -135,
+     -11,  -135,   181,   181,  -135,    95,  -135,   327,   -45,  -135,
+    -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,
+    -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,   120,  -135,
+    -135,    46,    -2,  -135,  -135,   -16,   -16,   -16,   -16,   121,
+     182,   -15,   -15,    27,  -135,  -135,  -135,  -135,  -135,  -135,
+     299,   299,    39,   128,  -135,  -135,  -135,  -135,  -135,  -135,
+    -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,
+    -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,    39,   202,
+     -11,  -135,  -135,  -135,  -135,  -135,  -135,   203,   211,   213,
+     216,  -135,  -135,  -135,  -135,   219,   220,   327,  -135,   122,
+     124,    66,   141,  -135,  -135,  -135,  -135,  -135,  -135,  -135,
+    -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,
+    -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,  -135,
+    -135,  -135,  -135,  -135,  -135,  -135,   260,  -135,  -135,  -135,
+    -135,  -135,  -135,  -135,  -135,  -135,  -135,   -15,   -15,   134,
+     147,  -109,  -135,   132,  -135,   299,  -135,  -135,  -135,    11,
+    -135,  -135,  -135,   145,  -135,  -135,  -135,   149,   154,   -15,
+     150,  -128,  -135,   162,   -15,  -135,  -135,  -135,   138,   111,
+     153,   156,   157,   166,   167,    92,   163,   -15,   -15,   -15,
+     -15,   -15,  -135,   176,  -135,  -135,  -135,  -135,  -135,  -135,
+    -135
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short yypgoto[] =
 {
-    -133,  -133,  -133,   -35,  -133,  -133,    83,   -29,  -133,    26,
-    -133,  -133,  -133,   211,  -133,  -133,   137,  -133,  -133,   -13,
-    -133,   112,  -133,  -133,  -126,  -133,  -133,   213,  -133,  -133,
-     103,  -133,   296,   -68,  -133,  -133,   174,  -133,  -133,  -133,
-    -133,    79,  -133,   204,  -133,   283,  -133,   301,    49,   -36,
-    -133,  -133,  -133,    67,  -133,    16,  -133,  -133,  -133,  -133,
-      -1,  -133,    -7
+    -135,  -135,  -135,   -38,  -135,  -135,    41,   -29,  -135,    67,
+    -135,  -135,  -135,   247,  -135,  -135,   169,  -135,  -135,   -22,
+    -135,   136,  -135,  -135,  -127,  -135,  -135,   237,  -135,  -135,
+     127,  -135,   321,   -62,  -135,  -135,   190,  -135,  -135,  -135,
+    -135,    98,  -135,   222,  -135,   303,  -135,   323,    19,   -36,
+    -135,  -135,  -135,    84,  -135,    38,  -135,  -135,  -135,  -135,
+      17,  -135,     7
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -1008,116 +1009,104 @@ static const short yypgoto[] =
 #define YYTABLE_NINF -7
 static const short yytable[] =
 {
-     136,   129,   211,   103,   104,    63,    89,   103,   104,   164,
-     159,   186,   264,   309,   105,   330,   238,   187,   137,   179,
-     188,   134,    59,   225,    60,   335,     1,   179,   103,   104,
-      64,     2,     3,   265,   259,   260,     4,     5,     6,    62,
-      61,     7,   138,   226,    66,    67,     8,     9,   189,    94,
-     109,    10,    11,   110,   321,    12,   139,    13,    14,    80,
-     140,    15,   111,    81,   119,   123,   239,   125,    16,    82,
-     190,   126,    96,   130,   205,    90,    97,   131,    17,    91,
-     135,   324,   160,    18,    19,   106,   165,   163,   168,    20,
-      21,   266,   167,    22,    23,   180,   267,   169,   170,   107,
-     171,   215,   216,   217,   218,   219,   220,   221,    24,   172,
-      83,   268,   141,   128,   230,   231,   181,   233,   234,    98,
-     214,   191,   227,   182,    25,   173,    26,   174,    27,    28,
-     166,   175,   176,   177,   309,    84,   142,   143,    29,    30,
-      31,    32,    33,   184,    34,   194,    35,   269,   270,    85,
-     212,   146,    36,    99,   207,    37,    38,    39,   147,    40,
-      41,   148,   259,   260,   100,   279,   280,    -6,    42,   315,
-     209,     2,     3,   223,    86,   213,     4,     5,     6,   101,
-     224,     7,   149,   295,   229,   232,     8,     9,   235,   236,
-     242,    10,    11,   243,   278,    12,   263,    13,    14,   277,
-     296,    15,   298,   127,   208,   208,   300,   301,    16,   297,
-      68,   112,   150,   151,   152,   302,   153,   154,    17,   307,
-     155,   303,   304,    18,    19,   103,   104,   305,   316,    20,
-      21,   308,   105,    22,    23,   314,    69,    70,   156,   113,
-     114,   115,    71,    72,   273,   274,   275,   276,    24,   319,
-     320,   323,   329,    73,   340,   341,   342,   343,   344,   327,
-     195,   196,   197,   198,    25,   330,    26,   334,    27,    28,
-     337,   317,   318,   339,   347,   348,    74,   349,    29,    30,
-      31,    32,    33,   306,    34,   350,    35,   354,   360,   178,
-     325,   351,    36,   333,   237,    37,    38,    39,   338,    40,
-      41,    75,    76,   106,   272,   183,   281,    -6,    42,    95,
-      77,   355,   356,   357,   358,   359,     2,     3,   222,   299,
-     206,     4,     5,     6,   162,   122,     7,   322,   310,     0,
-     336,     8,     9,   244,     0,   199,    10,    11,   353,     0,
-      12,   245,    13,    14,     0,     0,    15,   200,     0,     0,
-       0,   201,   202,    16,     0,   340,   341,   342,   343,   344,
-       0,     0,     0,    17,   352,     0,     0,     0,    18,    19,
+     137,   130,   211,   138,    89,    80,   165,   309,    59,    81,
+     160,     1,   135,    60,    63,    82,     2,     3,   225,   330,
+      61,     4,     5,     6,   186,   180,     7,   139,    62,   335,
+     187,     8,     9,   188,   180,    66,    10,    11,   226,    64,
+      12,   140,    13,    14,   238,   141,    15,    67,   321,   264,
+      94,    97,   110,    16,   111,    98,    83,   108,   104,   105,
+     112,   189,   128,    17,   195,   196,   197,   198,    18,    19,
+     265,   129,   205,    90,    20,    21,   120,    91,    22,    23,
+     127,    84,   124,   190,   104,   105,   104,   105,   167,   104,
+     105,   106,   126,    24,   239,    85,   106,   142,    99,   259,
+     260,   131,   215,   216,   217,   218,   219,   220,   221,    25,
+     161,    26,   214,    27,    28,   230,   231,   227,   233,   234,
+      86,   143,   144,    29,    30,    31,    32,    33,   266,    34,
+     132,    35,   100,   267,   191,   164,   324,    36,   136,   199,
+      37,    38,    39,   101,    40,    41,   166,    68,   268,   169,
+     168,   200,    -6,    42,   170,   201,   202,   181,   102,   171,
+     172,   173,   107,   208,   208,   279,   280,   107,   315,   174,
+     175,     2,     3,    69,    70,   113,     4,     5,     6,    71,
+      72,     7,   309,   295,   269,   270,     8,     9,   176,   147,
+      73,    10,    11,   177,   178,    12,   148,    13,    14,   149,
+     182,    15,   183,   114,   115,   116,   185,   194,    16,   297,
+     259,   260,   207,    74,   273,   274,   275,   276,    17,   209,
+     150,   212,   223,    18,    19,   213,   224,   229,   232,    20,
+      21,   235,   236,    22,    23,   242,   278,   243,    75,    76,
+     340,   341,   342,   343,   344,   263,   277,    77,    24,   352,
+     151,   152,   153,   296,   154,   155,   298,   300,   156,   340,
+     341,   342,   343,   344,    25,   301,    26,   302,    27,    28,
+     303,   317,   318,   304,   305,   307,   157,   308,    29,    30,
+      31,    32,    33,   314,    34,   316,    35,   319,   323,   320,
+     325,   327,    36,   333,   339,    37,    38,    39,   338,    40,
+      41,   330,   329,   334,   337,   354,   347,    -6,    42,   348,
+     349,   355,   356,   357,   358,   359,     2,     3,   360,   350,
+     351,     4,     5,     6,   306,   179,     7,   237,   272,   184,
+     281,     8,     9,   244,    96,   222,    10,    11,   299,   206,
+      12,   245,    13,    14,   163,   310,    15,   123,   336,   322,
+       0,   282,   353,    16,     0,     0,     0,     0,     0,   283,
+       0,   284,     0,    17,     0,     0,   285,     0,    18,    19,
        0,     0,     0,     0,    20,    21,   246,     0,    22,    23,
-       0,     0,     0,     0,   247,     0,     0,     0,     0,     0,
-       0,     0,     0,    24,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   247,   286,     0,   287,   288,     0,
+     289,   290,   291,    24,     0,   292,     0,     0,     0,     0,
        0,   248,     0,     0,     0,   249,     0,   250,     0,    25,
        0,    26,     0,    27,    28,     0,     0,   251,     0,     0,
        0,     0,     0,    29,    30,    31,    32,    33,     0,    34,
-       0,    35,     0,     0,   252,   253,     0,    36,     0,   282,
-      37,    38,    39,     0,    40,    41,     0,   283,     0,   284,
-       0,     0,     0,    42,   285,     0,     0,     0,     0,     0,
-     254,     0,   255,     0,   256,     0,     0,     0,     0,     0,
-       0,     0,     0,   286,     0,   287,   288,     0,   289,   290,
-     291,     0,     0,   292,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   293
+       0,    35,     0,     0,   252,   253,   293,    36,     0,     0,
+      37,    38,    39,     0,    40,    41,     0,     0,     0,     0,
+       0,     0,     0,    42,     0,     0,     0,     0,     0,     0,
+     254,     0,   255,     0,   256
 };
 
 static const short yycheck[] =
 {
-      36,    30,   128,    47,    48,    29,     8,    47,    48,    44,
-      39,    26,     3,   116,    54,   147,    55,    32,     4,    87,
-      35,    34,   142,    34,    54,   157,     1,    95,    47,    48,
-      54,     6,     7,    24,   144,   145,    11,    12,    13,    94,
-      54,    16,    28,    54,    54,    54,    21,    22,    63,   125,
-     125,    26,    27,   125,   157,    30,    42,    32,    33,     5,
-      46,    36,   125,     9,   125,   125,   105,   125,    43,    15,
-      85,    54,    19,    54,   109,    77,    23,   125,    53,    81,
-     125,   125,    54,    58,    59,   125,   142,     0,   125,    64,
-      65,    82,   156,    68,    69,    54,    87,   125,   125,    16,
-     125,   137,   138,   139,   140,   141,   142,   143,    83,   125,
-      56,   102,    98,    30,   150,   151,    54,   153,   154,    66,
-     133,   136,   133,    54,    99,   125,   101,   125,   103,   104,
-      47,   125,   125,   125,   116,    81,   122,   123,   113,   114,
-     115,   116,   117,    54,   119,   125,   121,   138,   139,    95,
-      70,    10,   127,   100,   125,   130,   131,   132,    17,   134,
-     135,    20,   144,   145,   111,   201,   202,   142,   143,   295,
-     125,     6,     7,    54,   120,   153,    11,    12,    13,   126,
-      54,    16,    41,   212,    54,    54,    21,    22,    54,    54,
-      54,    26,    27,   142,    54,    30,   125,    32,    33,   125,
-     125,    36,    54,    25,   121,   122,    54,    54,    43,   238,
-      18,   125,    71,    72,    73,    54,    75,    76,    53,   153,
-      79,    54,    54,    58,    59,    47,    48,    54,    25,    64,
-      65,   153,    54,    68,    69,   142,    44,    45,    97,   153,
-     154,   155,    50,    51,   195,   196,   197,   198,    83,   153,
-     142,   156,   153,    61,   148,   149,   150,   151,   152,   146,
-      37,    38,    39,    40,    99,   147,   101,   153,   103,   104,
-     142,   307,   308,   156,   153,   153,    84,   153,   113,   114,
-     115,   116,   117,   257,   119,   153,   121,   142,   142,    78,
-     319,   153,   127,   329,   157,   130,   131,   132,   334,   134,
-     135,   109,   110,   125,   192,    92,   203,   142,   143,    13,
-     118,   347,   348,   349,   350,   351,     6,     7,   144,   240,
-     116,    11,    12,    13,    41,    24,    16,   311,   261,    -1,
-     331,    21,    22,     6,    -1,   112,    26,    27,   345,    -1,
-      30,    14,    32,    33,    -1,    -1,    36,   124,    -1,    -1,
-      -1,   128,   129,    43,    -1,   148,   149,   150,   151,   152,
-      -1,    -1,    -1,    53,   157,    -1,    -1,    -1,    58,    59,
+      36,    30,   129,     4,     8,     5,    44,   116,   142,     9,
+      39,     1,    34,    54,    29,    15,     6,     7,    34,   147,
+      54,    11,    12,    13,    26,    87,    16,    28,    94,   157,
+      32,    21,    22,    35,    96,    54,    26,    27,    54,    54,
+      30,    42,    32,    33,    55,    46,    36,    54,   157,     3,
+     125,    19,   125,    43,   125,    23,    56,    16,    47,    48,
+     125,    63,    25,    53,    37,    38,    39,    40,    58,    59,
+      24,    30,   110,    77,    64,    65,   125,    81,    68,    69,
+      54,    81,   125,    85,    47,    48,    47,    48,    47,    47,
+      48,    54,   125,    83,   105,    95,    54,    98,    66,   144,
+     145,    54,   138,   139,   140,   141,   142,   143,   144,    99,
+      54,   101,   134,   103,   104,   151,   152,   133,   154,   155,
+     120,   122,   123,   113,   114,   115,   116,   117,    82,   119,
+     125,   121,   100,    87,   136,     0,   125,   127,   125,   112,
+     130,   131,   132,   111,   134,   135,   142,    18,   102,   125,
+     156,   124,   142,   143,   125,   128,   129,    54,   126,   125,
+     125,   125,   125,   122,   123,   201,   202,   125,   295,   125,
+     125,     6,     7,    44,    45,   125,    11,    12,    13,    50,
+      51,    16,   116,   212,   138,   139,    21,    22,   125,    10,
+      61,    26,    27,   125,   125,    30,    17,    32,    33,    20,
+      54,    36,    54,   153,   154,   155,    54,   125,    43,   238,
+     144,   145,   125,    84,   195,   196,   197,   198,    53,   125,
+      41,    70,    54,    58,    59,   153,    54,    54,    54,    64,
+      65,    54,    54,    68,    69,    54,    54,   142,   109,   110,
+     148,   149,   150,   151,   152,   125,   125,   118,    83,   157,
+      71,    72,    73,   125,    75,    76,    54,    54,    79,   148,
+     149,   150,   151,   152,    99,    54,   101,    54,   103,   104,
+      54,   307,   308,    54,    54,   153,    97,   153,   113,   114,
+     115,   116,   117,   142,   119,    25,   121,   153,   156,   142,
+     319,   146,   127,   329,   156,   130,   131,   132,   334,   134,
+     135,   147,   153,   153,   142,   142,   153,   142,   143,   153,
+     153,   347,   348,   349,   350,   351,     6,     7,   142,   153,
+     153,    11,    12,    13,   257,    78,    16,   158,   192,    92,
+     203,    21,    22,     6,    13,   145,    26,    27,   240,   117,
+      30,    14,    32,    33,    41,   261,    36,    24,   331,   311,
+      -1,    52,   345,    43,    -1,    -1,    -1,    -1,    -1,    60,
+      -1,    62,    -1,    53,    -1,    -1,    67,    -1,    58,    59,
       -1,    -1,    -1,    -1,    64,    65,    49,    -1,    68,    69,
-      -1,    -1,    -1,    -1,    57,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    83,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    57,    86,    -1,    88,    89,    -1,
+      91,    92,    93,    83,    -1,    96,    -1,    -1,    -1,    -1,
       -1,    74,    -1,    -1,    -1,    78,    -1,    80,    -1,    99,
       -1,   101,    -1,   103,   104,    -1,    -1,    90,    -1,    -1,
       -1,    -1,    -1,   113,   114,   115,   116,   117,    -1,   119,
-      -1,   121,    -1,    -1,   107,   108,    -1,   127,    -1,    52,
-     130,   131,   132,    -1,   134,   135,    -1,    60,    -1,    62,
-      -1,    -1,    -1,   143,    67,    -1,    -1,    -1,    -1,    -1,
-     133,    -1,   135,    -1,   137,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    86,    -1,    88,    89,    -1,    91,    92,
-      93,    -1,    -1,    96,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   137
+      -1,   121,    -1,    -1,   107,   108,   137,   127,    -1,    -1,
+     130,   131,   132,    -1,   134,   135,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   143,    -1,    -1,    -1,    -1,    -1,    -1,
+     133,    -1,   135,    -1,   137
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1133,16 +1122,16 @@ static const unsigned char yystos[] =
       54,    54,    94,    29,    54,   207,    54,    54,    18,    44,
       45,    50,    51,    61,    84,   109,   110,   118,   170,   171,
        5,     9,    15,    56,    81,    95,   120,   190,   191,     8,
-      77,    81,   184,   185,   125,   190,    19,    23,    66,   100,
-     111,   126,   177,    47,    48,    54,   125,   164,   165,   125,
-     125,   125,   125,   153,   154,   155,   200,   201,   202,   125,
-     164,   205,   205,   125,   204,   125,    54,    25,   164,   165,
-      54,   125,   197,   176,   177,   125,   207,     4,    28,    42,
-      46,    98,   122,   123,   193,   194,    10,    17,    20,    41,
-      71,    72,    73,    75,    76,    79,    97,   173,   174,   165,
-      54,   203,   203,     0,   161,   142,   164,   156,   125,   125,
-     125,   125,   125,   125,   125,   125,   125,   125,   171,   191,
-      54,    54,    54,   185,    54,   196,    26,    32,    35,    63,
+      77,    81,   184,   185,   125,   196,   190,    19,    23,    66,
+     100,   111,   126,   177,    47,    48,    54,   125,   164,   165,
+     125,   125,   125,   125,   153,   154,   155,   200,   201,   202,
+     125,   164,   205,   205,   125,   204,   125,    54,    25,   164,
+     165,    54,   125,   197,   176,   177,   125,   207,     4,    28,
+      42,    46,    98,   122,   123,   193,   194,    10,    17,    20,
+      41,    71,    72,    73,    75,    76,    79,    97,   173,   174,
+     165,    54,   203,   203,     0,   161,   142,   164,   156,   125,
+     125,   125,   125,   125,   125,   125,   125,   125,   125,   171,
+     191,    54,    54,    54,   185,    54,    26,    32,    35,    63,
       85,   136,   178,   179,   125,    37,    38,    39,    40,   112,
      124,   128,   129,   187,   188,   161,   201,   125,   164,   125,
      182,   182,    70,   153,   177,   207,   207,   207,   207,   207,
@@ -1711,16 +1700,18 @@ yyreduce:
   switch (yyn)
     {
         case 5:
-#line 309 "ntp_parser.y"
+#line 310 "ntp_parser.y"
     { 
-                    fprintf(stderr, "PARSE ERROR!! At Line: %d\n", 
-                            ip_file->line_no);
-                    fprintf(stderr, "Line Ignored!!\n");
+					if (input_from_file == 1) {
+                    	msyslog(LOG_INFO, "parse error %s line %d ignored\n",
+                            ip_file->fname, ip_file->line_no);
+                	} else if (input_from_file != 0)
+						msyslog(LOG_INFO, "parse: bad boolean input flag\n"); 
                 }
     break;
 
   case 18:
-#line 336 "ntp_parser.y"
+#line 339 "ntp_parser.y"
     { 
                         struct peer_node *my_node =  create_peer_node(yyvsp[-2].Integer, yyvsp[-1].Address_node, yyvsp[0].Queue); 
                         if (my_node)
@@ -1729,7 +1720,7 @@ yyreduce:
     break;
 
   case 19:
-#line 342 "ntp_parser.y"
+#line 345 "ntp_parser.y"
     { 
                         struct peer_node *my_node = create_peer_node(yyvsp[-1].Integer, yyvsp[0].Address_node, NULL); 
                         if (my_node)
@@ -1738,42 +1729,42 @@ yyreduce:
     break;
 
   case 20:
-#line 350 "ntp_parser.y"
+#line 353 "ntp_parser.y"
     { yyval.Integer = T_Server; }
     break;
 
   case 21:
-#line 351 "ntp_parser.y"
+#line 354 "ntp_parser.y"
     { yyval.Integer = T_Pool; }
     break;
 
   case 22:
-#line 352 "ntp_parser.y"
+#line 355 "ntp_parser.y"
     { yyval.Integer = T_Peer; }
     break;
 
   case 23:
-#line 353 "ntp_parser.y"
+#line 356 "ntp_parser.y"
     { yyval.Integer = T_Broadcast; }
     break;
 
   case 24:
-#line 354 "ntp_parser.y"
+#line 357 "ntp_parser.y"
     { yyval.Integer = T_Manycastclient; }
     break;
 
   case 25:
-#line 358 "ntp_parser.y"
+#line 361 "ntp_parser.y"
     { yyval.Address_node = yyvsp[0].Address_node; }
     break;
 
   case 26:
-#line 359 "ntp_parser.y"
+#line 362 "ntp_parser.y"
     { yyval.Address_node = create_address_node(yyvsp[0].String, default_ai_family); }
     break;
 
   case 27:
-#line 361 "ntp_parser.y"
+#line 364 "ntp_parser.y"
     {
                         if (yyvsp[-1].Integer == -4)
                             yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET);
@@ -1787,122 +1778,122 @@ yyreduce:
     break;
 
   case 28:
-#line 376 "ntp_parser.y"
+#line 379 "ntp_parser.y"
     { yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET); }
     break;
 
   case 29:
-#line 377 "ntp_parser.y"
+#line 380 "ntp_parser.y"
     { yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET6); }
     break;
 
   case 30:
-#line 381 "ntp_parser.y"
+#line 384 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 
   case 31:
-#line 382 "ntp_parser.y"
+#line 385 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 
   case 32:
-#line 387 "ntp_parser.y"
+#line 390 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_SKEY | FLAG_AUTHENABLE); }
     break;
 
   case 33:
-#line 388 "ntp_parser.y"
+#line 391 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_BURST); }
     break;
 
   case 34:
-#line 389 "ntp_parser.y"
+#line 392 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_IBURST); }
     break;
 
   case 35:
-#line 390 "ntp_parser.y"
+#line 393 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Key, yyvsp[0].Integer); }
     break;
 
   case 36:
-#line 391 "ntp_parser.y"
+#line 394 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Minpoll, yyvsp[0].Integer); }
     break;
 
   case 37:
-#line 392 "ntp_parser.y"
+#line 395 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Maxpoll, yyvsp[0].Integer); }
     break;
 
   case 38:
-#line 393 "ntp_parser.y"
+#line 396 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_NOSELECT);}
     break;
 
   case 39:
-#line 394 "ntp_parser.y"
+#line 397 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREEMPT); }
     break;
 
   case 40:
-#line 395 "ntp_parser.y"
+#line 398 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREFER); }
     break;
 
   case 41:
-#line 396 "ntp_parser.y"
+#line 399 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_TRUE); }
     break;
 
   case 42:
-#line 397 "ntp_parser.y"
+#line 400 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Ttl, yyvsp[0].Integer); }
     break;
 
   case 43:
-#line 398 "ntp_parser.y"
+#line 401 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Mode, yyvsp[0].Integer); }
     break;
 
   case 44:
-#line 399 "ntp_parser.y"
+#line 402 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Version, yyvsp[0].Integer); }
     break;
 
   case 45:
-#line 410 "ntp_parser.y"
+#line 413 "ntp_parser.y"
     { my_config.broadcastclient = SIMPLE; }
     break;
 
   case 46:
-#line 412 "ntp_parser.y"
+#line 415 "ntp_parser.y"
     { my_config.broadcastclient = NOVOLLEY;  }
     break;
 
   case 47:
-#line 414 "ntp_parser.y"
+#line 417 "ntp_parser.y"
     { append_queue(my_config.manycastserver, yyvsp[0].Queue);  }
     break;
 
   case 48:
-#line 416 "ntp_parser.y"
+#line 419 "ntp_parser.y"
     { append_queue(my_config.multicastclient, yyvsp[0].Queue);  }
     break;
 
   case 49:
-#line 427 "ntp_parser.y"
+#line 430 "ntp_parser.y"
     { my_config.auth.autokey = yyvsp[0].Integer;  }
     break;
 
   case 50:
-#line 429 "ntp_parser.y"
+#line 432 "ntp_parser.y"
     { my_config.auth.control_key = yyvsp[0].Integer;  }
     break;
 
   case 51:
-#line 431 "ntp_parser.y"
+#line 434 "ntp_parser.y"
     { if (my_config.auth.crypto_cmd_list != NULL) 
 					append_queue(my_config.auth.crypto_cmd_list, yyvsp[0].Queue); 
 		 		else 
@@ -1911,172 +1902,172 @@ yyreduce:
     break;
 
   case 52:
-#line 437 "ntp_parser.y"
+#line 440 "ntp_parser.y"
     { my_config.auth.keys = yyvsp[0].String;  }
     break;
 
   case 53:
-#line 439 "ntp_parser.y"
+#line 442 "ntp_parser.y"
     { my_config.auth.keysdir = yyvsp[0].String;  }
     break;
 
   case 54:
-#line 441 "ntp_parser.y"
+#line 444 "ntp_parser.y"
     { my_config.auth.requested_key = yyvsp[0].Integer;  }
     break;
 
   case 55:
-#line 443 "ntp_parser.y"
+#line 446 "ntp_parser.y"
     { my_config.auth.revoke = yyvsp[0].Integer;  }
     break;
 
   case 56:
-#line 445 "ntp_parser.y"
+#line 448 "ntp_parser.y"
     { my_config.auth.trusted_key_list = yyvsp[0].Queue;  }
     break;
 
   case 57:
-#line 449 "ntp_parser.y"
+#line 452 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 
   case 58:
-#line 450 "ntp_parser.y"
+#line 453 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 
   case 59:
-#line 455 "ntp_parser.y"
+#line 458 "ntp_parser.y"
     { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_CERT, yyvsp[0].String); }
     break;
 
   case 60:
-#line 457 "ntp_parser.y"
+#line 460 "ntp_parser.y"
     { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_LEAP, yyvsp[0].String); }
     break;
 
   case 61:
-#line 459 "ntp_parser.y"
+#line 462 "ntp_parser.y"
     { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_RAND, yyvsp[0].String); }
     break;
 
   case 62:
-#line 461 "ntp_parser.y"
+#line 464 "ntp_parser.y"
     { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PRIV, yyvsp[0].String); }
     break;
 
   case 63:
-#line 463 "ntp_parser.y"
+#line 466 "ntp_parser.y"
     { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_SIGN, yyvsp[0].String); }
     break;
 
   case 64:
-#line 465 "ntp_parser.y"
+#line 468 "ntp_parser.y"
     { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IDENT, yyvsp[0].String); }
     break;
 
   case 65:
-#line 467 "ntp_parser.y"
+#line 470 "ntp_parser.y"
     { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IFFPAR, yyvsp[0].String); }
     break;
 
   case 66:
-#line 469 "ntp_parser.y"
+#line 472 "ntp_parser.y"
     { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_GQPAR, yyvsp[0].String); }
     break;
 
   case 67:
-#line 471 "ntp_parser.y"
+#line 474 "ntp_parser.y"
     { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_MVPAR, yyvsp[0].String); }
     break;
 
   case 68:
-#line 473 "ntp_parser.y"
+#line 476 "ntp_parser.y"
     { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PW, yyvsp[0].String); }
     break;
 
   case 69:
-#line 483 "ntp_parser.y"
+#line 486 "ntp_parser.y"
     { append_queue(my_config.orphan_cmds,yyvsp[0].Queue);  }
     break;
 
   case 70:
-#line 487 "ntp_parser.y"
+#line 490 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 
   case 71:
-#line 488 "ntp_parser.y"
+#line 491 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 
   case 72:
-#line 493 "ntp_parser.y"
+#line 496 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(PROTO_CEILING, (double)yyvsp[0].Integer); }
     break;
 
   case 73:
-#line 495 "ntp_parser.y"
+#line 498 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(PROTO_FLOOR, (double)yyvsp[0].Integer); }
     break;
 
   case 74:
-#line 497 "ntp_parser.y"
+#line 500 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(PROTO_COHORT, (double)yyvsp[0].Integer); }
     break;
 
   case 75:
-#line 499 "ntp_parser.y"
+#line 502 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(PROTO_ORPHAN, (double)yyvsp[0].Integer); }
     break;
 
   case 76:
-#line 501 "ntp_parser.y"
+#line 504 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(PROTO_MINDISP, yyvsp[0].Double); }
     break;
 
   case 77:
-#line 503 "ntp_parser.y"
+#line 506 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(PROTO_MAXDIST, yyvsp[0].Double); }
     break;
 
   case 78:
-#line 505 "ntp_parser.y"
+#line 508 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(PROTO_MINCLOCK, yyvsp[0].Double); }
     break;
 
   case 79:
-#line 507 "ntp_parser.y"
+#line 510 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(PROTO_MAXCLOCK, yyvsp[0].Double); }
     break;
 
   case 80:
-#line 509 "ntp_parser.y"
+#line 512 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(PROTO_MINSANE, (double)yyvsp[0].Integer); }
     break;
 
   case 81:
-#line 511 "ntp_parser.y"
+#line 514 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(PROTO_BEACON, (double)yyvsp[0].Integer); }
     break;
 
   case 82:
-#line 513 "ntp_parser.y"
+#line 516 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(PROTO_MAXHOP, (double)yyvsp[0].Integer); }
     break;
 
   case 83:
-#line 523 "ntp_parser.y"
+#line 526 "ntp_parser.y"
     { append_queue(my_config.stats_list, yyvsp[0].Queue);  }
     break;
 
   case 84:
-#line 525 "ntp_parser.y"
+#line 528 "ntp_parser.y"
     { my_config.stats_dir = yyvsp[0].String;  }
     break;
 
   case 85:
-#line 527 "ntp_parser.y"
+#line 530 "ntp_parser.y"
     {
                         enqueue(my_config.filegen_opts, 
                                 create_filegen_node(yyvsp[-1].VoidPtr, yyvsp[0].Queue));                         
@@ -2084,127 +2075,127 @@ yyreduce:
     break;
 
   case 86:
-#line 534 "ntp_parser.y"
+#line 537 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
     break;
 
   case 87:
-#line 535 "ntp_parser.y"
+#line 538 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[0].VoidPtr); }
     break;
 
   case 88:
-#line 540 "ntp_parser.y"
+#line 543 "ntp_parser.y"
     { yyval.VoidPtr = create_pval("clockstats"); }
     break;
 
   case 89:
-#line 542 "ntp_parser.y"
+#line 545 "ntp_parser.y"
     { yyval.VoidPtr = create_pval("cryptostats"); }
     break;
 
   case 90:
-#line 544 "ntp_parser.y"
+#line 547 "ntp_parser.y"
     { yyval.VoidPtr = create_pval("loopstats"); }
     break;
 
   case 91:
-#line 546 "ntp_parser.y"
+#line 549 "ntp_parser.y"
     { yyval.VoidPtr = create_pval("peerstats"); }
     break;
 
   case 92:
-#line 548 "ntp_parser.y"
+#line 551 "ntp_parser.y"
     { yyval.VoidPtr = create_pval("rawstats"); }
     break;
 
   case 93:
-#line 550 "ntp_parser.y"
+#line 553 "ntp_parser.y"
     { yyval.VoidPtr = create_pval("sysstats"); }
     break;
 
   case 94:
-#line 554 "ntp_parser.y"
+#line 557 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 
   case 95:
-#line 555 "ntp_parser.y"
+#line 558 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 
   case 96:
-#line 559 "ntp_parser.y"
+#line 562 "ntp_parser.y"
     { yyval.Attr_val = create_attr_sval(T_File, yyvsp[0].String); }
     break;
 
   case 97:
-#line 560 "ntp_parser.y"
+#line 563 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Type, yyvsp[0].Integer); }
     break;
 
   case 98:
-#line 561 "ntp_parser.y"
+#line 564 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, T_Link); }
     break;
 
   case 99:
-#line 562 "ntp_parser.y"
+#line 565 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, T_Nolink); }
     break;
 
   case 100:
-#line 563 "ntp_parser.y"
+#line 566 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, T_Enable); }
     break;
 
   case 101:
-#line 564 "ntp_parser.y"
+#line 567 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, T_Disable); }
     break;
 
   case 102:
-#line 568 "ntp_parser.y"
+#line 571 "ntp_parser.y"
     { yyval.Integer = FILEGEN_NONE; }
     break;
 
   case 103:
-#line 569 "ntp_parser.y"
+#line 572 "ntp_parser.y"
     { yyval.Integer = FILEGEN_PID; }
     break;
 
   case 104:
-#line 570 "ntp_parser.y"
+#line 573 "ntp_parser.y"
     { yyval.Integer = FILEGEN_DAY; }
     break;
 
   case 105:
-#line 571 "ntp_parser.y"
+#line 574 "ntp_parser.y"
     { yyval.Integer = FILEGEN_WEEK; }
     break;
 
   case 106:
-#line 572 "ntp_parser.y"
+#line 575 "ntp_parser.y"
     { yyval.Integer = FILEGEN_MONTH; }
     break;
 
   case 107:
-#line 573 "ntp_parser.y"
+#line 576 "ntp_parser.y"
     { yyval.Integer = FILEGEN_YEAR; }
     break;
 
   case 108:
-#line 574 "ntp_parser.y"
+#line 577 "ntp_parser.y"
     { yyval.Integer = FILEGEN_AGE; }
     break;
 
   case 109:
-#line 584 "ntp_parser.y"
+#line 587 "ntp_parser.y"
     {   append_queue(my_config.discard_opts, yyvsp[0].Queue); }
     break;
 
   case 110:
-#line 586 "ntp_parser.y"
+#line 589 "ntp_parser.y"
     { 
                         enqueue(my_config.restrict_opts, 
                                 create_restrict_node(yyvsp[-1].Address_node, NULL, yyvsp[0].Queue, ip_file->line_no));                          
@@ -2212,7 +2203,7 @@ yyreduce:
     break;
 
   case 111:
-#line 591 "ntp_parser.y"
+#line 594 "ntp_parser.y"
     { 
                         enqueue(my_config.restrict_opts, 
                                 create_restrict_node(NULL, NULL, yyvsp[0].Queue, ip_file->line_no)); 
@@ -2220,7 +2211,7 @@ yyreduce:
     break;
 
   case 112:
-#line 596 "ntp_parser.y"
+#line 599 "ntp_parser.y"
     { 
                         enqueue(my_config.restrict_opts, 
                                 create_restrict_node(yyvsp[-3].Address_node, yyvsp[-1].Address_node, yyvsp[0].Queue, ip_file->line_no)); 
@@ -2228,262 +2219,262 @@ yyreduce:
     break;
 
   case 113:
-#line 603 "ntp_parser.y"
+#line 606 "ntp_parser.y"
     { yyval.Queue = create_queue(); }
     break;
 
   case 114:
-#line 604 "ntp_parser.y"
+#line 607 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
     break;
 
   case 115:
-#line 608 "ntp_parser.y"
+#line 611 "ntp_parser.y"
     { yyval.VoidPtr = create_ival(RES_IGNORE); }
     break;
 
   case 116:
-#line 609 "ntp_parser.y"
+#line 612 "ntp_parser.y"
     { yyval.VoidPtr = create_ival(RES_DEMOBILIZE); }
     break;
 
   case 117:
-#line 610 "ntp_parser.y"
+#line 613 "ntp_parser.y"
     { yyval.VoidPtr = create_ival(RES_LIMITED); }
     break;
 
   case 118:
-#line 611 "ntp_parser.y"
+#line 614 "ntp_parser.y"
     { yyval.VoidPtr = create_ival(RES_LPTRAP); }
     break;
 
   case 119:
-#line 612 "ntp_parser.y"
+#line 615 "ntp_parser.y"
     { yyval.VoidPtr = create_ival(RES_NOMODIFY); }
     break;
 
   case 120:
-#line 613 "ntp_parser.y"
+#line 616 "ntp_parser.y"
     { yyval.VoidPtr = create_ival(RES_NOPEER); }
     break;
 
   case 121:
-#line 614 "ntp_parser.y"
+#line 617 "ntp_parser.y"
     { yyval.VoidPtr = create_ival(RES_NOQUERY); }
     break;
 
   case 122:
-#line 615 "ntp_parser.y"
+#line 618 "ntp_parser.y"
     { yyval.VoidPtr = create_ival(RES_DONTSERVE); }
     break;
 
   case 123:
-#line 616 "ntp_parser.y"
+#line 619 "ntp_parser.y"
     { yyval.VoidPtr = create_ival(RES_NOTRAP); }
     break;
 
   case 124:
-#line 617 "ntp_parser.y"
+#line 620 "ntp_parser.y"
     { yyval.VoidPtr = create_ival(RES_DONTTRUST); }
     break;
 
   case 125:
-#line 618 "ntp_parser.y"
+#line 621 "ntp_parser.y"
     { yyval.VoidPtr = create_ival(RESM_NTPONLY); }
     break;
 
   case 126:
-#line 619 "ntp_parser.y"
+#line 622 "ntp_parser.y"
     { yyval.VoidPtr = create_ival(RES_VERSION); }
     break;
 
   case 127:
-#line 623 "ntp_parser.y"
+#line 626 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 
   case 128:
-#line 624 "ntp_parser.y"
+#line 627 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 
   case 129:
-#line 628 "ntp_parser.y"
+#line 631 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Average, yyvsp[0].Integer); }
     break;
 
   case 130:
-#line 629 "ntp_parser.y"
+#line 632 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Minimum, yyvsp[0].Integer); }
     break;
 
   case 131:
-#line 630 "ntp_parser.y"
+#line 633 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Monitor, yyvsp[0].Integer); }
     break;
 
   case 132:
-#line 639 "ntp_parser.y"
+#line 642 "ntp_parser.y"
     { enqueue(my_config.fudge, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
     break;
 
   case 133:
-#line 643 "ntp_parser.y"
+#line 646 "ntp_parser.y"
     { enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 
   case 134:
-#line 644 "ntp_parser.y"
+#line 647 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 
   case 135:
-#line 649 "ntp_parser.y"
+#line 652 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(CLK_HAVETIME1, yyvsp[0].Double); }
     break;
 
   case 136:
-#line 651 "ntp_parser.y"
+#line 654 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(CLK_HAVETIME2, yyvsp[0].Double); }
     break;
 
   case 137:
-#line 653 "ntp_parser.y"
+#line 656 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(CLK_HAVEVAL1,  yyvsp[0].Integer); }
     break;
 
   case 138:
-#line 655 "ntp_parser.y"
+#line 658 "ntp_parser.y"
     { yyval.Attr_val = create_attr_sval(CLK_HAVEVAL2,  yyvsp[0].String); }
     break;
 
   case 139:
-#line 657 "ntp_parser.y"
+#line 660 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG1, yyvsp[0].Integer); }
     break;
 
   case 140:
-#line 659 "ntp_parser.y"
+#line 662 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG2, yyvsp[0].Integer); }
     break;
 
   case 141:
-#line 661 "ntp_parser.y"
+#line 664 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG3, yyvsp[0].Integer); }
     break;
 
   case 142:
-#line 663 "ntp_parser.y"
+#line 666 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG4, yyvsp[0].Integer); }
     break;
 
   case 143:
-#line 672 "ntp_parser.y"
+#line 675 "ntp_parser.y"
     { append_queue(my_config.enable_opts,yyvsp[0].Queue);  }
     break;
 
   case 144:
-#line 674 "ntp_parser.y"
+#line 677 "ntp_parser.y"
     { append_queue(my_config.disable_opts,yyvsp[0].Queue);  }
     break;
 
   case 145:
-#line 678 "ntp_parser.y"
+#line 681 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 
   case 146:
-#line 679 "ntp_parser.y"
+#line 682 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 
   case 147:
-#line 683 "ntp_parser.y"
+#line 686 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); }
     break;
 
   case 148:
-#line 684 "ntp_parser.y"
+#line 687 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_BROADCLIENT); }
     break;
 
   case 149:
-#line 685 "ntp_parser.y"
+#line 688 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_CAL); }
     break;
 
   case 150:
-#line 686 "ntp_parser.y"
+#line 689 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_KERNEL); }
     break;
 
   case 151:
-#line 687 "ntp_parser.y"
+#line 690 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_MONITOR); }
     break;
 
   case 152:
-#line 688 "ntp_parser.y"
+#line 691 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_NTP); }
     break;
 
   case 153:
-#line 690 "ntp_parser.y"
+#line 693 "ntp_parser.y"
     { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_FILEGEN); }
     break;
 
   case 154:
-#line 698 "ntp_parser.y"
+#line 701 "ntp_parser.y"
     { append_queue(my_config.tinker, yyvsp[0].Queue);  }
     break;
 
   case 155:
-#line 702 "ntp_parser.y"
+#line 705 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 
   case 156:
-#line 703 "ntp_parser.y"
+#line 706 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 
   case 157:
-#line 707 "ntp_parser.y"
+#line 710 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(LOOP_ALLAN, yyvsp[0].Double); }
     break;
 
   case 158:
-#line 708 "ntp_parser.y"
+#line 711 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(LOOP_PHI, yyvsp[0].Double); }
     break;
 
   case 159:
-#line 709 "ntp_parser.y"
+#line 712 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(LOOP_FREQ, yyvsp[0].Double); }
     break;
 
   case 160:
-#line 710 "ntp_parser.y"
+#line 713 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(LOOP_HUFFPUFF, yyvsp[0].Double); }
     break;
 
   case 161:
-#line 711 "ntp_parser.y"
+#line 714 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(LOOP_PANIC, yyvsp[0].Double); }
     break;
 
   case 162:
-#line 712 "ntp_parser.y"
+#line 715 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(LOOP_MAX, yyvsp[0].Double); }
     break;
 
   case 163:
-#line 713 "ntp_parser.y"
+#line 716 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(LOOP_MINSTEP, yyvsp[0].Double); }
     break;
 
   case 164:
-#line 722 "ntp_parser.y"
+#line 725 "ntp_parser.y"
     {
                     if (curr_include_level >= MAXINCLUDELEVEL) {
                         fprintf(stderr, "getconfig: Maximum include file level exceeded.\n");
@@ -2502,7 +2493,7 @@ yyreduce:
     break;
 
   case 165:
-#line 738 "ntp_parser.y"
+#line 741 "ntp_parser.y"
     {
                     while (curr_include_level != -1) 
                         FCLOSE(fp[curr_include_level--]);
@@ -2510,122 +2501,129 @@ yyreduce:
     break;
 
   case 166:
-#line 744 "ntp_parser.y"
+#line 747 "ntp_parser.y"
     { enqueue(my_config.vars, create_attr_dval(T_Broadcastdelay, yyvsp[0].Double));  }
     break;
 
   case 167:
-#line 746 "ntp_parser.y"
+#line 749 "ntp_parser.y"
     { enqueue(my_config.vars, create_attr_ival(T_Calldelay, yyvsp[0].Integer));  }
     break;
 
   case 168:
-#line 748 "ntp_parser.y"
+#line 751 "ntp_parser.y"
     { enqueue(my_config.vars, create_attr_dval(T_Tick, yyvsp[0].Double));  }
     break;
 
   case 169:
-#line 750 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[-1].String)); }
+#line 753 "ntp_parser.y"
+    { /* Null action, possibly all null parms */ }
     break;
 
   case 170:
-#line 753 "ntp_parser.y"
+#line 756 "ntp_parser.y"
     { enqueue(my_config.vars, create_attr_sval(T_Pidfile, yyvsp[0].String));  }
     break;
 
   case 171:
-#line 755 "ntp_parser.y"
+#line 758 "ntp_parser.y"
     { enqueue(my_config.vars, create_attr_sval(T_Logfile, yyvsp[0].String));  }
     break;
 
   case 172:
-#line 757 "ntp_parser.y"
+#line 760 "ntp_parser.y"
     { enqueue(my_config.vars, create_attr_ival(T_Automax, yyvsp[0].Integer));  }
     break;
 
   case 173:
-#line 760 "ntp_parser.y"
+#line 763 "ntp_parser.y"
     { append_queue(my_config.logconfig, yyvsp[0].Queue);  }
     break;
 
   case 174:
-#line 762 "ntp_parser.y"
+#line 765 "ntp_parser.y"
     { append_queue(my_config.phone, yyvsp[0].Queue);  }
     break;
 
   case 175:
-#line 764 "ntp_parser.y"
+#line 767 "ntp_parser.y"
     { enqueue(my_config.setvar, yyvsp[0].Set_var);  }
     break;
 
   case 176:
-#line 766 "ntp_parser.y"
+#line 769 "ntp_parser.y"
     { enqueue(my_config.trap, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
     break;
 
   case 177:
-#line 768 "ntp_parser.y"
+#line 771 "ntp_parser.y"
     { append_queue(my_config.ttl, yyvsp[0].Queue); }
     break;
 
   case 178:
-#line 771 "ntp_parser.y"
-    { /* Null command */ }
+#line 775 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[0].String)); }
     break;
 
   case 179:
-#line 773 "ntp_parser.y"
-    { enqueue(my_config.vars, create_attr_ival(T_DriftMinutes, yyvsp[0].Integer)); }
+#line 777 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_ival(T_DriftMinutes, yyvsp[0].Integer)); 
+		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[-1].String)); }
     break;
 
   case 180:
-#line 778 "ntp_parser.y"
-    { yyval.Set_var = create_setvar_node(yyvsp[-3].String, yyvsp[-1].String, DEF); }
+#line 779 "ntp_parser.y"
+    { /* Null driftfile,  indicated by null string "\0" */ 
+		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, "\0")); }
     break;
 
   case 181:
-#line 780 "ntp_parser.y"
-    { yyval.Set_var = create_setvar_node(yyvsp[-2].String, yyvsp[0].String, 0); }
+#line 785 "ntp_parser.y"
+    { yyval.Set_var = create_setvar_node(yyvsp[-3].String, yyvsp[-1].String, DEF); }
     break;
 
   case 182:
-#line 785 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+#line 787 "ntp_parser.y"
+    { yyval.Set_var = create_setvar_node(yyvsp[-2].String, yyvsp[0].String, 0); }
     break;
 
   case 183:
-#line 786 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+#line 792 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 
   case 184:
-#line 790 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_ival(T_Port, yyvsp[0].Integer); }
+#line 793 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 
   case 185:
-#line 791 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_pval(T_Interface, yyvsp[0].Address_node); }
+#line 797 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(T_Port, yyvsp[0].Integer); }
     break;
 
   case 186:
-#line 796 "ntp_parser.y"
-    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+#line 798 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_pval(T_Interface, yyvsp[0].Address_node); }
     break;
 
   case 187:
-#line 797 "ntp_parser.y"
-    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+#line 803 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 
   case 188:
-#line 801 "ntp_parser.y"
-    { yyval.Attr_val = create_attr_sval(yyvsp[-1].Integer, yyvsp[0].String); }
+#line 804 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 
   case 189:
-#line 803 "ntp_parser.y"
+#line 808 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(yyvsp[-1].Integer, yyvsp[0].String); }
+    break;
+
+  case 190:
+#line 810 "ntp_parser.y"
     { 
                     /* YUCK!! This is needed because '+' and '-' are not special characters 
                      * while '=' is. 
@@ -2641,53 +2639,53 @@ yyreduce:
                 }
     break;
 
-  case 190:
-#line 819 "ntp_parser.y"
+  case 191:
+#line 826 "ntp_parser.y"
     { yyval.Integer = '+'; }
     break;
 
-  case 191:
-#line 820 "ntp_parser.y"
+  case 192:
+#line 827 "ntp_parser.y"
     { yyval.Integer = '-'; }
     break;
 
-  case 192:
-#line 821 "ntp_parser.y"
+  case 193:
+#line 828 "ntp_parser.y"
     { yyval.Integer = '='; }
     break;
 
-  case 193:
-#line 830 "ntp_parser.y"
+  case 194:
+#line 837 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, create_ival(yyvsp[0].Integer)); }
     break;
 
-  case 194:
-#line 831 "ntp_parser.y"
+  case 195:
+#line 838 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(create_ival(yyvsp[0].Integer)); }
     break;
 
-  case 195:
-#line 835 "ntp_parser.y"
+  case 196:
+#line 842 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, create_pval(yyvsp[0].String)); }
     break;
 
-  case 196:
-#line 836 "ntp_parser.y"
+  case 197:
+#line 843 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(create_pval(yyvsp[0].String)); }
     break;
 
-  case 197:
-#line 840 "ntp_parser.y"
+  case 198:
+#line 847 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Address_node); }
     break;
 
-  case 198:
-#line 841 "ntp_parser.y"
+  case 199:
+#line 848 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Address_node); }
     break;
 
-  case 199:
-#line 846 "ntp_parser.y"
+  case 200:
+#line 853 "ntp_parser.y"
     { 
                     if (yyvsp[0].Integer != 0 && yyvsp[0].Integer != 1) {
                         yyerror("Integer value is not boolean (0 or 1). Assuming 1");
@@ -2698,28 +2696,28 @@ yyreduce:
                 }
     break;
 
-  case 200:
-#line 854 "ntp_parser.y"
+  case 201:
+#line 861 "ntp_parser.y"
     { yyval.Integer = 1; }
     break;
 
-  case 201:
-#line 855 "ntp_parser.y"
+  case 202:
+#line 862 "ntp_parser.y"
     { yyval.Integer = 0; }
     break;
 
-  case 202:
-#line 859 "ntp_parser.y"
+  case 203:
+#line 866 "ntp_parser.y"
     { yyval.Double = (double)yyvsp[0].Integer; }
     break;
 
-  case 203:
-#line 860 "ntp_parser.y"
+  case 204:
+#line 867 "ntp_parser.y"
     { yyval.Double = yyvsp[0].Double; }
     break;
 
-  case 204:
-#line 869 "ntp_parser.y"
+  case 205:
+#line 876 "ntp_parser.y"
     {
                  my_config.sim_details = create_sim_node(yyvsp[-2].Queue, yyvsp[-1].Queue);
 
@@ -2728,113 +2726,113 @@ yyreduce:
              }
     break;
 
-  case 205:
-#line 883 "ntp_parser.y"
+  case 206:
+#line 890 "ntp_parser.y"
     { old_config_style = 0; }
     break;
 
-  case 206:
-#line 887 "ntp_parser.y"
+  case 207:
+#line 894 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
     break;
 
-  case 207:
-#line 888 "ntp_parser.y"
+  case 208:
+#line 895 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
     break;
 
-  case 208:
-#line 892 "ntp_parser.y"
+  case 209:
+#line 899 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(T_Beep_Delay, yyvsp[0].Double); }
     break;
 
-  case 209:
-#line 893 "ntp_parser.y"
+  case 210:
+#line 900 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(T_Sim_Duration, yyvsp[0].Double); }
     break;
 
-  case 210:
-#line 897 "ntp_parser.y"
+  case 211:
+#line 904 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_server); }
     break;
 
-  case 211:
-#line 898 "ntp_parser.y"
+  case 212:
+#line 905 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_server); }
     break;
 
-  case 212:
-#line 903 "ntp_parser.y"
+  case 213:
+#line 910 "ntp_parser.y"
     { yyval.Sim_server = create_sim_server(yyvsp[-4].Address_node, yyvsp[-2].Double, yyvsp[-1].Queue); }
     break;
 
-  case 213:
-#line 907 "ntp_parser.y"
+  case 214:
+#line 914 "ntp_parser.y"
     { yyval.Double = yyvsp[-1].Double; }
     break;
 
-  case 214:
-#line 911 "ntp_parser.y"
+  case 215:
+#line 918 "ntp_parser.y"
     { yyval.Address_node = yyvsp[0].Address_node; }
     break;
 
-  case 215:
-#line 915 "ntp_parser.y"
+  case 216:
+#line 922 "ntp_parser.y"
     { yyval.Address_node = yyvsp[0].Address_node; }
     break;
 
-  case 216:
-#line 916 "ntp_parser.y"
+  case 217:
+#line 923 "ntp_parser.y"
     { yyval.Address_node = create_address_node(yyvsp[0].String, T_String); }
     break;
 
-  case 217:
-#line 920 "ntp_parser.y"
+  case 218:
+#line 927 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_script); }
     break;
 
-  case 218:
-#line 921 "ntp_parser.y"
+  case 219:
+#line 928 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_script); }
     break;
 
-  case 219:
-#line 926 "ntp_parser.y"
+  case 220:
+#line 933 "ntp_parser.y"
     { yyval.Sim_script = create_sim_script_info(yyvsp[-3].Double, yyvsp[-1].Queue); }
     break;
 
-  case 220:
-#line 930 "ntp_parser.y"
+  case 221:
+#line 937 "ntp_parser.y"
     { yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
     break;
 
-  case 221:
-#line 931 "ntp_parser.y"
+  case 222:
+#line 938 "ntp_parser.y"
     { yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
     break;
 
-  case 222:
-#line 936 "ntp_parser.y"
+  case 223:
+#line 943 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(T_Freq_Offset, yyvsp[0].Double); }
     break;
 
-  case 223:
-#line 938 "ntp_parser.y"
+  case 224:
+#line 945 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(T_Wander, yyvsp[0].Double); }
     break;
 
-  case 224:
-#line 940 "ntp_parser.y"
+  case 225:
+#line 947 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(T_Jitter, yyvsp[0].Double); }
     break;
 
-  case 225:
-#line 942 "ntp_parser.y"
+  case 226:
+#line 949 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(T_Prop_Delay, yyvsp[0].Double); }
     break;
 
-  case 226:
-#line 944 "ntp_parser.y"
+  case 227:
+#line 951 "ntp_parser.y"
     { yyval.Attr_val = create_attr_dval(T_Proc_Delay, yyvsp[0].Double); }
     break;
 
@@ -2842,7 +2840,7 @@ yyreduce:
     }
 
 /* Line 1016 of /usr/local/share/bison/yacc.c.  */
-#line 2846 "ntp_parser.c"
+#line 2844 "ntp_parser.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -3061,7 +3059,7 @@ yyreturn:
 }
 
 
-#line 948 "ntp_parser.y"
+#line 955 "ntp_parser.y"
 
 
 /* KEYWORDS

==== ntpd/ntp_parser.h ====
2007-06-12 18:00:58-04:00, neal at pogo.udel.edu +1 -1
  allow null driftfile.

--- 1.3/ntpd/ntp_parser.h	2007-06-07 10:45:39 -04:00
+++ 1.4/ntpd/ntp_parser.h	2007-06-12 18:00:58 -04:00
@@ -339,7 +339,7 @@
 
 
 #ifndef YYSTYPE
-#line 67 "ntp_parser.y"
+#line 68 "ntp_parser.y"
 typedef union {
     char   *String;
     double  Double;

==== ntpd/ntp_parser.y ====
2007-06-12 18:01:08-04:00, neal at pogo.udel.edu +16 -9
  allow null driftfile.

--- 1.8/ntpd/ntp_parser.y	2007-06-07 10:45:55 -04:00
+++ 1.9/ntpd/ntp_parser.y	2007-06-12 18:01:08 -04:00
@@ -39,6 +39,7 @@
 
   struct FILE_INFO *ip_file;   /* Pointer to the configuration file stream */
   void yyerror (char *msg);
+  extern int input_from_file;  /* 0=input from ntpq>config command buffer */
 
   /* SK: The following is a terrible hack to allow the NTP code to be built
    * without OPENSSL. The following symbols need to be defined in the 
@@ -307,9 +308,11 @@ command_list
                  */
         |       error T_EOC 
                 { 
-                    fprintf(stderr, "PARSE ERROR!! At Line: %d\n", 
-                            ip_file->line_no);
-                    fprintf(stderr, "Line Ignored!!\n");
+					if (input_from_file == 1) {
+                    	msyslog(LOG_INFO, "parse error %s line %d ignored\n",
+                            ip_file->fname, ip_file->line_no);
+                	} else if (input_from_file != 0)
+						msyslog(LOG_INFO, "parse: bad boolean input flag\n"); 
                 }
 	;
 
@@ -746,8 +749,8 @@ miscellaneous_command
                     { enqueue(my_config.vars, create_attr_ival(T_Calldelay, $2));  }
 	|	T_Tick number
                     { enqueue(my_config.vars, create_attr_dval(T_Tick, $2));  }
-	|	T_Driftfile T_String drift_parm
-         { enqueue(my_config.vars, create_attr_sval(T_Driftfile, $2)); }
+	|	T_Driftfile drift_parm
+         { /* Null action, possibly all null parms */ }
 
 	|	T_Pidfile T_String 
                     { enqueue(my_config.vars, create_attr_sval(T_Pidfile, $2));  }
@@ -768,13 +771,17 @@ miscellaneous_command
                     { append_queue(my_config.ttl, $2); }
 	;	
 drift_parm
-	:	{ /* Null command */ }
-	|   T_Integer 
-		{ enqueue(my_config.vars, create_attr_ival(T_DriftMinutes, $1)); }
+	:	T_String 
+		{ enqueue(my_config.vars, create_attr_sval(T_Driftfile, $1)); }
+	|   T_String T_Integer 
+		{ enqueue(my_config.vars, create_attr_ival(T_DriftMinutes, $2)); 
+		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, $1)); }
+	|	{ /* Null driftfile,  indicated by null string "\0" */ 
+		  enqueue(my_config.vars, create_attr_sval(T_Driftfile, "\0")); }
 	;
 
 variable_assign
-        :	T_String '=' T_String T_Default  
+    :	T_String '=' T_String T_Default  
                     { $$ = create_setvar_node($1, $3, DEF); }
 	|	T_String '=' T_String            
                     { $$ = create_setvar_node($1, $3, 0); }

==== ntpd/ntp_scanner.c ====
2007-06-12 18:01:18-04:00, neal at pogo.udel.edu +10 -6
  allow null driftfile.

--- 1.7/ntpd/ntp_scanner.c	2007-06-01 18:26:56 -04:00
+++ 1.8/ntpd/ntp_scanner.c	2007-06-12 18:01:18 -04:00
@@ -46,6 +46,7 @@ struct state {
 #define MAX_LEXEME 1024+1    /* The maximum size of a lexeme */
 char yytext[MAX_LEXEME];     /* Buffer for storing the input text/lexeme */
 struct state *key_scanner;   /* A FSA for recognizing keywords */
+extern int input_from_file;
 
 
 /* CONSTANTS 
@@ -265,12 +266,13 @@ int FCLOSE(struct FILE_INFO *stream)
 
 int get_next_char(void)
 {
-    int retval;
     if (input_from_file)
         return FGETC(ip_file);
     else {
-        retval = remote_config.buffer[remote_config.pos++];
-        return (retval == '\0') ? EOF : retval;
+		if (remote_config.buffer[remote_config.pos] == '\0') 
+			return EOF;
+		else 
+			return(remote_config.buffer[remote_config.pos++]);
     }
 }
 
@@ -518,9 +520,11 @@ int yylex()
             ; /* Null Statement */
         
         if (ch == EOF) {
-            if (curr_include_level == 0) {
-            return 0;
-			} else { 
+			if (input_from_file == 0)
+				return 0;
+            if (!(curr_include_level > 0)) 
+            	return 0;
+			else { 
                 ip_file = fp[--curr_include_level]; 
                 return T_EOC;
 			}

==== ntpd/ntp_util.c ====
2007-06-12 18:01:28-04:00, neal at pogo.udel.edu +1 -1
  allow null driftfile.

--- 1.47/ntpd/ntp_util.c	2007-06-10 03:24:26 -04:00
+++ 1.48/ntpd/ntp_util.c	2007-06-12 18:01:28 -04:00
@@ -52,7 +52,7 @@ static	char *key_file_name;
 /*
  * The name of the drift_comp file and the temporary.
  */
-static	char *stats_drift_file;
+char *stats_drift_file;
 static	char *stats_temp_file;
 int stats_write_period = 3600;	/* # of seconds between writes. */
 static double prev_drift_comp;


More information about the bk-ntp-dev-send mailing list