The "revoke" parameter is a crypto command

bk: 46b81af8c-kyjnE4OY4_cRwBwEucPA

diff --git a/ChangeLog b/ChangeLog
index 96c37ccb549c9958836aa3a4aacb7c595f99b68a..8ea2b9f708258b9d2bfbe3db2a4b5da756176f1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* The "revoke" parameter is a crypto command.
 * The driftfile wander threshold is a real number.
 * [Bug 850] Fix the wander threshold parameter on the driftfile command.
 * ntp_io.c: Dead code cleanup - Coverity View 19.

diff --git a/ntpd/ntp_parser.c b/ntpd/ntp_parser.c
index b6638de881daab0ebe74eafa210882734249ae31..cd6cea5ec192b794359dc16d6d3b9eab8777e003 100644 (file)
--- a/ntpd/ntp_parser.c
+++ b/ntpd/ntp_parser.c
@@ -300,7 +300,7 @@ static const short yyprhs[] =
       44,    46,    48,    50,    52,    54,    56,    59,    61,    63,
       66,    68,    70,    72,    74,    77,    80,    83,    85,    87,
       89,    91,    94,    97,   100,   102,   105,   108,   111,   114,
-     117,   120,   123,   126,   129,   132,   135,   138,   140,   143,
+     117,   120,   123,   126,   129,   132,   135,   137,   140,   143,
      146,   149,   152,   155,   158,   161,   164,   167,   170,   173,
      176,   178,   181,   184,   187,   190,   193,   196,   199,   202,
      205,   208,   211,   214,   217,   221,   224,   226,   228,   230,
@@ -333,11 +333,11 @@ static const short yyrhs[] =
        0,   136,    54,     0,    81,    54,     0,   138,    54,     0,
       12,     0,    12,    95,     0,    70,   205,     0,    84,   205,
        0,     6,    54,     0,    21,    54,     0,    22,   170,     0,
-      58,   126,     0,    59,   126,     0,   114,    54,     0,   116,
-      54,     0,   135,   203,     0,   170,   171,     0,   171,     0,
-      18,   126,     0,    61,   126,     0,   111,   126,     0,    45,
-     126,     0,   119,   126,     0,    50,   126,     0,    51,   126,
-       0,    44,   126,     0,    85,   126,     0,   110,   126,     0,
+      58,   126,     0,    59,   126,     0,   114,    54,     0,   135,
+     203,     0,   170,   171,     0,   171,     0,    18,   126,     0,
+      44,   126,     0,    45,   126,     0,    50,   126,     0,    51,
+     126,     0,    61,   126,     0,    85,   126,     0,   110,   126,
+       0,   111,   126,     0,   116,    54,     0,   119,   126,     0,
      132,   173,     0,   173,   174,     0,   174,     0,    17,    54,
        0,    41,    54,     0,    20,   206,     0,    98,    54,     0,
       77,   207,     0,    73,   207,     0,    76,   207,     0,    72,
@@ -396,7 +396,7 @@ static const short yyrline[] =
      358,   359,   360,   361,   365,   366,   367,   383,   384,   388,
      389,   394,   395,   396,   397,   398,   399,   400,   401,   402,
      403,   404,   405,   406,   416,   418,   420,   422,   433,   435,
-     437,   443,   445,   447,   449,   451,   456,   457,   461,   463,
+     437,   443,   445,   447,   449,   454,   455,   459,   461,   463,
      465,   467,   469,   471,   473,   475,   477,   479,   489,   494,
      495,   499,   501,   503,   505,   507,   509,   511,   513,   515,
      517,   519,   529,   531,   533,   541,   542,   546,   548,   550,
@@ -482,7 +482,7 @@ static const short yyr1[] =
      163,   163,   163,   163,   164,   164,   164,   165,   165,   166,
      166,   167,   167,   167,   167,   167,   167,   167,   167,   167,
      167,   167,   167,   167,   168,   168,   168,   168,   169,   169,
-     169,   169,   169,   169,   169,   169,   170,   170,   171,   171,
+     169,   169,   169,   169,   169,   170,   170,   171,   171,   171,
      171,   171,   171,   171,   171,   171,   171,   171,   172,   173,
      173,   174,   174,   174,   174,   174,   174,   174,   174,   174,
      174,   174,   175,   175,   175,   176,   176,   177,   177,   177,
@@ -510,7 +510,7 @@ static const short yyr2[] =
        1,     1,     1,     1,     1,     1,     2,     1,     1,     2,
        1,     1,     1,     1,     2,     2,     2,     1,     1,     1,
        1,     2,     2,     2,     1,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     1,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        1,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     3,     2,     1,     1,     1,     1,
@@ -538,21 +538,21 @@ static const short yydefact[] =
        0,     0,     0,     0,    22,    44,     0,     0,     0,     0,
        0,     0,   180,     0,   164,     0,     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,   206,     1,     0,     6,     0,     7,     8,
-      11,     9,    10,    12,    13,    14,    15,    16,     0,     4,
-      48,   172,    45,   204,   203,   165,   166,    49,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    50,    57,
+       0,     0,    19,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   206,     1,     0,     6,     0,     7,     8,    11,
+       9,    10,    12,    13,    14,    15,    16,     0,     4,    48,
+     172,    45,   204,   203,   165,   166,    49,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    50,    56,
      146,   147,   148,   149,   150,   151,   152,   143,   145,     0,
        0,     0,   108,   127,   178,   168,   142,    87,    88,    89,
       90,    91,    92,     0,    27,    28,     0,    25,     0,    24,
        5,    51,    52,   169,   190,   193,   191,   192,   173,   188,
        0,   171,   199,    46,    47,   197,   174,   170,    53,   112,
-     112,    24,    54,     0,   175,    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,   195,    55,   177,     0,     3,    18,     0,    58,
-      65,    61,    63,    64,    59,    66,    67,    60,    62,    56,
+     112,    24,     0,   175,    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,   195,    54,   177,     0,     3,    18,     0,    57,    58,
+      59,    60,    61,    62,    63,    64,    65,    66,    67,    55,
      144,   128,   129,   130,   126,   179,   100,    99,     0,    97,
       98,     0,    84,    94,    26,     0,     0,     0,     0,     0,
        0,     0,     0,   131,   133,   163,   187,   189,   198,   196,
@@ -576,189 +576,179 @@ static const short yydefact[] =
 
 static const short yydefgoto[] =
 {
-     361,    44,    45,    46,    47,   122,   109,   257,   258,    48,
-      49,    78,    79,    50,   159,   160,    51,   135,   103,   192,
-     193,   271,    52,   210,   294,    92,    93,    53,   203,   204,
-      54,    87,    88,    55,   146,   147,    56,    95,   134,   240,
-     241,   118,   119,   120,   163,   126,   123,   228,    65,    57,
-      58,   261,   262,   311,   312,   328,   313,   326,   331,   332,
+     361,    43,    44,    45,    46,   122,   109,   257,   258,    47,
+      48,    78,    79,    49,   158,   159,    50,   134,   103,   192,
+     193,   271,    51,   210,   294,    92,    93,    52,   203,   204,
+      53,    87,    88,    54,   145,   146,    55,    95,   133,   240,
+     241,   118,   119,   120,   162,   126,   123,   228,    64,    56,
+      57,   261,   262,   311,   312,   328,   313,   326,   331,   332,
      345,   346
 };
 
 static const short yypact[] =
 {
-      25,  -113,   -19,    -9,-32768,   -55,   -10,    -6,     8,   364,
-      54,    -3,   -62,    54,-32768,   154,   -41,   -56,   -53,   -50,
-     -49,    29,   -46,-32768,   -41,   -41,-32768,   -45,   -40,-32768,
-      34,    18,    35,-32768,   -33,   154,    -2,   -10,    14,   423,
-     -25,    42,    42,-32768,   203,   -32,-32768,   -41,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   -34,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,     0,    20,
-      26,    28,    33,    36,    40,    44,    50,    62,   364,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,    54,-32768,    63,
-      97,   138,    -3,-32768,   165,-32768,    54,-32768,-32768,-32768,
-  -32768,-32768,-32768,   -15,-32768,-32768,    70,-32768,    61,-32768,
-     337,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    29,-32768,
-      76,-32768,-32768,   -41,   -41,-32768,    78,-32768,-32768,-32768,
-  -32768,   136,-32768,    57,-32768,   154,-32768,-32768,-32768,   -10,
-     -10,   -10,   -10,   -10,   -10,   -10,    14,-32768,   158,   159,
-     -20,   163,   -10,   -10,   164,   -10,   -10,   166,   172,   423,
-  -32768,   -39,-32768,   173,   173,    85,-32768,   114,  -118,-32768,
+       9,  -125,   -28,   -21,-32768,   -57,   -10,    -4,     2,   184,
+      -1,    -5,   -62,    -1,-32768,    24,   -41,   -50,   -46,   -40,
+     -37,    31,   -34,-32768,   -41,   -41,-32768,   -32,   -16,-32768,
+      34,    12,-32768,     4,    24,     7,   -10,    23,   324,    10,
+      36,    36,-32768,   148,    -8,-32768,   -41,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   -61,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,    13,    30,    32,
+      45,    46,    47,    50,    53,    57,    95,    62,   184,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,    -1,-32768,    96,
+     108,   123,    -5,-32768,   163,-32768,    -1,-32768,-32768,-32768,
+  -32768,-32768,-32768,    -3,-32768,-32768,    67,-32768,   220,-32768,
+     310,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    31,-32768,
+      68,-32768,-32768,   -41,   -41,-32768,    69,-32768,-32768,-32768,
+  -32768,   127,    49,-32768,    24,-32768,-32768,-32768,   -10,   -10,
+     -10,   -10,   -10,   -10,   -10,    23,-32768,   150,   151,    -6,
+     155,   -10,   -10,   157,   -10,   -10,   158,   161,   324,-32768,
+      15,-32768,   162,   162,    76,-32768,   342,  -134,-32768,-32768,
   -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   105,-32768,
-  -32768,     9,   -15,-32768,-32768,   -20,   -20,   -20,   -20,   106,
-     180,   -10,   -10,    61,-32768,-32768,-32768,-32768,-32768,-32768,
-     419,   419,   -25,   111,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    94,-32768,
+  -32768,    60,    -3,-32768,-32768,    -6,    -6,    -6,    -6,   100,
+     173,   -10,   -10,   220,-32768,-32768,-32768,-32768,-32768,-32768,
+     366,   366,    10,   105,-32768,-32768,-32768,-32768,-32768,-32768,
   -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,   -25,   184,
-     -39,-32768,-32768,-32768,-32768,-32768,-32768,   186,   187,   188,
-     189,-32768,-32768,-32768,-32768,   190,   191,   114,-32768,    93,
-      95,   -92,   108,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,    10,   179,
+      15,-32768,-32768,-32768,-32768,-32768,-32768,   187,   188,   189,
+     190,-32768,-32768,-32768,-32768,   192,   193,   342,-32768,    97,
+     101,    51,   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,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,   228,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   -10,   -10,   100,
-     115,  -108,-32768,   102,-32768,   419,-32768,-32768,-32768,   -44,
-  -32768,-32768,-32768,   110,-32768,-32768,-32768,   109,   112,   -10,
-     113,  -119,-32768,   121,   -10,-32768,-32768,-32768,   117,   -18,
-     122,   123,   124,   128,   129,    48,   132,   -10,   -10,   -10,
-     -10,   -10,-32768,   141,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,   285,   286,-32768
+  -32768,-32768,-32768,-32768,-32768,-32768,   229,-32768,-32768,-32768,
+  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   -10,   -10,   102,
+     118,   -71,-32768,   107,-32768,   366,-32768,-32768,-32768,     6,
+  -32768,-32768,-32768,   120,-32768,-32768,-32768,   119,   126,   -10,
+     121,  -124,-32768,   134,   -10,-32768,-32768,-32768,   125,    87,
+     124,   131,   132,   133,   136,    72,   145,   -10,   -10,   -10,
+     -10,   -10,-32768,   153,-32768,-32768,-32768,-32768,-32768,-32768,
+  -32768,   297,   299,-32768
 };
 
 static const short yypgoto[] =
 {
-  -32768,-32768,   -36,-32768,-32768,   156,   -30,-32768,    31,-32768,
-  -32768,-32768,   212,-32768,-32768,   134,-32768,-32768,   -14,-32768,
-      99,-32768,-32768,  -128,-32768,-32768,   202,-32768,-32768,    92,
-  -32768,   283,   -72,-32768,-32768,   152,-32768,-32768,-32768,-32768,
-      59,-32768,   182,-32768,   259,-32768,   277,   -17,   -37,-32768,
-  -32768,-32768,    43,-32768,    -5,-32768,-32768,-32768,-32768,   -22,
-  -32768,   -29
+  -32768,-32768,   -38,-32768,-32768,    66,   -30,-32768,    44,-32768,
+  -32768,-32768,   224,-32768,-32768,   146,-32768,-32768,   -17,-32768,
+     113,-32768,-32768,  -128,-32768,-32768,   214,-32768,-32768,   104,
+  -32768,   295,   -47,-32768,-32768,   164,-32768,-32768,-32768,-32768,
+      70,-32768,   200,-32768,   278,-32768,   300,   -97,   -36,-32768,
+  -32768,-32768,    59,-32768,    16,-32768,-32768,-32768,-32768,    -7,
+  -32768,   -15
 };
 
 
-#define        YYLAST          557
+#define        YYLAST          504
 
 
 static const short yytable[] =
 {
-     138,   131,   211,   104,   105,    89,   104,   105,   165,   309,
-     161,   186,   264,   106,   225,   180,   238,   187,   139,    63,
-     188,   136,   104,   105,   180,   309,     1,   259,   260,   330,
-      59,     2,     3,   265,   226,    60,     4,     5,     6,   335,
-      62,     7,   140,   129,    64,    61,     8,     9,    66,   189,
-     321,    10,    11,   259,   260,    12,   141,    13,    14,    80,
-     142,    15,    67,    81,    94,   104,   105,   239,    16,    82,
-     110,   190,   106,   111,   205,    90,   112,   113,    17,    91,
-     121,   125,   324,    18,    19,   107,   127,    20,   128,   132,
-      21,    22,   266,   133,    23,    24,   162,   267,   195,   196,
-     197,   198,   215,   216,   217,   218,   219,   220,   221,    25,
-      83,   166,   268,   143,   227,   230,   231,   181,   233,   234,
-     244,   214,   191,   168,   137,    26,   169,    27,   245,    28,
-      29,   340,   341,   342,   343,   344,    84,   144,   145,    30,
-      31,    32,    33,    34,   107,    35,   170,    36,   269,   270,
-      85,   182,   171,    37,   172,   114,    38,    39,    40,   173,
-      41,    42,   174,   246,   279,   280,   175,   315,    -5,    43,
-     176,   247,   108,    97,   199,    86,   177,    98,   273,   274,
-     275,   276,   295,   115,   116,   117,   200,   130,   178,   248,
-     201,   202,   183,   249,   185,   250,   194,   340,   341,   342,
-     343,   344,   207,   167,   209,   251,   352,   212,   297,     2,
-       3,   213,   223,   224,     4,     5,     6,   229,   232,     7,
-     235,    99,   252,   253,     8,     9,   236,   242,   243,    10,
-      11,   263,   277,    12,   278,    13,    14,   296,   298,    15,
-     300,   301,   302,   303,   304,   305,    16,   307,   254,   308,
-     255,   314,   256,   316,   319,   100,    17,   327,   320,   323,
-     330,    18,    19,   329,   337,    20,   101,   334,    21,    22,
-     317,   318,    23,    24,   339,   354,   347,   348,   349,   208,
-     208,   102,   350,   351,   360,   362,   363,    25,   306,   325,
-     179,   272,   333,   237,   184,   281,    96,   338,   222,   299,
-     206,   164,   124,    26,   310,    27,   322,    28,    29,   336,
-     355,   356,   357,   358,   359,     0,   353,    30,    31,    32,
-      33,    34,     0,    35,     0,    36,     0,     0,     0,     0,
-       0,    37,     0,     0,    38,    39,    40,     0,    41,    42,
-       0,     0,     0,     2,     3,     0,    -5,    43,     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,    68,     0,     0,     0,     0,     0,     0,     0,
-      17,     0,     0,     0,     0,    18,    19,     0,     0,    20,
-       0,     0,    21,    22,     0,     0,    23,    24,    69,    70,
-       0,     0,     0,     0,    71,    72,     0,     0,     0,     0,
-       0,    25,     0,     0,     0,    73,     0,     0,     0,     0,
-       0,     0,     0,   148,     0,     0,     0,    26,     0,    27,
-     149,    28,    29,   150,     0,     0,     0,     0,     0,    74,
-       0,    30,    31,    32,    33,    34,     0,    35,     0,    36,
-       0,     0,     0,     0,   151,    37,     0,     0,    38,    39,
-      40,   282,    41,    42,    75,    76,     0,     0,     0,   283,
-       0,    43,   284,    77,     0,     0,     0,   285,     0,     0,
-       0,     0,     0,     0,     0,   152,   153,   154,     0,   155,
-     156,     0,     0,   157,     0,     0,   286,     0,   287,   288,
-       0,   289,   290,   291,     0,     0,   292,     0,     0,     0,
-       0,   158,     0,     0,     0,     0,     0,     0,     0,     0,
+     137,   131,   211,    89,    80,   164,   104,   105,    81,   160,
+       1,   259,   260,   106,    82,     2,     3,   135,    58,    62,
+       4,     5,     6,   186,   330,     7,    59,   138,   225,   187,
+       8,     9,   188,    60,   335,    10,    11,   129,    61,    12,
+     180,    13,    14,    97,    63,    15,   309,    98,   226,   180,
+      65,   139,    16,   104,   105,    83,    66,   104,   105,   104,
+     105,   189,    17,   264,    94,   140,   106,    18,    19,   141,
+     238,    20,   205,    90,    21,    22,   110,    91,    23,    24,
+     111,    84,   108,   190,   265,   107,   112,   321,   128,   113,
+     161,    99,   121,    25,   125,    85,   167,   130,   273,   274,
+     275,   276,   215,   216,   217,   218,   219,   220,   221,    26,
+     127,    27,   166,    28,    29,   230,   231,   214,   233,   234,
+      86,   239,   142,    30,    31,   100,    32,    33,   227,    34,
+     132,    35,   324,   136,   191,   165,   101,    36,   107,   168,
+      37,    38,    39,   266,    40,    41,   143,   144,   267,   177,
+     181,   102,    -5,    42,     2,     3,   169,   114,   170,     4,
+       5,     6,   182,   268,     7,   279,   280,   315,   309,     8,
+       9,   171,   172,   173,    10,    11,   174,   183,    12,   175,
+      13,    14,   295,   176,    15,   115,   116,   117,   178,   208,
+     208,    16,   185,   194,   207,   209,   259,   260,   212,   269,
+     270,    17,    67,   213,   223,   224,    18,    19,   297,   229,
+      20,   232,   235,    21,    22,   236,   242,    23,    24,   243,
+     263,   340,   341,   342,   343,   344,   277,   278,    68,    69,
+     352,   296,    25,   298,    70,    71,   340,   341,   342,   343,
+     344,   300,   301,   302,   303,    72,   304,   305,    26,   314,
+      27,   307,    28,    29,   316,   308,   319,   195,   196,   197,
+     198,   320,    30,    31,   323,    32,    33,   327,    34,    73,
+      35,   317,   318,   329,   330,   334,    36,   337,   347,    37,
+      38,    39,   339,    40,    41,   348,   349,   350,   354,   325,
+     351,    -5,    42,   333,    74,    75,   360,   362,   338,   363,
+      76,   306,   179,    77,   237,   272,   184,   281,    96,   222,
+     299,   355,   356,   357,   358,   359,     2,     3,   206,   163,
+     310,     4,     5,     6,   336,   124,     7,   322,     0,     0,
+     353,     8,     9,   199,   147,     0,    10,    11,     0,     0,
+      12,   148,    13,    14,   149,   200,    15,     0,   244,   201,
+     202,     0,     0,    16,     0,     0,   245,     0,     0,     0,
+       0,     0,     0,    17,     0,   150,     0,     0,    18,    19,
+       0,     0,    20,     0,     0,    21,    22,     0,     0,    23,
+      24,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   246,     0,     0,    25,     0,   151,   152,   153,   247,
+     154,   155,     0,     0,   156,     0,     0,     0,     0,     0,
+      26,     0,    27,     0,    28,    29,     0,   248,   282,     0,
+       0,   249,   157,   250,    30,    31,   283,    32,    33,   284,
+      34,     0,    35,   251,   285,     0,     0,     0,    36,     0,
+       0,    37,    38,    39,     0,    40,    41,     0,     0,     0,
+     252,   253,     0,   286,    42,   287,   288,     0,   289,   290,
+     291,     0,     0,   292,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   254,     0,   255,     0,
+     256,     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,     0,     0,     0,   293
 };
 
 static const short yycheck[] =
 {
-      37,    31,   130,    47,    48,     8,    47,    48,    44,   117,
-      40,    26,     3,    54,    34,    87,    55,    32,     4,    29,
-      35,    35,    47,    48,    96,   117,     1,   145,   146,   148,
-     143,     6,     7,    24,    54,    54,    11,    12,    13,   158,
-      95,    16,    28,    25,    54,    54,    21,    22,    54,    64,
-     158,    26,    27,   145,   146,    30,    42,    32,    33,     5,
-      46,    36,    54,     9,   126,    47,    48,   106,    43,    15,
-     126,    86,    54,   126,   110,    78,   126,   126,    53,    82,
-     126,   126,   126,    58,    59,   126,   126,    62,    54,    54,
-      65,    66,    83,   126,    69,    70,    54,    88,    37,    38,
-      39,    40,   139,   140,   141,   142,   143,   144,   145,    84,
-      56,   143,   103,    99,   134,   152,   153,    54,   155,   156,
-       6,   135,   137,   157,   126,   100,   126,   102,    14,   104,
-     105,   149,   150,   151,   152,   153,    82,   123,   124,   114,
-     115,   116,   117,   118,   126,   120,   126,   122,   139,   140,
-      96,    54,   126,   128,   126,   126,   131,   132,   133,   126,
-     135,   136,   126,    49,   201,   202,   126,   295,   143,   144,
-     126,    57,    16,    19,   113,   121,   126,    23,   195,   196,
-     197,   198,   212,   154,   155,   156,   125,    31,   126,    75,
-     129,   130,    54,    79,    29,    81,   126,   149,   150,   151,
-     152,   153,   126,    47,   126,    91,   158,    71,   238,     6,
-       7,   154,    54,    54,    11,    12,    13,    54,    54,    16,
-      54,    67,   108,   109,    21,    22,    54,    54,   143,    26,
-      27,   126,   126,    30,    54,    32,    33,   126,    54,    36,
-      54,    54,    54,    54,    54,    54,    43,   154,   134,   154,
-     136,   143,   138,    25,   154,   101,    53,   147,   143,   157,
-     148,    58,    59,   154,   143,    62,   112,   154,    65,    66,
-     307,   308,    69,    70,   157,   143,   154,   154,   154,   123,
-     124,   127,   154,   154,   143,     0,     0,    84,   257,   319,
-      78,   192,   329,   159,    92,   203,    13,   334,   146,   240,
-     118,    42,    25,   100,   261,   102,   311,   104,   105,   331,
-     347,   348,   349,   350,   351,    -1,   345,   114,   115,   116,
-     117,   118,    -1,   120,    -1,   122,    -1,    -1,    -1,    -1,
-      -1,   128,    -1,    -1,   131,   132,   133,    -1,   135,   136,
-      -1,    -1,    -1,     6,     7,    -1,   143,   144,    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,    62,
-      -1,    -1,    65,    66,    -1,    -1,    69,    70,    44,    45,
-      -1,    -1,    -1,    -1,    50,    51,    -1,    -1,    -1,    -1,
-      -1,    84,    -1,    -1,    -1,    61,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    10,    -1,    -1,    -1,   100,    -1,   102,
-      17,   104,   105,    20,    -1,    -1,    -1,    -1,    -1,    85,
-      -1,   114,   115,   116,   117,   118,    -1,   120,    -1,   122,
-      -1,    -1,    -1,    -1,    41,   128,    -1,    -1,   131,   132,
-     133,    52,   135,   136,   110,   111,    -1,    -1,    -1,    60,
-      -1,   144,    63,   119,    -1,    -1,    -1,    68,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    72,    73,    74,    -1,    76,
-      77,    -1,    -1,    80,    -1,    -1,    87,    -1,    89,    90,
-      -1,    92,    93,    94,    -1,    -1,    97,    -1,    -1,    -1,
-      -1,    98,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      36,    31,   130,     8,     5,    43,    47,    48,     9,    39,
+       1,   145,   146,    54,    15,     6,     7,    34,   143,    29,
+      11,    12,    13,    26,   148,    16,    54,     4,    34,    32,
+      21,    22,    35,    54,   158,    26,    27,    25,    95,    30,
+      87,    32,    33,    19,    54,    36,   117,    23,    54,    96,
+      54,    28,    43,    47,    48,    56,    54,    47,    48,    47,
+      48,    64,    53,     3,   126,    42,    54,    58,    59,    46,
+      55,    62,   110,    78,    65,    66,   126,    82,    69,    70,
+     126,    82,    16,    86,    24,   126,   126,   158,    54,   126,
+      54,    67,   126,    84,   126,    96,   157,    31,   195,   196,
+     197,   198,   138,   139,   140,   141,   142,   143,   144,   100,
+     126,   102,    46,   104,   105,   151,   152,   134,   154,   155,
+     121,   106,    99,   114,   115,   101,   117,   118,   134,   120,
+     126,   122,   126,   126,   137,   143,   112,   128,   126,   126,
+     131,   132,   133,    83,   135,   136,   123,   124,    88,    54,
+      54,   127,   143,   144,     6,     7,   126,   126,   126,    11,
+      12,    13,    54,   103,    16,   201,   202,   295,   117,    21,
+      22,   126,   126,   126,    26,    27,   126,    54,    30,   126,
+      32,    33,   212,   126,    36,   154,   155,   156,   126,   123,
+     124,    43,    29,   126,   126,   126,   145,   146,    71,   139,
+     140,    53,    18,   154,    54,    54,    58,    59,   238,    54,
+      62,    54,    54,    65,    66,    54,    54,    69,    70,   143,
+     126,   149,   150,   151,   152,   153,   126,    54,    44,    45,
+     158,   126,    84,    54,    50,    51,   149,   150,   151,   152,
+     153,    54,    54,    54,    54,    61,    54,    54,   100,   143,
+     102,   154,   104,   105,    25,   154,   154,    37,    38,    39,
+      40,   143,   114,   115,   157,   117,   118,   147,   120,    85,
+     122,   307,   308,   154,   148,   154,   128,   143,   154,   131,
+     132,   133,   157,   135,   136,   154,   154,   154,   143,   319,
+     154,   143,   144,   329,   110,   111,   143,     0,   334,     0,
+     116,   257,    78,   119,   158,   192,    92,   203,    13,   145,
+     240,   347,   348,   349,   350,   351,     6,     7,   118,    41,
+     261,    11,    12,    13,   331,    25,    16,   311,    -1,    -1,
+     345,    21,    22,   113,    10,    -1,    26,    27,    -1,    -1,
+      30,    17,    32,    33,    20,   125,    36,    -1,     6,   129,
+     130,    -1,    -1,    43,    -1,    -1,    14,    -1,    -1,    -1,
+      -1,    -1,    -1,    53,    -1,    41,    -1,    -1,    58,    59,
+      -1,    -1,    62,    -1,    -1,    65,    66,    -1,    -1,    69,
+      70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    49,    -1,    -1,    84,    -1,    72,    73,    74,    57,
+      76,    77,    -1,    -1,    80,    -1,    -1,    -1,    -1,    -1,
+     100,    -1,   102,    -1,   104,   105,    -1,    75,    52,    -1,
+      -1,    79,    98,    81,   114,   115,    60,   117,   118,    63,
+     120,    -1,   122,    91,    68,    -1,    -1,    -1,   128,    -1,
+      -1,   131,   132,   133,    -1,   135,   136,    -1,    -1,    -1,
+     108,   109,    -1,    87,   144,    89,    90,    -1,    92,    93,
+      94,    -1,    -1,    97,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   134,    -1,   136,    -1,
+     138,    -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,   138
+      -1,    -1,    -1,    -1,   138
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
 #line 3 "/usr/local/gnu/share/bison/bison.simple"
@@ -1649,59 +1639,59 @@ case 53:
     break;
 case 54:
 #line 450 "ntp_parser.y"
-{ my_config.auth.revoke = yyvsp[0].Integer;  }
+{ my_config.auth.trusted_key_list = yyvsp[0].Queue;  }
     break;
 case 55:
-#line 452 "ntp_parser.y"
-{ my_config.auth.trusted_key_list = yyvsp[0].Queue;  }
+#line 454 "ntp_parser.y"
+{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
 case 56:
-#line 456 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+#line 455 "ntp_parser.y"
+{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
 case 57:
-#line 457 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+#line 460 "ntp_parser.y"
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_CERT, yyvsp[0].String); }
     break;
 case 58:
 #line 462 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_CERT, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_GQPAR, yyvsp[0].String); }
     break;
 case 59:
 #line 464 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_LEAP, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PRIV, yyvsp[0].String); }
     break;
 case 60:
 #line 466 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_RAND, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IDENT, yyvsp[0].String); }
     break;
 case 61:
 #line 468 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PRIV, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IFFPAR, yyvsp[0].String); }
     break;
 case 62:
 #line 470 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_SIGN, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_LEAP, yyvsp[0].String); }
     break;
 case 63:
 #line 472 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IDENT, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_MVPAR, yyvsp[0].String); }
     break;
 case 64:
 #line 474 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IFFPAR, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PW, yyvsp[0].String); }
     break;
 case 65:
 #line 476 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_GQPAR, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_RAND, yyvsp[0].String); }
     break;
 case 66:
 #line 478 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_MVPAR, yyvsp[0].String); }
+{ my_config.auth.revoke = yyvsp[0].Integer;  }
     break;
 case 67:
 #line 480 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PW, yyvsp[0].String); }
+{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_SIGN, yyvsp[0].String); }
     break;
 case 68:
 #line 490 "ntp_parser.y"

diff --git a/ntpd/ntp_parser.y b/ntpd/ntp_parser.y
index 34d21abb9ac1a3219eb288d1677d5bd9d533df5c..117e1548b5162502c7144299e96e03f18196a323 100644 (file)
--- a/ntpd/ntp_parser.y
+++ b/ntpd/ntp_parser.y
@@ -446,8 +446,6 @@ authentication_command
                     { my_config.auth.keysdir = $2;  }
        |       T_Requestkey T_Integer
                     { my_config.auth.requested_key = $2;  }
-       |       T_Revoke T_Integer
-                    { my_config.auth.revoke = $2;  }
        |       T_Trustedkey integer_list
                     { my_config.auth.trusted_key_list = $2;  }
        ;
@@ -460,24 +458,26 @@ crypto_command_list
 crypto_command
        :       T_Cert T_String
                     { $$ = create_attr_sval(CRYPTO_CONF_CERT, $2); }
-       |       T_Leap T_String
-                    { $$ = create_attr_sval(CRYPTO_CONF_LEAP, $2); }
-       |       T_RandFile T_String
-                    { $$ = create_attr_sval(CRYPTO_CONF_RAND, $2); }
+       |       T_Gqpar T_String
+                    { $$ = create_attr_sval(CRYPTO_CONF_GQPAR, $2); }
        |       T_Host  T_String
                     { $$ = create_attr_sval(CRYPTO_CONF_PRIV, $2); }
-       |       T_Sign  T_String
-                    { $$ = create_attr_sval(CRYPTO_CONF_SIGN, $2); }
        |       T_Ident T_String
                     { $$ = create_attr_sval(CRYPTO_CONF_IDENT, $2); }
        |       T_Iffpar T_String
                     { $$ = create_attr_sval(CRYPTO_CONF_IFFPAR, $2); }
-       |       T_Gqpar T_String
-                    { $$ = create_attr_sval(CRYPTO_CONF_GQPAR, $2); }
+       |       T_Leap T_String
+                    { $$ = create_attr_sval(CRYPTO_CONF_LEAP, $2); }
        |       T_Mvpar T_String
                     { $$ = create_attr_sval(CRYPTO_CONF_MVPAR, $2); }
        |       T_Pw T_String
                     { $$ = create_attr_sval(CRYPTO_CONF_PW, $2); }
+       |       T_RandFile T_String
+                    { $$ = create_attr_sval(CRYPTO_CONF_RAND, $2); }
+       |       T_Revoke T_Integer
+                    { my_config.auth.revoke = $2;  }
+       |       T_Sign  T_String
+                    { $$ = create_attr_sval(CRYPTO_CONF_SIGN, $2); }
        ;
 
 
@@ -779,7 +779,7 @@ miscellaneous_command
 drift_parm
        :       T_String
                { enqueue(my_config.vars, create_attr_sval(T_Driftfile, $1)); }
-       |   T_String number
+       |   T_String T_Double
                { enqueue(my_config.vars, create_attr_dval(T_WanderThreshold, $2));
                  enqueue(my_config.vars, create_attr_sval(T_Driftfile, $1)); }
        |       { /* Null driftfile,  indicated by null string "\0" */