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

Harlan Stenn stenn at deacon.udel.edu
Sat Jun 9 21:33:05 PDT 2007


#### ChangeSet ####
2007-06-07 10:48:26-04:00, neal at pogo.udel.edu 
  ntp_parser.y, ntp_parser.h, ntp_parser.c, ChangeLog, ntp_config.c:
    [Bug 850] driftfile parsing changes.

==== ChangeLog ====
2007-06-07 10:44:11-04:00, neal at pogo.udel.edu +1 -0
  [Bug 850] driftfile parsing changes.

--- 1.63/ChangeLog	2007-06-07 06:40:43 -04:00
+++ 1.64/ChangeLog	2007-06-07 10:44:11 -04:00
@@ -1,3 +1,4 @@
+* [Bug 850] driftfile parsing changes.
 * driftfile maintenance changes from Dave Mills.  Use clock_phi instead of
   stats_write_tolerance.
 * [Bug 828] refid string not being parsed correctly.

==== ntpd/ntp_config.c ====
2007-06-07 10:44:57-04:00, neal at pogo.udel.edu +3 -0
  [Bug 850] driftfile parsing changes.

--- 1.154/ntpd/ntp_config.c	2007-06-05 02:27:14 -04:00
+++ 1.155/ntpd/ntp_config.c	2007-06-07 10:44:57 -04:00
@@ -1561,6 +1561,9 @@ config_vars(void)
 			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;
+			break;
 		    case T_Pidfile:
 			stats_config(STATS_PID_FILE, curr_var->value.s);
 			free(curr_var->value.s);

==== ntpd/ntp_parser.c ====
2007-06-07 10:45:14-04:00, neal at pogo.udel.edu +2040 -1569
  [Bug 850] driftfile parsing changes.

--- 1.9/ntpd/ntp_parser.c	2007-06-02 00:27:23 -04:00
+++ 1.10/ntpd/ntp_parser.c	2007-06-07 10:45:14 -04:00
@@ -1,158 +1,362 @@
-/* A Bison parser, made from /backroom/ntp-dev/A.whimsy/ntpd/../../ntpd/ntp_parser.y
-   by GNU bison 1.35.  */
+/* A Bison parser, made from /ntpdev/ntpd/ntp_parser.y, by GNU bison 1.75.  */
 
-#define YYBISON 1  /* Identify Bison output.  */
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
 
-# define	T_Age	257
-# define	T_Allan	258
-# define	T_Auth	259
-# define	T_Autokey	260
-# define	T_Automax	261
-# define	T_Average	262
-# define	T_Bclient	263
-# define	T_Beacon	264
-# define	T_Broadcast	265
-# define	T_Broadcastclient	266
-# define	T_Broadcastdelay	267
-# define	T_Burst	268
-# define	T_Calibrate	269
-# define	T_Calldelay	270
-# define	T_Ceiling	271
-# define	T_Cert	272
-# define	T_Clockstats	273
-# define	T_Cohort	274
-# define	T_ControlKey	275
-# define	T_Crypto	276
-# define	T_Cryptostats	277
-# define	T_Day	278
-# define	T_Default	279
-# define	T_Disable	280
-# define	T_Discard	281
-# define	T_Dispersion	282
-# define	T_Double	283
-# define	T_Driftfile	284
-# define	T_Enable	285
-# define	T_End	286
-# define	T_False	287
-# define	T_File	288
-# define	T_Filegen	289
-# define	T_Flag1	290
-# define	T_Flag2	291
-# define	T_Flag3	292
-# define	T_Flag4	293
-# define	T_Floor	294
-# define	T_Freq	295
-# define	T_Fudge	296
-# define	T_Gqpar	297
-# define	T_Host	298
-# define	T_Huffpuff	299
-# define	T_IPv4_address	300
-# define	T_IPv6_address	301
-# define	T_Iburst	302
-# define	T_Ident	303
-# define	T_Iffpar	304
-# define	T_Ignore	305
-# define	T_Includefile	306
-# define	T_Integer	307
-# define	T_Interface	308
-# define	T_Kernel	309
-# define	T_Key	310
-# define	T_Keys	311
-# define	T_Keysdir	312
-# define	T_Kod	313
-# define	T_Leap	314
-# define	T_Limited	315
-# define	T_Link	316
-# define	T_Logconfig	317
-# define	T_Logfile	318
-# define	T_Loopstats	319
-# define	T_Lowpriotrap	320
-# define	T_Manycastclient	321
-# define	T_Manycastserver	322
-# define	T_Mask	323
-# define	T_Maxclock	324
-# define	T_Maxdist	325
-# define	T_Maxhop	326
-# define	T_Maxpoll	327
-# define	T_Minclock	328
-# define	T_Mindist	329
-# define	T_Minimum	330
-# define	T_Minpoll	331
-# define	T_Minsane	332
-# define	T_Mode	333
-# define	T_Monitor	334
-# define	T_Month	335
-# define	T_Multicastclient	336
-# define	T_Mvpar	337
-# define	T_Nolink	338
-# define	T_Nomodify	339
-# define	T_None	340
-# define	T_Nopeer	341
-# define	T_Noquery	342
-# define	T_Noselect	343
-# define	T_Noserve	344
-# define	T_Notrap	345
-# define	T_Notrust	346
-# define	T_Novolley	347
-# define	T_Ntp	348
-# define	T_Ntpport	349
-# define	T_Orphan	350
-# define	T_Panic	351
-# define	T_Peer	352
-# define	T_Peerstats	353
-# define	T_Phone	354
-# define	T_Pid	355
-# define	T_Pidfile	356
-# define	T_Pool	357
-# define	T_Port	358
-# define	T_Pps	359
-# define	T_Preempt	360
-# define	T_Prefer	361
-# define	T_Pw	362
-# define	T_RandFile	363
-# define	T_Rawstats	364
-# define	T_Refid	365
-# define	T_Requestkey	366
-# define	T_Restrict	367
-# define	T_Revoke	368
-# define	T_Server	369
-# define	T_Setvar	370
-# define	T_Sign	371
-# define	T_Statistics	372
-# define	T_Stats	373
-# define	T_Statsdir	374
-# define	T_Step	375
-# define	T_Stepout	376
-# define	T_Stratum	377
-# define	T_String	378
-# define	T_Sysstats	379
-# define	T_Tick	380
-# define	T_Time1	381
-# define	T_Time2	382
-# define	T_Tinker	383
-# define	T_Tos	384
-# define	T_Trap	385
-# define	T_True	386
-# define	T_Trustedkey	387
-# define	T_Ttl	388
-# define	T_Type	389
-# define	T_Version	390
-# define	T_Week	391
-# define	T_Year	392
-# define	T_Flag	393
-# define	T_Void	394
-# define	T_EOC	395
-# define	T_Simulate	396
-# define	T_Beep_Delay	397
-# define	T_Sim_Duration	398
-# define	T_Server_Offset	399
-# define	T_Duration	400
-# define	T_Freq_Offset	401
-# define	T_Wander	402
-# define	T_Jitter	403
-# define	T_Prop_Delay	404
-# define	T_Proc_Delay	405
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+/* Written by Richard Stallman by simplifying the original so called
+   ``semantic'' parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON	1
+
+/* Pure parsers.  */
+#define YYPURE	0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     T_Age = 258,
+     T_Allan = 259,
+     T_Auth = 260,
+     T_Autokey = 261,
+     T_Automax = 262,
+     T_Average = 263,
+     T_Bclient = 264,
+     T_Beacon = 265,
+     T_Broadcast = 266,
+     T_Broadcastclient = 267,
+     T_Broadcastdelay = 268,
+     T_Burst = 269,
+     T_Calibrate = 270,
+     T_Calldelay = 271,
+     T_Ceiling = 272,
+     T_Cert = 273,
+     T_Clockstats = 274,
+     T_Cohort = 275,
+     T_ControlKey = 276,
+     T_Crypto = 277,
+     T_Cryptostats = 278,
+     T_Day = 279,
+     T_Default = 280,
+     T_Disable = 281,
+     T_Discard = 282,
+     T_Dispersion = 283,
+     T_Double = 284,
+     T_Driftfile = 285,
+     T_DriftMinutes = 286,
+     T_Enable = 287,
+     T_End = 288,
+     T_False = 289,
+     T_File = 290,
+     T_Filegen = 291,
+     T_Flag1 = 292,
+     T_Flag2 = 293,
+     T_Flag3 = 294,
+     T_Flag4 = 295,
+     T_Floor = 296,
+     T_Freq = 297,
+     T_Fudge = 298,
+     T_Gqpar = 299,
+     T_Host = 300,
+     T_Huffpuff = 301,
+     T_IPv4_address = 302,
+     T_IPv6_address = 303,
+     T_Iburst = 304,
+     T_Ident = 305,
+     T_Iffpar = 306,
+     T_Ignore = 307,
+     T_Includefile = 308,
+     T_Integer = 309,
+     T_Interface = 310,
+     T_Kernel = 311,
+     T_Key = 312,
+     T_Keys = 313,
+     T_Keysdir = 314,
+     T_Kod = 315,
+     T_Leap = 316,
+     T_Limited = 317,
+     T_Link = 318,
+     T_Logconfig = 319,
+     T_Logfile = 320,
+     T_Loopstats = 321,
+     T_Lowpriotrap = 322,
+     T_Manycastclient = 323,
+     T_Manycastserver = 324,
+     T_Mask = 325,
+     T_Maxclock = 326,
+     T_Maxdist = 327,
+     T_Maxhop = 328,
+     T_Maxpoll = 329,
+     T_Minclock = 330,
+     T_Mindist = 331,
+     T_Minimum = 332,
+     T_Minpoll = 333,
+     T_Minsane = 334,
+     T_Mode = 335,
+     T_Monitor = 336,
+     T_Month = 337,
+     T_Multicastclient = 338,
+     T_Mvpar = 339,
+     T_Nolink = 340,
+     T_Nomodify = 341,
+     T_None = 342,
+     T_Nopeer = 343,
+     T_Noquery = 344,
+     T_Noselect = 345,
+     T_Noserve = 346,
+     T_Notrap = 347,
+     T_Notrust = 348,
+     T_Novolley = 349,
+     T_Ntp = 350,
+     T_Ntpport = 351,
+     T_Orphan = 352,
+     T_Panic = 353,
+     T_Peer = 354,
+     T_Peerstats = 355,
+     T_Phone = 356,
+     T_Pid = 357,
+     T_Pidfile = 358,
+     T_Pool = 359,
+     T_Port = 360,
+     T_Pps = 361,
+     T_Preempt = 362,
+     T_Prefer = 363,
+     T_Pw = 364,
+     T_RandFile = 365,
+     T_Rawstats = 366,
+     T_Refid = 367,
+     T_Requestkey = 368,
+     T_Restrict = 369,
+     T_Revoke = 370,
+     T_Server = 371,
+     T_Setvar = 372,
+     T_Sign = 373,
+     T_Statistics = 374,
+     T_Stats = 375,
+     T_Statsdir = 376,
+     T_Step = 377,
+     T_Stepout = 378,
+     T_Stratum = 379,
+     T_String = 380,
+     T_Sysstats = 381,
+     T_Tick = 382,
+     T_Time1 = 383,
+     T_Time2 = 384,
+     T_Tinker = 385,
+     T_Tos = 386,
+     T_Trap = 387,
+     T_True = 388,
+     T_Trustedkey = 389,
+     T_Ttl = 390,
+     T_Type = 391,
+     T_Version = 392,
+     T_Week = 393,
+     T_Year = 394,
+     T_Flag = 395,
+     T_Void = 396,
+     T_EOC = 397,
+     T_Simulate = 398,
+     T_Beep_Delay = 399,
+     T_Sim_Duration = 400,
+     T_Server_Offset = 401,
+     T_Duration = 402,
+     T_Freq_Offset = 403,
+     T_Wander = 404,
+     T_Jitter = 405,
+     T_Prop_Delay = 406,
+     T_Proc_Delay = 407
+   };
+#endif
+#define T_Age 258
+#define T_Allan 259
+#define T_Auth 260
+#define T_Autokey 261
+#define T_Automax 262
+#define T_Average 263
+#define T_Bclient 264
+#define T_Beacon 265
+#define T_Broadcast 266
+#define T_Broadcastclient 267
+#define T_Broadcastdelay 268
+#define T_Burst 269
+#define T_Calibrate 270
+#define T_Calldelay 271
+#define T_Ceiling 272
+#define T_Cert 273
+#define T_Clockstats 274
+#define T_Cohort 275
+#define T_ControlKey 276
+#define T_Crypto 277
+#define T_Cryptostats 278
+#define T_Day 279
+#define T_Default 280
+#define T_Disable 281
+#define T_Discard 282
+#define T_Dispersion 283
+#define T_Double 284
+#define T_Driftfile 285
+#define T_DriftMinutes 286
+#define T_Enable 287
+#define T_End 288
+#define T_False 289
+#define T_File 290
+#define T_Filegen 291
+#define T_Flag1 292
+#define T_Flag2 293
+#define T_Flag3 294
+#define T_Flag4 295
+#define T_Floor 296
+#define T_Freq 297
+#define T_Fudge 298
+#define T_Gqpar 299
+#define T_Host 300
+#define T_Huffpuff 301
+#define T_IPv4_address 302
+#define T_IPv6_address 303
+#define T_Iburst 304
+#define T_Ident 305
+#define T_Iffpar 306
+#define T_Ignore 307
+#define T_Includefile 308
+#define T_Integer 309
+#define T_Interface 310
+#define T_Kernel 311
+#define T_Key 312
+#define T_Keys 313
+#define T_Keysdir 314
+#define T_Kod 315
+#define T_Leap 316
+#define T_Limited 317
+#define T_Link 318
+#define T_Logconfig 319
+#define T_Logfile 320
+#define T_Loopstats 321
+#define T_Lowpriotrap 322
+#define T_Manycastclient 323
+#define T_Manycastserver 324
+#define T_Mask 325
+#define T_Maxclock 326
+#define T_Maxdist 327
+#define T_Maxhop 328
+#define T_Maxpoll 329
+#define T_Minclock 330
+#define T_Mindist 331
+#define T_Minimum 332
+#define T_Minpoll 333
+#define T_Minsane 334
+#define T_Mode 335
+#define T_Monitor 336
+#define T_Month 337
+#define T_Multicastclient 338
+#define T_Mvpar 339
+#define T_Nolink 340
+#define T_Nomodify 341
+#define T_None 342
+#define T_Nopeer 343
+#define T_Noquery 344
+#define T_Noselect 345
+#define T_Noserve 346
+#define T_Notrap 347
+#define T_Notrust 348
+#define T_Novolley 349
+#define T_Ntp 350
+#define T_Ntpport 351
+#define T_Orphan 352
+#define T_Panic 353
+#define T_Peer 354
+#define T_Peerstats 355
+#define T_Phone 356
+#define T_Pid 357
+#define T_Pidfile 358
+#define T_Pool 359
+#define T_Port 360
+#define T_Pps 361
+#define T_Preempt 362
+#define T_Prefer 363
+#define T_Pw 364
+#define T_RandFile 365
+#define T_Rawstats 366
+#define T_Refid 367
+#define T_Requestkey 368
+#define T_Restrict 369
+#define T_Revoke 370
+#define T_Server 371
+#define T_Setvar 372
+#define T_Sign 373
+#define T_Statistics 374
+#define T_Stats 375
+#define T_Statsdir 376
+#define T_Step 377
+#define T_Stepout 378
+#define T_Stratum 379
+#define T_String 380
+#define T_Sysstats 381
+#define T_Tick 382
+#define T_Time1 383
+#define T_Time2 384
+#define T_Tinker 385
+#define T_Tos 386
+#define T_Trap 387
+#define T_True 388
+#define T_Trustedkey 389
+#define T_Ttl 390
+#define T_Type 391
+#define T_Version 392
+#define T_Week 393
+#define T_Year 394
+#define T_Flag 395
+#define T_Void 396
+#define T_EOC 397
+#define T_Simulate 398
+#define T_Beep_Delay 399
+#define T_Sim_Duration 400
+#define T_Server_Offset 401
+#define T_Duration 402
+#define T_Freq_Offset 403
+#define T_Wander 404
+#define T_Jitter 405
+#define T_Prop_Delay 406
+#define T_Proc_Delay 407
 
+
+
+
+/* Copy the first part of user declarations.  */
 #line 11 "ntp_parser.y"
 
   #ifdef HAVE_CONFIG_H
@@ -209,8 +413,22 @@
  #define CRYPTO_CONF_IDENT 12    
 #endif
 
-#line 67 "ntp_parser.y"
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
 #ifndef YYSTYPE
+#line 67 "ntp_parser.y"
 typedef union {
     char   *String;
     double  Double;
@@ -225,563 +443,31 @@ typedef union {
     server_info *Sim_server;
     script_info *Sim_script;
 } yystype;
+/* Line 193 of /usr/local/share/bison/yacc.c.  */
+#line 448 "ntp_parser.c"
 # define YYSTYPE yystype
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-
-
-
-#define	YYFINAL		359
-#define	YYFLAG		-32768
-#define	YYNTBASE	157
-
-/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
-#define YYTRANSLATE(x) ((unsigned)(x) <= 405 ? yytranslate[x] : 218)
-
-/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
-static const short yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   153,     2,   154,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   152,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,   155,     2,   156,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-     106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-     116,   117,   118,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   149,   150,   151
-};
-
-#if YYDEBUG
-static const short yyprhs[] =
-{
-       0,     0,     2,     6,     9,    12,    13,    15,    17,    19,
-      21,    23,    25,    27,    29,    31,    33,    35,    39,    42,
-      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,
-     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,
-     232,   234,   236,   238,   241,   243,   246,   249,   251,   253,
-     255,   257,   259,   261,   263,   265,   267,   269,   271,   274,
-     278,   282,   288,   289,   292,   294,   296,   298,   300,   302,
-     304,   306,   308,   310,   312,   314,   316,   319,   321,   324,
-     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,   435,
-     438,   441,   444,   447,   450,   453,   457,   460,   465,   469,
-     472,   474,   477,   480,   483,   485,   488,   490,   492,   494,
-     496,   499,   501,   504,   506,   509,   511,   513,   515,   517,
-     519,   521,   527,   529,   533,   536,   540,   544,   547,   549,
-     555,   560,   564,   566,   568,   571,   573,   580,   584,   587,
-     591,   595,   599,   603
-};
-static const short yyrhs[] =
-{
-     158,     0,   158,   159,   141,     0,   159,   141,     0,     1,
-     141,     0,     0,   160,     0,   166,     0,   167,     0,   173,
-       0,   179,     0,   170,     0,   184,     0,   187,     0,   190,
-       0,   193,     0,   205,     0,   161,   162,   164,     0,   161,
-     162,     0,   115,     0,   103,     0,    98,     0,    11,     0,
-      67,     0,   163,     0,   124,     0,    53,   124,     0,    46,
-       0,    47,     0,   164,   165,     0,   165,     0,     6,     0,
-      14,     0,    48,     0,    56,    53,     0,    77,    53,     0,
-      73,    53,     0,    89,     0,   106,     0,   107,     0,   132,
-       0,   134,    53,     0,    79,    53,     0,   136,    53,     0,
-      12,     0,    12,    93,     0,    68,   202,     0,    82,   202,
-       0,     6,    53,     0,    21,    53,     0,    22,   168,     0,
-      57,   124,     0,    58,   124,     0,   112,    53,     0,   114,
-      53,     0,   133,   200,     0,   168,   169,     0,   169,     0,
-      18,   124,     0,    60,   124,     0,   109,   124,     0,    44,
-     124,     0,   117,   124,     0,    49,   124,     0,    50,   124,
-       0,    43,   124,     0,    83,   124,     0,   108,   124,     0,
-     130,   171,     0,   171,   172,     0,   172,     0,    17,    53,
-       0,    40,    53,     0,    20,   203,     0,    96,    53,     0,
-      75,   204,     0,    71,   204,     0,    74,   204,     0,    70,
-     204,     0,    78,    53,     0,    10,    53,     0,    72,    53,
-       0,   118,   174,     0,   120,   124,     0,    35,   175,   176,
-       0,   174,   175,     0,   175,     0,    19,     0,    23,     0,
-      65,     0,    99,     0,   110,     0,   125,     0,   176,   177,
-       0,   177,     0,    34,   124,     0,   135,   178,     0,    62,
-       0,    84,     0,    31,     0,    26,     0,    86,     0,   101,
-       0,    24,     0,   137,     0,    81,     0,   138,     0,     3,
-       0,    27,   182,     0,   113,   162,   180,     0,   113,    25,
-     180,     0,   113,   163,    69,   163,   180,     0,     0,   180,
-     181,     0,    51,     0,    59,     0,    61,     0,    66,     0,
-      85,     0,    87,     0,    88,     0,    90,     0,    91,     0,
-      92,     0,    95,     0,   136,     0,   182,   183,     0,   183,
-       0,     8,    53,     0,    76,    53,     0,    80,    53,     0,
-      42,   162,   185,     0,   185,   186,     0,   186,     0,   127,
-     204,     0,   128,   204,     0,   123,    53,     0,   111,   124,
-       0,    36,   203,     0,    37,   203,     0,    38,   203,     0,
-      39,   203,     0,    31,   188,     0,    26,   188,     0,   188,
-     189,     0,   189,     0,     5,     0,     9,     0,    15,     0,
-      55,     0,    80,     0,    94,     0,   119,     0,   129,   191,
-       0,   191,   192,     0,   192,     0,     4,   204,     0,    28,
-     204,     0,    41,   204,     0,    45,   204,     0,    97,   204,
-       0,   121,   204,     0,   122,   204,     0,    52,   124,   159,
-       0,    32,     0,    13,   204,     0,    16,    53,     0,   126,
-     204,     0,    30,   124,     0,   102,   124,     0,    64,   124,
-       0,     7,    53,     0,    63,   197,     0,   100,   201,     0,
-     116,   194,     0,   131,   163,   195,     0,   134,   200,     0,
-     124,   152,   124,    25,     0,   124,   152,   124,     0,   195,
-     196,     0,   196,     0,   104,    53,     0,    54,   163,     0,
-     197,   198,     0,   198,     0,   199,   124,     0,   124,     0,
-     153,     0,   154,     0,   152,     0,   200,    53,     0,    53,
-       0,   201,   124,     0,   124,     0,   202,   162,     0,   162,
-       0,    53,     0,   132,     0,    33,     0,    53,     0,    29,
-       0,   206,   155,   207,   209,   156,     0,   142,     0,   207,
-     208,   141,     0,   208,   141,     0,   143,   152,   204,     0,
-     144,   152,   204,     0,   209,   210,     0,   210,     0,   212,
-     155,   211,   214,   156,     0,   145,   152,   204,   141,     0,
-     115,   152,   213,     0,   163,     0,   124,     0,   214,   215,
-       0,   215,     0,   146,   152,   204,   155,   216,   156,     0,
-     216,   217,   141,     0,   217,   141,     0,   147,   152,   204,
-       0,   148,   152,   204,     0,   149,   152,   204,     0,   150,
-     152,   204,     0,   151,   152,   204,     0
-};
-
-#endif
 
-#if YYDEBUG
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const short yyrline[] =
+#ifndef YYLTYPE
+typedef struct yyltype
 {
-       0,   297,   301,   302,   307,   315,   316,   317,   318,   319,
-     320,   321,   322,   323,   324,   325,   326,   334,   340,   349,
-     350,   351,   352,   353,   357,   358,   359,   375,   376,   380,
-     381,   386,   387,   388,   389,   390,   391,   392,   393,   394,
-     395,   396,   397,   398,   408,   410,   412,   414,   425,   427,
-     429,   435,   437,   439,   441,   443,   448,   449,   453,   455,
-     457,   459,   461,   463,   465,   467,   469,   471,   481,   486,
-     487,   491,   493,   495,   497,   499,   501,   503,   505,   507,
-     509,   511,   521,   523,   525,   533,   534,   538,   540,   542,
-     544,   546,   548,   553,   554,   558,   559,   560,   561,   562,
-     563,   567,   568,   569,   570,   571,   572,   573,   582,   584,
-     589,   594,   602,   603,   607,   608,   609,   610,   611,   612,
-     613,   614,   615,   616,   617,   618,   622,   623,   627,   628,
-     629,   637,   642,   643,   647,   649,   651,   653,   655,   657,
-     659,   661,   670,   672,   677,   678,   682,   683,   684,   685,
-     686,   687,   689,   697,   701,   702,   706,   707,   708,   709,
-     710,   711,   712,   720,   736,   742,   744,   746,   748,   750,
-     752,   754,   757,   759,   761,   763,   765,   770,   772,   778,
-     779,   783,   784,   789,   790,   794,   795,   812,   813,   814,
-     823,   824,   828,   829,   833,   834,   838,   847,   848,   852,
-     853,   861,   876,   880,   881,   885,   886,   890,   891,   895,
-     900,   904,   908,   909,   913,   914,   918,   923,   924,   928,
-     930,   932,   934,   936
-};
-#endif
-
-
-#if (YYDEBUG) || defined YYERROR_VERBOSE
-
-/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
-static const char *const yytname[] =
-{
-  "$", "error", "$undefined.", "T_Age", "T_Allan", "T_Auth", "T_Autokey", 
-  "T_Automax", "T_Average", "T_Bclient", "T_Beacon", "T_Broadcast", 
-  "T_Broadcastclient", "T_Broadcastdelay", "T_Burst", "T_Calibrate", 
-  "T_Calldelay", "T_Ceiling", "T_Cert", "T_Clockstats", "T_Cohort", 
-  "T_ControlKey", "T_Crypto", "T_Cryptostats", "T_Day", "T_Default", 
-  "T_Disable", "T_Discard", "T_Dispersion", "T_Double", "T_Driftfile", 
-  "T_Enable", "T_End", "T_False", "T_File", "T_Filegen", "T_Flag1", 
-  "T_Flag2", "T_Flag3", "T_Flag4", "T_Floor", "T_Freq", "T_Fudge", 
-  "T_Gqpar", "T_Host", "T_Huffpuff", "T_IPv4_address", "T_IPv6_address", 
-  "T_Iburst", "T_Ident", "T_Iffpar", "T_Ignore", "T_Includefile", 
-  "T_Integer", "T_Interface", "T_Kernel", "T_Key", "T_Keys", "T_Keysdir", 
-  "T_Kod", "T_Leap", "T_Limited", "T_Link", "T_Logconfig", "T_Logfile", 
-  "T_Loopstats", "T_Lowpriotrap", "T_Manycastclient", "T_Manycastserver", 
-  "T_Mask", "T_Maxclock", "T_Maxdist", "T_Maxhop", "T_Maxpoll", 
-  "T_Minclock", "T_Mindist", "T_Minimum", "T_Minpoll", "T_Minsane", 
-  "T_Mode", "T_Monitor", "T_Month", "T_Multicastclient", "T_Mvpar", 
-  "T_Nolink", "T_Nomodify", "T_None", "T_Nopeer", "T_Noquery", 
-  "T_Noselect", "T_Noserve", "T_Notrap", "T_Notrust", "T_Novolley", 
-  "T_Ntp", "T_Ntpport", "T_Orphan", "T_Panic", "T_Peer", "T_Peerstats", 
-  "T_Phone", "T_Pid", "T_Pidfile", "T_Pool", "T_Port", "T_Pps", 
-  "T_Preempt", "T_Prefer", "T_Pw", "T_RandFile", "T_Rawstats", "T_Refid", 
-  "T_Requestkey", "T_Restrict", "T_Revoke", "T_Server", "T_Setvar", 
-  "T_Sign", "T_Statistics", "T_Stats", "T_Statsdir", "T_Step", 
-  "T_Stepout", "T_Stratum", "T_String", "T_Sysstats", "T_Tick", "T_Time1", 
-  "T_Time2", "T_Tinker", "T_Tos", "T_Trap", "T_True", "T_Trustedkey", 
-  "T_Ttl", "T_Type", "T_Version", "T_Week", "T_Year", "T_Flag", "T_Void", 
-  "T_EOC", "T_Simulate", "T_Beep_Delay", "T_Sim_Duration", 
-  "T_Server_Offset", "T_Duration", "T_Freq_Offset", "T_Wander", 
-  "T_Jitter", "T_Prop_Delay", "T_Proc_Delay", "'='", "'+'", "'-'", "'{'", 
-  "'}'", "configuration", "command_list", "command", "server_command", 
-  "client_type", "address", "ip_address", "option_list", "option", 
-  "other_mode_command", "authentication_command", "crypto_command_list", 
-  "crypto_command", "orphan_mode_command", "tos_option_list", 
-  "tos_option", "monitoring_command", "stats_list", "stat", 
-  "filegen_option_list", "filegen_option", "filegen_type", 
-  "access_control_command", "ac_flag_list", "access_control_flag", 
-  "discard_option_list", "discard_option", "fudge_command", 
-  "fudge_factor_list", "fudge_factor", "system_option_command", 
-  "system_option_list", "system_option", "tinker_command", 
-  "tinker_option_list", "tinker_option", "miscellaneous_command", 
-  "variable_assign", "trap_option_list", "trap_option", "log_config_list", 
-  "log_config_command", "log_config_prefix", "integer_list", 
-  "string_list", "address_list", "boolean", "number", "simulate_command", 
-  "sim_conf_start", "sim_init_statement_list", "sim_init_statement", 
-  "sim_server_list", "sim_server", "sim_server_offset", "sim_server_name", 
-  "sim_address", "sim_act_list", "sim_act", "sim_act_stmt_list", 
-  "sim_act_stmt", 0
-};
+  int first_line;
+  int first_column;
+  int last_line;
+  int last_column;
+} yyltype;
+# define YYLTYPE yyltype
+# define YYLTYPE_IS_TRIVIAL 1
 #endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const short yyr1[] =
-{
-       0,   157,   158,   158,   158,   159,   159,   159,   159,   159,
-     159,   159,   159,   159,   159,   159,   159,   160,   160,   161,
-     161,   161,   161,   161,   162,   162,   162,   163,   163,   164,
-     164,   165,   165,   165,   165,   165,   165,   165,   165,   165,
-     165,   165,   165,   165,   166,   166,   166,   166,   167,   167,
-     167,   167,   167,   167,   167,   167,   168,   168,   169,   169,
-     169,   169,   169,   169,   169,   169,   169,   169,   170,   171,
-     171,   172,   172,   172,   172,   172,   172,   172,   172,   172,
-     172,   172,   173,   173,   173,   174,   174,   175,   175,   175,
-     175,   175,   175,   176,   176,   177,   177,   177,   177,   177,
-     177,   178,   178,   178,   178,   178,   178,   178,   179,   179,
-     179,   179,   180,   180,   181,   181,   181,   181,   181,   181,
-     181,   181,   181,   181,   181,   181,   182,   182,   183,   183,
-     183,   184,   185,   185,   186,   186,   186,   186,   186,   186,
-     186,   186,   187,   187,   188,   188,   189,   189,   189,   189,
-     189,   189,   189,   190,   191,   191,   192,   192,   192,   192,
-     192,   192,   192,   193,   193,   193,   193,   193,   193,   193,
-     193,   193,   193,   193,   193,   193,   193,   194,   194,   195,
-     195,   196,   196,   197,   197,   198,   198,   199,   199,   199,
-     200,   200,   201,   201,   202,   202,   203,   203,   203,   204,
-     204,   205,   206,   207,   207,   208,   208,   209,   209,   210,
-     211,   212,   213,   213,   214,   214,   215,   216,   216,   217,
-     217,   217,   217,   217
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const short yyr2[] =
-{
-       0,     1,     3,     2,     2,     0,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     3,     2,     1,
-       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,     2,     2,     2,     2,
-       1,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     3,     2,     1,     1,     1,     1,
-       1,     1,     1,     2,     1,     2,     2,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     2,     3,
-       3,     5,     0,     2,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     1,     2,     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,     2,     2,
-       2,     2,     2,     2,     2,     3,     2,     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
-   doesn't specify something else to do.  Zero means the default is an
-   error. */
-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,    23,     0,     0,    21,     0,     0,    20,     0,
-       0,     0,    19,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   202,     1,     0,     6,     0,     7,     8,    11,
-       9,    10,    12,    13,    14,    15,    16,     0,     4,    48,
-     171,    45,   200,   199,   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,   168,   142,    87,    88,    89,    90,    91,
-      92,     0,    27,    28,     0,    25,     0,    24,     5,    51,
-      52,   186,   189,   187,   188,   172,   184,     0,   170,   195,
-      46,    47,   193,   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,   191,
-      55,   176,     0,     3,    18,     0,    58,    65,    61,    63,
-      64,    59,    66,    67,    60,    62,    56,   144,   128,   129,
-     130,   126,   100,    99,     0,    97,    98,     0,    84,    94,
-      26,     0,     0,     0,     0,     0,     0,     0,     0,   131,
-     133,   163,   183,   185,   194,   192,   110,   109,     0,     0,
-      85,   156,   157,   158,   159,   160,   161,   162,   154,    80,
-      71,   198,   196,   197,    73,    72,    78,    76,    81,    77,
-      75,    79,    74,    69,     0,     0,   175,   180,   190,     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,   178,   182,   181,   179,    34,    36,    35,    42,
-      41,    43,    29,     0,     0,     0,     0,     0,   208,     0,
-     204,   111,   177,   205,   206,     0,   203,   201,   207,     0,
-     213,   212,   211,     0,     0,     0,     0,     0,   215,     0,
-       0,   209,   214,   210,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   216,     0,
-     218,   219,   220,   221,   222,   223,   217,     0,     0,     0
-};
-
-static const short yydefgoto[] =
-{
-     357,    43,    44,    45,    46,   119,   107,   253,   254,    47,
-      48,    77,    78,    49,   156,   157,    50,   132,   101,   188,
-     189,   267,    51,   206,   290,    91,    92,    52,   199,   200,
-      53,    86,    87,    54,   143,   144,    55,   131,   236,   237,
-     115,   116,   117,   160,   123,   120,   224,    64,    56,    57,
-     257,   258,   307,   308,   324,   309,   322,   327,   328,   341,
-     342
-};
-
-static const short yypact[] =
-{
-      26,  -126,   -32,   -27,-32768,   -75,   -24,   -13,    -4,   361,
-      15,    -5,   -73,    15,-32768,   126,    39,   -61,   -57,   -55,
-      29,   -50,-32768,    39,    39,-32768,   -47,   -45,-32768,    35,
-      34,    45,-32768,    -9,   126,    -6,   -24,     0,   413,    -3,
-      46,    46,-32768,   202,   -59,-32768,    39,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   -43,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,     1,     6,     7,
-       9,    11,    12,    13,    19,    40,    41,   361,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,    15,-32768,    66,    67,
-      74,    -5,-32768,-32768,    15,-32768,-32768,-32768,-32768,-32768,
-  -32768,   -12,-32768,-32768,    56,-32768,   134,-32768,   334,-32768,
-  -32768,-32768,-32768,-32768,-32768,    29,-32768,    65,-32768,-32768,
-      39,    39,-32768,    68,-32768,-32768,-32768,-32768,    85,-32768,
-      17,-32768,   126,-32768,-32768,-32768,   -24,   -24,   -24,   -24,
-     -24,   -24,   -24,     0,-32768,   137,   145,   -22,   146,   -24,
-     -24,   147,   -24,   -24,   148,   149,   413,-32768,   -42,-32768,
-     150,   150,    63,-32768,   366,   -78,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,    82,-32768,-32768,    10,   -12,-32768,
-  -32768,   -22,   -22,   -22,   -22,    83,   157,   -24,   -24,   134,
-  -32768,-32768,-32768,-32768,-32768,-32768,   187,   187,    -3,    87,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,-32768,    -3,   159,   -42,-32768,-32768,-32768,
-  -32768,-32768,-32768,   163,   164,   166,   167,-32768,-32768,-32768,
-  -32768,   168,   169,   366,-32768,    75,    78,  -108,    90,-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,   201,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-  -32768,-32768,-32768,   -24,   -24,    88,    94,   -92,-32768,    84,
-  -32768,   187,-32768,-32768,-32768,     8,-32768,-32768,-32768,    96,
-  -32768,-32768,-32768,    91,   101,   -24,    97,  -140,-32768,   109,
-     -24,-32768,-32768,-32768,   100,    27,   104,   106,   111,   112,
-     119,    37,   132,   -24,   -24,   -24,   -24,   -24,-32768,   135,
-  -32768,-32768,-32768,-32768,-32768,-32768,-32768,   242,   252,-32768
-};
-
-static const short yypgoto[] =
-{
-  -32768,-32768,   -35,-32768,-32768,    30,   -29,-32768,    28,-32768,
-  -32768,-32768,   203,-32768,-32768,   127,-32768,-32768,   -25,-32768,
-      99,-32768,-32768,  -125,-32768,-32768,   194,-32768,-32768,    89,
-  -32768,   277,   -69,-32768,-32768,   152,-32768,-32768,-32768,    55,
-  -32768,   177,-32768,   255,-32768,   269,     3,   -36,-32768,-32768,
-  -32768,    42,-32768,   -10,-32768,-32768,-32768,-32768,   -26,-32768,
-     -38
-};
-
-
-#define	YYLAST		509
-
-
-static const short yytable[] =
-{
-     135,   128,   207,    88,   136,    62,   326,   305,   162,   133,
-     158,   221,   234,   260,   182,    58,   331,   177,    61,   183,
-      79,    59,   184,   305,    80,   177,    60,     1,   137,    63,
-      81,   222,     2,     3,   261,   255,   256,     4,     5,     6,
-      65,   138,     7,   102,   103,   139,   106,     8,     9,    66,
-     185,    93,    10,    11,   102,   103,    12,    13,    14,   126,
-     127,    15,   235,   108,   317,   255,   256,   109,    16,   110,
-      82,    89,   186,   201,   118,    90,   164,   122,    17,   124,
-     102,   103,   163,    18,    19,   102,   103,   104,   125,    20,
-      21,   262,   104,    22,    23,    83,   263,   140,   129,   159,
-     211,   212,   213,   214,   215,   216,   217,   210,    24,    84,
-     223,   264,   165,   226,   227,   130,   229,   230,   134,   178,
-     179,   141,   142,   187,    25,   166,    26,   180,    27,    28,
-     167,   168,   320,   169,    85,   170,   171,   172,    29,    30,
-      31,    32,    33,   173,    34,    95,    35,   265,   266,    96,
-     204,   204,    36,   111,   208,    37,    38,    39,   105,    40,
-      41,   275,   276,   105,   174,   175,   311,    -5,    42,   209,
-     191,   192,   193,   194,   336,   337,   338,   339,   340,   291,
-     190,   112,   113,   114,   336,   337,   338,   339,   340,   203,
-     219,    97,   205,   348,   269,   270,   271,   272,   220,   225,
-     228,   231,   232,   238,   239,   293,   259,   273,     2,     3,
-     274,   292,   294,     4,     5,     6,   296,   297,     7,   298,
-     299,   300,   301,     8,     9,    98,   312,   303,    10,    11,
-     304,   310,    12,    13,    14,   316,    99,    15,   278,   319,
-     315,   323,   358,   325,    16,   195,   279,   326,   280,   330,
-     333,   100,   359,   281,    17,   335,   343,   196,   344,    18,
-      19,   197,   198,   345,   346,    20,    21,   313,   314,    22,
-      23,   347,   282,   350,   283,   284,   356,   285,   286,   287,
-     176,   302,   288,   233,    24,   181,   321,   268,   277,   329,
-      94,   295,   202,   121,   334,   218,   161,   318,     0,   306,
-      25,   332,    26,   349,    27,    28,     0,   351,   352,   353,
-     354,   355,     0,     0,    29,    30,    31,    32,    33,     0,
-      34,     0,    35,   289,     0,     0,     0,     0,    36,     0,
-       0,    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,    13,    14,     0,     0,    15,
-       0,     0,   240,     0,     0,     0,    16,     0,     0,    67,
-     241,     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,   242,     0,    24,     0,     0,     0,
-       0,    72,   243,   145,     0,     0,     0,     0,     0,     0,
-     146,     0,    25,   147,    26,     0,    27,    28,     0,   244,
-       0,     0,     0,   245,    73,   246,    29,    30,    31,    32,
-      33,     0,    34,   148,    35,   247,     0,     0,     0,     0,
-      36,     0,     0,    37,    38,    39,     0,    40,    41,    74,
-      75,     0,   248,   249,     0,     0,    42,     0,    76,     0,
-       0,     0,     0,   149,   150,   151,     0,   152,   153,     0,
-       0,   154,     0,     0,     0,     0,     0,     0,   250,     0,
-     251,     0,   252,     0,     0,     0,     0,     0,     0,   155
-};
-
-static const short yycheck[] =
-{
-      36,    30,   127,     8,     4,    29,   146,   115,    43,    34,
-      39,    33,    54,     3,    26,   141,   156,    86,    93,    31,
-       5,    53,    34,   115,     9,    94,    53,     1,    28,    53,
-      15,    53,     6,     7,    24,   143,   144,    11,    12,    13,
-      53,    41,    16,    46,    47,    45,    16,    21,    22,    53,
-      62,   124,    26,    27,    46,    47,    30,    31,    32,    25,
-      30,    35,   104,   124,   156,   143,   144,   124,    42,   124,
-      55,    76,    84,   108,   124,    80,    46,   124,    52,   124,
-      46,    47,   141,    57,    58,    46,    47,    53,    53,    63,
-      64,    81,    53,    67,    68,    80,    86,    97,    53,    53,
-     136,   137,   138,   139,   140,   141,   142,   132,    82,    94,
-     132,   101,   155,   149,   150,   124,   152,   153,   124,    53,
-      53,   121,   122,   135,    98,   124,   100,    53,   102,   103,
-     124,   124,   124,   124,   119,   124,   124,   124,   112,   113,
-     114,   115,   116,   124,   118,    19,   120,   137,   138,    23,
-     120,   121,   126,   124,    69,   129,   130,   131,   124,   133,
-     134,   197,   198,   124,   124,   124,   291,   141,   142,   152,
-      36,    37,    38,    39,   147,   148,   149,   150,   151,   208,
-     124,   152,   153,   154,   147,   148,   149,   150,   151,   124,
-      53,    65,   124,   156,   191,   192,   193,   194,    53,    53,
-      53,    53,    53,    53,   141,   234,   124,   124,     6,     7,
-      53,   124,    53,    11,    12,    13,    53,    53,    16,    53,
-      53,    53,    53,    21,    22,    99,    25,   152,    26,    27,
-     152,   141,    30,    31,    32,   141,   110,    35,    51,   155,
-     152,   145,     0,   152,    42,   111,    59,   146,    61,   152,
-     141,   125,     0,    66,    52,   155,   152,   123,   152,    57,
-      58,   127,   128,   152,   152,    63,    64,   303,   304,    67,
-      68,   152,    85,   141,    87,    88,   141,    90,    91,    92,
-      77,   253,    95,   156,    82,    91,   315,   188,   199,   325,
-      13,   236,   115,    24,   330,   143,    41,   307,    -1,   257,
-      98,   327,   100,   341,   102,   103,    -1,   343,   344,   345,
-     346,   347,    -1,    -1,   112,   113,   114,   115,   116,    -1,
-     118,    -1,   120,   136,    -1,    -1,    -1,    -1,   126,    -1,
-      -1,   129,   130,   131,    -1,   133,   134,    -1,    -1,    -1,
-       6,     7,    -1,   141,   142,    11,    12,    13,    -1,    -1,
-      16,    -1,    -1,    -1,    -1,    21,    22,    -1,    -1,    -1,
-      26,    27,    -1,    -1,    30,    31,    32,    -1,    -1,    35,
-      -1,    -1,     6,    -1,    -1,    -1,    42,    -1,    -1,    18,
-      14,    -1,    -1,    -1,    -1,    -1,    52,    -1,    -1,    -1,
-      -1,    57,    58,    -1,    -1,    -1,    -1,    63,    64,    -1,
-      -1,    67,    68,    -1,    43,    44,    -1,    -1,    -1,    -1,
-      49,    50,    -1,    -1,    48,    -1,    82,    -1,    -1,    -1,
-      -1,    60,    56,    10,    -1,    -1,    -1,    -1,    -1,    -1,
-      17,    -1,    98,    20,   100,    -1,   102,   103,    -1,    73,
-      -1,    -1,    -1,    77,    83,    79,   112,   113,   114,   115,
-     116,    -1,   118,    40,   120,    89,    -1,    -1,    -1,    -1,
-     126,    -1,    -1,   129,   130,   131,    -1,   133,   134,   108,
-     109,    -1,   106,   107,    -1,    -1,   142,    -1,   117,    -1,
-      -1,    -1,    -1,    70,    71,    72,    -1,    74,    75,    -1,
-      -1,    78,    -1,    -1,    -1,    -1,    -1,    -1,   132,    -1,
-     134,    -1,   136,    -1,    -1,    -1,    -1,    -1,    -1,    96
-};
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/local/gnu/share/bison/bison.simple"
-
-/* Skeleton output parser for bison,
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software
-   Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+/* Copy the second part of user declarations.  */
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
 
-/* This is the parser code that is written into each bison parser when
-   the %semantic_parser declaration is not specified in the grammar.
-   It was written by Richard Stallman by simplifying the hairy parser
-   used when %semantic_parser is specified.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
+/* Line 213 of /usr/local/share/bison/yacc.c.  */
+#line 469 "ntp_parser.c"
 
-#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
+#if ! defined (yyoverflow) || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
@@ -810,7 +496,7 @@ static const short yycheck[] =
 #  define YYSTACK_ALLOC malloc
 #  define YYSTACK_FREE free
 # endif
-#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
@@ -822,25 +508,16 @@ union yyalloc
 {
   short yyss;
   YYSTYPE yyvs;
-# if YYLSP_NEEDED
-  YYLTYPE yyls;
-# endif
-};
+  };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
-# if YYLSP_NEEDED
-#  define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))	\
-      + 2 * YYSTACK_GAP_MAX)
-# else
-#  define YYSTACK_BYTES(N) \
+# define YYSTACK_BYTES(N) \
      ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
       + YYSTACK_GAP_MAX)
-# endif
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
@@ -854,7 +531,7 @@ union yyalloc
 	{					\
 	  register YYSIZE_T yyi;		\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
+	    (To)[yyi] = (From)[yyi];	\
 	}					\
       while (0)
 #  endif
@@ -878,6 +555,613 @@ union yyalloc
 
 #endif
 
+#if defined (__STDC__) || defined (__cplusplus)
+   typedef signed char yysigned_char;
+#else
+   typedef short yysigned_char;
+#endif
+
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL  163
+#define YYLAST   524
+
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS  158
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS  63
+/* YYNRULES -- Number of rules. */
+#define YYNRULES  226
+/* YYNRULES -- Number of states. */
+#define YYNSTATES  361
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   407
+
+#define YYTRANSLATE(X) \
+  ((unsigned)(X) <= YYMAXUTOK ? yytranslate[X] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const unsigned char yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,   154,     2,   155,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,   153,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,   156,     2,   157,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
+      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
+      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
+     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+     115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
+     135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
+     145,   146,   147,   148,   149,   150,   151,   152
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const unsigned short yyprhs[] =
+{
+       0,     0,     3,     5,     9,    12,    15,    16,    18,    20,
+      22,    24,    26,    28,    30,    32,    34,    36,    38,    42,
+      45,    47,    49,    51,    53,    55,    57,    59,    62,    64,
+      66,    69,    71,    73,    75,    77,    80,    83,    86,    88,
+      90,    92,    94,    97,   100,   103,   105,   108,   111,   114,
+     117,   120,   123,   126,   129,   132,   135,   138,   141,   143,
+     146,   149,   152,   155,   158,   161,   164,   167,   170,   173,
+     176,   179,   181,   184,   187,   190,   193,   196,   199,   202,
+     205,   208,   211,   214,   217,   220,   224,   227,   229,   231,
+     233,   235,   237,   239,   241,   244,   246,   249,   252,   254,
+     256,   258,   260,   262,   264,   266,   268,   270,   272,   274,
+     277,   281,   285,   291,   292,   295,   297,   299,   301,   303,
+     305,   307,   309,   311,   313,   315,   317,   319,   322,   324,
+     327,   330,   333,   337,   340,   342,   345,   348,   351,   354,
+     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
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const short yyrhs[] =
+{
+     159,     0,    -1,   160,    -1,   160,   161,   142,    -1,   161,
+     142,    -1,     1,   142,    -1,    -1,   162,    -1,   168,    -1,
+     169,    -1,   175,    -1,   181,    -1,   172,    -1,   186,    -1,
+     189,    -1,   192,    -1,   195,    -1,   208,    -1,   163,   164,
+     166,    -1,   163,   164,    -1,   116,    -1,   104,    -1,    99,
+      -1,    11,    -1,    68,    -1,   165,    -1,   125,    -1,    54,
+     125,    -1,    47,    -1,    48,    -1,   166,   167,    -1,   167,
+      -1,     6,    -1,    14,    -1,    49,    -1,    57,    54,    -1,
+      78,    54,    -1,    74,    54,    -1,    90,    -1,   107,    -1,
+     108,    -1,   133,    -1,   135,    54,    -1,    80,    54,    -1,
+     137,    54,    -1,    12,    -1,    12,    94,    -1,    69,   205,
+      -1,    83,   205,    -1,     6,    54,    -1,    21,    54,    -1,
+      22,   170,    -1,    58,   125,    -1,    59,   125,    -1,   113,
+      54,    -1,   115,    54,    -1,   134,   203,    -1,   170,   171,
+      -1,   171,    -1,    18,   125,    -1,    61,   125,    -1,   110,
+     125,    -1,    45,   125,    -1,   118,   125,    -1,    50,   125,
+      -1,    51,   125,    -1,    44,   125,    -1,    84,   125,    -1,
+     109,   125,    -1,   131,   173,    -1,   173,   174,    -1,   174,
+      -1,    17,    54,    -1,    41,    54,    -1,    20,   206,    -1,
+      97,    54,    -1,    76,   207,    -1,    72,   207,    -1,    75,
+     207,    -1,    71,   207,    -1,    79,    54,    -1,    10,    54,
+      -1,    73,    54,    -1,   119,   176,    -1,   121,   125,    -1,
+      36,   177,   178,    -1,   176,   177,    -1,   177,    -1,    19,
+      -1,    23,    -1,    66,    -1,   100,    -1,   111,    -1,   126,
+      -1,   178,   179,    -1,   179,    -1,    35,   125,    -1,   136,
+     180,    -1,    63,    -1,    85,    -1,    32,    -1,    26,    -1,
+      87,    -1,   102,    -1,    24,    -1,   138,    -1,    82,    -1,
+     139,    -1,     3,    -1,    27,   184,    -1,   114,   164,   182,
+      -1,   114,    25,   182,    -1,   114,   165,    70,   165,   182,
+      -1,    -1,   182,   183,    -1,    52,    -1,    60,    -1,    62,
+      -1,    67,    -1,    86,    -1,    88,    -1,    89,    -1,    91,
+      -1,    92,    -1,    93,    -1,    96,    -1,   137,    -1,   184,
+     185,    -1,   185,    -1,     8,    54,    -1,    77,    54,    -1,
+      81,    54,    -1,    43,   164,   187,    -1,   187,   188,    -1,
+     188,    -1,   128,   207,    -1,   129,   207,    -1,   124,    54,
+      -1,   112,   125,    -1,    37,   206,    -1,    38,   206,    -1,
+      39,   206,    -1,    40,   206,    -1,    32,   190,    -1,    26,
+     190,    -1,   190,   191,    -1,   191,    -1,     5,    -1,     9,
+      -1,    15,    -1,    56,    -1,    81,    -1,    95,    -1,   120,
+      -1,   130,   193,    -1,   193,   194,    -1,   194,    -1,     4,
+     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
+};
+
+/* 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
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE
+/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "T_Age", "T_Allan", "T_Auth", "T_Autokey", 
+  "T_Automax", "T_Average", "T_Bclient", "T_Beacon", "T_Broadcast", 
+  "T_Broadcastclient", "T_Broadcastdelay", "T_Burst", "T_Calibrate", 
+  "T_Calldelay", "T_Ceiling", "T_Cert", "T_Clockstats", "T_Cohort", 
+  "T_ControlKey", "T_Crypto", "T_Cryptostats", "T_Day", "T_Default", 
+  "T_Disable", "T_Discard", "T_Dispersion", "T_Double", "T_Driftfile", 
+  "T_DriftMinutes", "T_Enable", "T_End", "T_False", "T_File", "T_Filegen", 
+  "T_Flag1", "T_Flag2", "T_Flag3", "T_Flag4", "T_Floor", "T_Freq", 
+  "T_Fudge", "T_Gqpar", "T_Host", "T_Huffpuff", "T_IPv4_address", 
+  "T_IPv6_address", "T_Iburst", "T_Ident", "T_Iffpar", "T_Ignore", 
+  "T_Includefile", "T_Integer", "T_Interface", "T_Kernel", "T_Key", 
+  "T_Keys", "T_Keysdir", "T_Kod", "T_Leap", "T_Limited", "T_Link", 
+  "T_Logconfig", "T_Logfile", "T_Loopstats", "T_Lowpriotrap", 
+  "T_Manycastclient", "T_Manycastserver", "T_Mask", "T_Maxclock", 
+  "T_Maxdist", "T_Maxhop", "T_Maxpoll", "T_Minclock", "T_Mindist", 
+  "T_Minimum", "T_Minpoll", "T_Minsane", "T_Mode", "T_Monitor", "T_Month", 
+  "T_Multicastclient", "T_Mvpar", "T_Nolink", "T_Nomodify", "T_None", 
+  "T_Nopeer", "T_Noquery", "T_Noselect", "T_Noserve", "T_Notrap", 
+  "T_Notrust", "T_Novolley", "T_Ntp", "T_Ntpport", "T_Orphan", "T_Panic", 
+  "T_Peer", "T_Peerstats", "T_Phone", "T_Pid", "T_Pidfile", "T_Pool", 
+  "T_Port", "T_Pps", "T_Preempt", "T_Prefer", "T_Pw", "T_RandFile", 
+  "T_Rawstats", "T_Refid", "T_Requestkey", "T_Restrict", "T_Revoke", 
+  "T_Server", "T_Setvar", "T_Sign", "T_Statistics", "T_Stats", 
+  "T_Statsdir", "T_Step", "T_Stepout", "T_Stratum", "T_String", 
+  "T_Sysstats", "T_Tick", "T_Time1", "T_Time2", "T_Tinker", "T_Tos", 
+  "T_Trap", "T_True", "T_Trustedkey", "T_Ttl", "T_Type", "T_Version", 
+  "T_Week", "T_Year", "T_Flag", "T_Void", "T_EOC", "T_Simulate", 
+  "T_Beep_Delay", "T_Sim_Duration", "T_Server_Offset", "T_Duration", 
+  "T_Freq_Offset", "T_Wander", "T_Jitter", "T_Prop_Delay", "T_Proc_Delay", 
+  "'='", "'+'", "'-'", "'{'", "'}'", "$accept", "configuration", 
+  "command_list", "command", "server_command", "client_type", "address", 
+  "ip_address", "option_list", "option", "other_mode_command", 
+  "authentication_command", "crypto_command_list", "crypto_command", 
+  "orphan_mode_command", "tos_option_list", "tos_option", 
+  "monitoring_command", "stats_list", "stat", "filegen_option_list", 
+  "filegen_option", "filegen_type", "access_control_command", 
+  "ac_flag_list", "access_control_flag", "discard_option_list", 
+  "discard_option", "fudge_command", "fudge_factor_list", "fudge_factor", 
+  "system_option_command", "system_option_list", "system_option", 
+  "tinker_command", "tinker_option_list", "tinker_option", 
+  "miscellaneous_command", "drift_parm", "variable_assign", 
+  "trap_option_list", "trap_option", "log_config_list", 
+  "log_config_command", "log_config_prefix", "integer_list", 
+  "string_list", "address_list", "boolean", "number", "simulate_command", 
+  "sim_conf_start", "sim_init_statement_list", "sim_init_statement", 
+  "sim_server_list", "sim_server", "sim_server_offset", "sim_server_name", 
+  "sim_address", "sim_act_list", "sim_act", "sim_act_stmt_list", 
+  "sim_act_stmt", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const unsigned short yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
+     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
+     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
+     305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
+     315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
+     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
+     335,   336,   337,   338,   339,   340,   341,   342,   343,   344,
+     345,   346,   347,   348,   349,   350,   351,   352,   353,   354,
+     355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
+     365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
+     375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
+     385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
+     395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
+     405,   406,   407,    61,    43,    45,   123,   125
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const unsigned char yyr1[] =
+{
+       0,   158,   159,   160,   160,   160,   161,   161,   161,   161,
+     161,   161,   161,   161,   161,   161,   161,   161,   162,   162,
+     163,   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,   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,   177,   177,   177,   178,   178,   179,   179,   179,   179,
+     179,   179,   180,   180,   180,   180,   180,   180,   180,   181,
+     181,   181,   181,   182,   182,   183,   183,   183,   183,   183,
+     183,   183,   183,   183,   183,   183,   183,   184,   184,   185,
+     185,   185,   186,   187,   187,   188,   188,   188,   188,   188,
+     188,   188,   188,   189,   189,   190,   190,   191,   191,   191,
+     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
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const unsigned char yyr2[] =
+{
+       0,     2,     1,     3,     2,     2,     0,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     2,
+       1,     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,     2,     2,     2,
+       2,     1,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     3,     2,     1,     1,     1,
+       1,     1,     1,     1,     2,     1,     2,     2,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     2,
+       3,     3,     5,     0,     2,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     1,     2,
+       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
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+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,    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,
+      12,    10,    11,    13,    14,    15,    16,    17,     0,     5,
+      49,   172,    46,   203,   202,   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,
+      99,     0,    85,    95,    27,     0,     0,     0,     0,     0,
+       0,     0,     0,   132,   134,   164,   186,   188,   197,   195,
+     111,   110,     0,     0,    86,   157,   158,   159,   160,   161,
+     162,   163,   155,    81,    72,   201,   199,   200,    74,    73,
+      79,    77,    82,    78,    76,    80,    75,    70,     0,     0,
+     176,   183,   193,     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,
+      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,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   219,     0,   221,   222,   223,   224,   225,   226,
+     220
+};
+
+/* 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,
+     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,
+      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
+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
+};
+
+/* 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
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, parse error.  */
+#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,
+       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,   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
+};
+
+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,
+      -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,    -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
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const unsigned char yystos[] =
+{
+       0,     1,     6,     7,    11,    12,    13,    16,    21,    22,
+      26,    27,    30,    32,    33,    36,    43,    53,    58,    59,
+      64,    65,    68,    69,    83,    99,   101,   103,   104,   113,
+     114,   115,   116,   117,   119,   121,   127,   130,   131,   132,
+     134,   135,   143,   159,   160,   161,   162,   163,   168,   169,
+     172,   175,   181,   186,   189,   192,   195,   208,   209,   142,
+      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,
+      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,
+     207,   207,   194,    54,    54,    34,    54,   133,   206,    54,
+     207,   207,    54,   207,   207,    54,    54,   174,    55,   105,
+     198,   199,    54,   142,     6,    14,    49,    57,    74,    78,
+      80,    90,   107,   108,   133,   135,   137,   166,   167,   144,
+     145,   210,   211,   125,     3,    24,    82,    87,   102,   138,
+     139,   180,   179,   206,   206,   206,   206,   125,    54,   207,
+     207,   188,    52,    60,    62,    67,    86,    88,    89,    91,
+      92,    93,    96,   137,   183,   165,   125,   165,    54,   199,
+      54,    54,    54,    54,    54,    54,   167,   153,   153,   116,
+     211,   212,   213,   215,   142,   182,    25,   207,   207,   153,
+     142,   157,   213,   156,   125,   165,   216,   146,   214,   153,
+     147,   217,   218,   207,   153,   157,   218,   142,   207,   156,
+     148,   149,   150,   151,   152,   219,   220,   153,   153,   153,
+     153,   153,   157,   220,   142,   207,   207,   207,   207,   207,
+     142
+};
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -899,14 +1183,19 @@ union yyalloc
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		-2
 #define YYEOF		0
+
 #define YYACCEPT	goto yyacceptlab
-#define YYABORT 	goto yyabortlab
+#define YYABORT		goto yyabortlab
 #define YYERROR		goto yyerrlab1
+
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
+
 #define YYFAIL		goto yyerrlab
+
 #define YYRECOVERING()  (!!yyerrstatus)
+
 #define YYBACKUP(Token, Value)					\
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
@@ -927,41 +1216,20 @@ while (0)
 #define YYTERROR	1
 #define YYERRCODE	256
 
-
 /* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).
-
-   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
-   first token.  By default, to implement support for ranges, extend
-   its range to the last symbol.  */
+   are run).  */
 
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)       	\
-   Current.last_line   = Rhs[N].last_line;	\
-   Current.last_column = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)           \
+  Current.first_line   = Rhs[1].first_line;      \
+  Current.first_column = Rhs[1].first_column;    \
+  Current.last_line    = Rhs[N].last_line;       \
+  Current.last_column  = Rhs[N].last_column;
 #endif
 
-
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
-#if YYPURE
-# if YYLSP_NEEDED
-#  ifdef YYLEX_PARAM
-#   define YYLEX		yylex (&yylval, &yylloc, YYLEX_PARAM)
-#  else
-#   define YYLEX		yylex (&yylval, &yylloc)
-#  endif
-# else /* !YYLSP_NEEDED */
-#  ifdef YYLEX_PARAM
-#   define YYLEX		yylex (&yylval, YYLEX_PARAM)
-#  else
-#   define YYLEX		yylex (&yylval)
-#  endif
-# endif /* !YYLSP_NEEDED */
-#else /* !YYPURE */
-# define YYLEX			yylex ()
-#endif /* !YYPURE */
-
+#define YYLEX	yylex ()
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -976,11 +1244,17 @@ do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
 } while (0)
+# define YYDSYMPRINT(Args)			\
+do {						\
+  if (yydebug)					\
+    yysymprint Args;				\
+} while (0)
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
+# define YYDSYMPRINT(Args)
 #endif /* !YYDEBUG */
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
@@ -1002,8 +1276,10 @@ int yydebug;
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
+
 
-#ifdef YYERROR_VERBOSE
+
+#if YYERROR_VERBOSE
 
 # ifndef yystrlen
 #  if defined (__GLIBC__) && defined (_STRING_H)
@@ -1053,10 +1329,73 @@ yystpcpy (yydest, yysrc)
 }
 #  endif
 # endif
-#endif
+
+#endif /* !YYERROR_VERBOSE */
+
 
-#line 315 "/usr/local/gnu/share/bison/bison.simple"
 
+#if YYDEBUG
+/*-----------------------------.
+| Print this symbol on YYOUT.  |
+`-----------------------------*/
+
+static void
+#if defined (__STDC__) || defined (__cplusplus)
+yysymprint (FILE* yyout, int yytype, YYSTYPE yyvalue)
+#else
+yysymprint (yyout, yytype, yyvalue)
+    FILE* yyout;
+    int yytype;
+    YYSTYPE yyvalue;
+#endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvalue;
+
+  if (yytype < YYNTOKENS)
+    {
+      YYFPRINTF (yyout, "token %s (", yytname[yytype]);
+# ifdef YYPRINT
+      YYPRINT (yyout, yytoknum[yytype], yyvalue);
+# endif
+    }
+  else
+    YYFPRINTF (yyout, "nterm %s (", yytname[yytype]);
+
+  switch (yytype)
+    {
+      default:
+        break;
+    }
+  YYFPRINTF (yyout, ")");
+}
+#endif /* YYDEBUG. */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+static void
+#if defined (__STDC__) || defined (__cplusplus)
+yydestruct (int yytype, YYSTYPE yyvalue)
+#else
+yydestruct (yytype, yyvalue)
+    int yytype;
+    YYSTYPE yyvalue;
+#endif
+{
+  /* Pacify ``unused variable'' warnings.  */
+  (void) yyvalue;
+
+  switch (yytype)
+    {
+      default:
+        break;
+    }
+}
+
+
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -1086,46 +1425,22 @@ int yyparse (void);
 # endif
 #endif
 
-/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
-   variables are global, or local to YYPARSE.  */
 
-#define YY_DECL_NON_LSP_VARIABLES			\
-/* The lookahead symbol.  */				\
-int yychar;						\
-							\
-/* The semantic value of the lookahead symbol. */	\
-YYSTYPE yylval;						\
-							\
-/* Number of parse errors so far.  */			\
-int yynerrs;
-
-#if YYLSP_NEEDED
-# define YY_DECL_VARIABLES			\
-YY_DECL_NON_LSP_VARIABLES			\
-						\
-/* Location data for the lookahead symbol.  */	\
-YYLTYPE yylloc;
-#else
-# define YY_DECL_VARIABLES			\
-YY_DECL_NON_LSP_VARIABLES
-#endif
+/* The lookahead symbol.  */
+int yychar;
 
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
 
-/* If nonreentrant, generate the variables here. */
+/* Number of parse errors so far.  */
+int yynerrs;
 
-#if !YYPURE
-YY_DECL_VARIABLES
-#endif  /* !YYPURE */
 
 int
 yyparse (YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
-  /* If reentrant, generate the variables here. */
-#if YYPURE
-  YY_DECL_VARIABLES
-#endif  /* !YYPURE */
-
+  
   register int yystate;
   register int yyn;
   int yyresult;
@@ -1142,7 +1457,7 @@ yyparse (YYPARSE_PARAM_ARG)
      Refer to the stacks thru separate pointers, to allow yyoverflow
      to reallocate them elsewhere.  */
 
-  /* The state stack. */
+  /* The state stack.  */
   short	yyssa[YYINITDEPTH];
   short *yyss = yyssa;
   register short *yyssp;
@@ -1152,31 +1467,19 @@ yyparse (YYPARSE_PARAM_ARG)
   YYSTYPE *yyvs = yyvsa;
   register YYSTYPE *yyvsp;
 
-#if YYLSP_NEEDED
-  /* The location stack.  */
-  YYLTYPE yylsa[YYINITDEPTH];
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-#endif
 
-#if YYLSP_NEEDED
-# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-# define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
+#define YYPOPSTACK   (yyvsp--, yyssp--)
 
+  YYSIZE_T yystacksize = YYINITDEPTH;
 
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
-#if YYLSP_NEEDED
-  YYLTYPE yyloc;
-#endif
+
 
   /* When reducing, the number of symbols on the RHS of the reduced
-     rule. */
+     rule.  */
   int yylen;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1193,9 +1496,7 @@ yyparse (YYPARSE_PARAM_ARG)
 
   yyssp = yyss;
   yyvsp = yyvs;
-#if YYLSP_NEEDED
-  yylsp = yyls;
-#endif
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1223,24 +1524,17 @@ yyparse (YYPARSE_PARAM_ARG)
 	YYSTYPE *yyvs1 = yyvs;
 	short *yyss1 = yyss;
 
+
 	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  */
-# if YYLSP_NEEDED
-	YYLTYPE *yyls1 = yyls;
-	/* This used to be a conditional around just the two extra args,
-	   but that might be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yyls1, yysize * sizeof (*yylsp),
-		    &yystacksize);
-	yyls = yyls1;
-# else
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
 	yyoverflow ("parser stack overflow",
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
+
 		    &yystacksize);
-# endif
+
 	yyss = yyss1;
 	yyvs = yyvs1;
       }
@@ -1263,10 +1557,8 @@ yyparse (YYPARSE_PARAM_ARG)
 	  goto yyoverflowlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
-# if YYLSP_NEEDED
-	YYSTACK_RELOCATE (yyls);
-# endif
-# undef YYSTACK_RELOCATE
+
+#  undef YYSTACK_RELOCATE
 	if (yyss1 != yyssa)
 	  YYSTACK_FREE (yyss1);
       }
@@ -1275,9 +1567,7 @@ yyparse (YYPARSE_PARAM_ARG)
 
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
-#if YYLSP_NEEDED
-      yylsp = yyls + yysize - 1;
-#endif
+
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
 		  (unsigned long int) yystacksize));
@@ -1290,7 +1580,6 @@ yyparse (YYPARSE_PARAM_ARG)
 
   goto yybackup;
 
-
 /*-----------.
 | yybackup.  |
 `-----------*/
@@ -1303,7 +1592,7 @@ yybackup:
   /* First try to decide what to do without reference to lookahead token.  */
 
   yyn = yypact[yystate];
-  if (yyn == YYFLAG)
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1317,12 +1606,12 @@ yybackup:
       yychar = YYLEX;
     }
 
-  /* Convert token to internal form (in yychar1) for indexing tables with */
+  /* Convert token to internal form (in yychar1) for indexing tables with.  */
 
-  if (yychar <= 0)		/* This means end of input. */
+  if (yychar <= 0)		/* This means end of input.  */
     {
       yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
+      yychar = YYEOF;		/* Don't call YYLEX any more.  */
 
       YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
@@ -1330,45 +1619,26 @@ yybackup:
     {
       yychar1 = YYTRANSLATE (yychar);
 
-#if YYDEBUG
-     /* We have to keep this `#if YYDEBUG', since we use variables
-	which are defined only if `YYDEBUG' is set.  */
-      if (yydebug)
-	{
-	  YYFPRINTF (stderr, "Next token is %d (%s",
-		     yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise
-	     meaning of a token, for further debugging info.  */
-# ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-# endif
-	  YYFPRINTF (stderr, ")\n");
-	}
-#endif
+      /* We have to keep this `#if YYDEBUG', since we use variables
+	 which are defined only if `YYDEBUG' is set.  */
+      YYDPRINTF ((stderr, "Next token is "));
+      YYDSYMPRINT ((stderr, yychar1, yylval));
+      YYDPRINTF ((stderr, "\n"));
     }
 
+  /* If the proper action on seeing token YYCHAR1 is to reduce or to
+     detect an error, take that action.  */
   yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yychar1)
     goto yydefault;
-
   yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
+  if (yyn <= 0)
     {
-      if (yyn == YYFLAG)
+      if (yyn == 0 || yyn == YYTABLE_NINF)
 	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
-  else if (yyn == 0)
-    goto yyerrlab;
 
   if (yyn == YYFINAL)
     YYACCEPT;
@@ -1382,9 +1652,7 @@ yybackup:
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
+
 
   /* Count tokens shifted since error; after three, turn off error
      status.  */
@@ -1415,19 +1683,14 @@ yyreduce:
   /* If YYLEN is nonzero, implement the default value of the action:
      `$$ = $1'.
 
-     Otherwise, the following line sets YYVAL to the semantic value of
-     the lookahead token.  This behavior is undocumented and Bison
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
      users should not rely upon it.  Assigning to YYVAL
      unconditionally makes the parser a bit smaller, and it avoids a
      GCC warning that YYVAL may be used uninitialized.  */
   yyval = yyvsp[1-yylen];
 
-#if YYLSP_NEEDED
-  /* Similarly for the default location.  Let the user run additional
-     commands if for instance locations are ranges.  */
-  yyloc = yylsp[1-yylen];
-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
-#endif
+
 
 #if YYDEBUG
   /* We have to keep this `#if YYDEBUG', since we use variables which
@@ -1437,72 +1700,81 @@ yyreduce:
       int yyi;
 
       YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
-		 yyn, yyrline[yyn]);
+		 yyn - 1, yyrline[yyn]);
 
       /* Print the symbols being reduced, and their result.  */
-      for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
+      for (yyi = yyprhs[yyn]; yyrhs[yyi] >= 0; yyi++)
 	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
       YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
     }
 #endif
-
-  switch (yyn) {
-
-case 4:
-#line 308 "ntp_parser.y"
-{ 
+  switch (yyn)
+    {
+        case 5:
+#line 309 "ntp_parser.y"
+    { 
                     fprintf(stderr, "PARSE ERROR!! At Line: %d\n", 
                             ip_file->line_no);
                     fprintf(stderr, "Line Ignored!!\n");
                 }
     break;
-case 17:
-#line 335 "ntp_parser.y"
-{ 
+
+  case 18:
+#line 336 "ntp_parser.y"
+    { 
                         struct peer_node *my_node =  create_peer_node(yyvsp[-2].Integer, yyvsp[-1].Address_node, yyvsp[0].Queue); 
                         if (my_node)
                             enqueue(my_config.peers, my_node);                        
                     }
     break;
-case 18:
-#line 341 "ntp_parser.y"
-{ 
+
+  case 19:
+#line 342 "ntp_parser.y"
+    { 
                         struct peer_node *my_node = create_peer_node(yyvsp[-1].Integer, yyvsp[0].Address_node, NULL); 
                         if (my_node)
                             enqueue(my_config.peers, my_node);                        
                     }
     break;
-case 19:
-#line 349 "ntp_parser.y"
-{ yyval.Integer = T_Server; }
-    break;
-case 20:
+
+  case 20:
 #line 350 "ntp_parser.y"
-{ yyval.Integer = T_Pool; }
+    { yyval.Integer = T_Server; }
     break;
-case 21:
+
+  case 21:
 #line 351 "ntp_parser.y"
-{ yyval.Integer = T_Peer; }
+    { yyval.Integer = T_Pool; }
     break;
-case 22:
+
+  case 22:
 #line 352 "ntp_parser.y"
-{ yyval.Integer = T_Broadcast; }
+    { yyval.Integer = T_Peer; }
     break;
-case 23:
+
+  case 23:
 #line 353 "ntp_parser.y"
-{ yyval.Integer = T_Manycastclient; }
+    { yyval.Integer = T_Broadcast; }
     break;
-case 24:
-#line 357 "ntp_parser.y"
-{ yyval.Address_node = yyvsp[0].Address_node; }
+
+  case 24:
+#line 354 "ntp_parser.y"
+    { yyval.Integer = T_Manycastclient; }
     break;
-case 25:
+
+  case 25:
 #line 358 "ntp_parser.y"
-{ yyval.Address_node = create_address_node(yyvsp[0].String, default_ai_family); }
+    { yyval.Address_node = yyvsp[0].Address_node; }
     break;
-case 26:
-#line 360 "ntp_parser.y"
-{
+
+  case 26:
+#line 359 "ntp_parser.y"
+    { yyval.Address_node = create_address_node(yyvsp[0].String, default_ai_family); }
+    break;
+
+  case 27:
+#line 361 "ntp_parser.y"
+    {
                         if (yyvsp[-1].Integer == -4)
                             yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET);
                         else if (yyvsp[-1].Integer == -6)
@@ -1513,569 +1785,706 @@ case 26:
                         }
                     }
     break;
-case 27:
-#line 375 "ntp_parser.y"
-{ yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET); }
-    break;
-case 28:
+
+  case 28:
 #line 376 "ntp_parser.y"
-{ yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET6); }
+    { yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET); }
     break;
-case 29:
-#line 380 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 29:
+#line 377 "ntp_parser.y"
+    { yyval.Address_node = create_address_node(yyvsp[0].String, AF_INET6); }
     break;
-case 30:
+
+  case 30:
 #line 381 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 31:
-#line 386 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_SKEY | FLAG_AUTHENABLE); }
+
+  case 31:
+#line 382 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 32:
+
+  case 32:
 #line 387 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_BURST); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_SKEY | FLAG_AUTHENABLE); }
     break;
-case 33:
+
+  case 33:
 #line 388 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_IBURST); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_BURST); }
     break;
-case 34:
+
+  case 34:
 #line 389 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Key, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_IBURST); }
     break;
-case 35:
+
+  case 35:
 #line 390 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Minpoll, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Key, yyvsp[0].Integer); }
     break;
-case 36:
+
+  case 36:
 #line 391 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Maxpoll, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Minpoll, yyvsp[0].Integer); }
     break;
-case 37:
+
+  case 37:
 #line 392 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_NOSELECT);}
+    { yyval.Attr_val = create_attr_ival(T_Maxpoll, yyvsp[0].Integer); }
     break;
-case 38:
+
+  case 38:
 #line 393 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREEMPT); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_NOSELECT);}
     break;
-case 39:
+
+  case 39:
 #line 394 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREFER); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREEMPT); }
     break;
-case 40:
+
+  case 40:
 #line 395 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, FLAG_TRUE); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_PREFER); }
     break;
-case 41:
+
+  case 41:
 #line 396 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Ttl, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, FLAG_TRUE); }
     break;
-case 42:
+
+  case 42:
 #line 397 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Mode, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Ttl, yyvsp[0].Integer); }
     break;
-case 43:
+
+  case 43:
 #line 398 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Version, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Mode, yyvsp[0].Integer); }
+    break;
+
+  case 44:
+#line 399 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(T_Version, yyvsp[0].Integer); }
+    break;
+
+  case 45:
+#line 410 "ntp_parser.y"
+    { my_config.broadcastclient = SIMPLE; }
     break;
-case 44:
-#line 409 "ntp_parser.y"
-{ my_config.broadcastclient = SIMPLE; }
-    break;
-case 45:
-#line 411 "ntp_parser.y"
-{ my_config.broadcastclient = NOVOLLEY;  }
-    break;
-case 46:
-#line 413 "ntp_parser.y"
-{ append_queue(my_config.manycastserver, yyvsp[0].Queue);  }
-    break;
-case 47:
-#line 415 "ntp_parser.y"
-{ append_queue(my_config.multicastclient, yyvsp[0].Queue);  }
-    break;
-case 48:
-#line 426 "ntp_parser.y"
-{ my_config.auth.autokey = yyvsp[0].Integer;  }
-    break;
-case 49:
-#line 428 "ntp_parser.y"
-{ my_config.auth.control_key = yyvsp[0].Integer;  }
-    break;
-case 50:
-#line 430 "ntp_parser.y"
-{ if (my_config.auth.crypto_cmd_list != NULL) 
+
+  case 46:
+#line 412 "ntp_parser.y"
+    { my_config.broadcastclient = NOVOLLEY;  }
+    break;
+
+  case 47:
+#line 414 "ntp_parser.y"
+    { append_queue(my_config.manycastserver, yyvsp[0].Queue);  }
+    break;
+
+  case 48:
+#line 416 "ntp_parser.y"
+    { append_queue(my_config.multicastclient, yyvsp[0].Queue);  }
+    break;
+
+  case 49:
+#line 427 "ntp_parser.y"
+    { my_config.auth.autokey = yyvsp[0].Integer;  }
+    break;
+
+  case 50:
+#line 429 "ntp_parser.y"
+    { my_config.auth.control_key = yyvsp[0].Integer;  }
+    break;
+
+  case 51:
+#line 431 "ntp_parser.y"
+    { if (my_config.auth.crypto_cmd_list != NULL) 
 					append_queue(my_config.auth.crypto_cmd_list, yyvsp[0].Queue); 
 		 		else 
 					my_config.auth.crypto_cmd_list = yyvsp[0].Queue;
 			}
     break;
-case 51:
-#line 436 "ntp_parser.y"
-{ my_config.auth.keys = yyvsp[0].String;  }
-    break;
-case 52:
-#line 438 "ntp_parser.y"
-{ my_config.auth.keysdir = yyvsp[0].String;  }
-    break;
-case 53:
-#line 440 "ntp_parser.y"
-{ my_config.auth.requested_key = yyvsp[0].Integer;  }
-    break;
-case 54:
-#line 442 "ntp_parser.y"
-{ my_config.auth.revoke = yyvsp[0].Integer;  }
-    break;
-case 55:
-#line 444 "ntp_parser.y"
-{ my_config.auth.trusted_key_list = yyvsp[0].Queue;  }
-    break;
-case 56:
-#line 448 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 52:
+#line 437 "ntp_parser.y"
+    { my_config.auth.keys = yyvsp[0].String;  }
+    break;
+
+  case 53:
+#line 439 "ntp_parser.y"
+    { my_config.auth.keysdir = yyvsp[0].String;  }
     break;
-case 57:
+
+  case 54:
+#line 441 "ntp_parser.y"
+    { my_config.auth.requested_key = yyvsp[0].Integer;  }
+    break;
+
+  case 55:
+#line 443 "ntp_parser.y"
+    { my_config.auth.revoke = yyvsp[0].Integer;  }
+    break;
+
+  case 56:
+#line 445 "ntp_parser.y"
+    { my_config.auth.trusted_key_list = yyvsp[0].Queue;  }
+    break;
+
+  case 57:
 #line 449 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 58:
-#line 454 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_CERT, yyvsp[0].String); }
+
+  case 58:
+#line 450 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 59:
-#line 456 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_LEAP, yyvsp[0].String); }
+
+  case 59:
+#line 455 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_CERT, yyvsp[0].String); }
     break;
-case 60:
-#line 458 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_RAND, yyvsp[0].String); }
+
+  case 60:
+#line 457 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_LEAP, yyvsp[0].String); }
     break;
-case 61:
-#line 460 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PRIV, yyvsp[0].String); }
+
+  case 61:
+#line 459 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_RAND, yyvsp[0].String); }
     break;
-case 62:
-#line 462 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_SIGN, yyvsp[0].String); }
+
+  case 62:
+#line 461 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PRIV, yyvsp[0].String); }
     break;
-case 63:
-#line 464 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IDENT, yyvsp[0].String); }
+
+  case 63:
+#line 463 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_SIGN, yyvsp[0].String); }
     break;
-case 64:
-#line 466 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IFFPAR, yyvsp[0].String); }
+
+  case 64:
+#line 465 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IDENT, yyvsp[0].String); }
     break;
-case 65:
-#line 468 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_GQPAR, yyvsp[0].String); }
+
+  case 65:
+#line 467 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_IFFPAR, yyvsp[0].String); }
     break;
-case 66:
-#line 470 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_MVPAR, yyvsp[0].String); }
+
+  case 66:
+#line 469 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_GQPAR, yyvsp[0].String); }
     break;
-case 67:
-#line 472 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PW, yyvsp[0].String); }
+
+  case 67:
+#line 471 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_MVPAR, yyvsp[0].String); }
     break;
-case 68:
-#line 482 "ntp_parser.y"
-{ append_queue(my_config.orphan_cmds,yyvsp[0].Queue);  }
+
+  case 68:
+#line 473 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CRYPTO_CONF_PW, yyvsp[0].String); }
     break;
-case 69:
-#line 486 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 69:
+#line 483 "ntp_parser.y"
+    { append_queue(my_config.orphan_cmds,yyvsp[0].Queue);  }
     break;
-case 70:
+
+  case 70:
 #line 487 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 71:
-#line 492 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_CEILING, (double)yyvsp[0].Integer); }
-    break;
-case 72:
-#line 494 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_FLOOR, (double)yyvsp[0].Integer); }
-    break;
-case 73:
-#line 496 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_COHORT, (double)yyvsp[0].Integer); }
-    break;
-case 74:
-#line 498 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_ORPHAN, (double)yyvsp[0].Integer); }
-    break;
-case 75:
-#line 500 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MINDISP, yyvsp[0].Double); }
-    break;
-case 76:
-#line 502 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MAXDIST, yyvsp[0].Double); }
-    break;
-case 77:
-#line 504 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MINCLOCK, yyvsp[0].Double); }
-    break;
-case 78:
-#line 506 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MAXCLOCK, yyvsp[0].Double); }
-    break;
-case 79:
-#line 508 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MINSANE, (double)yyvsp[0].Integer); }
-    break;
-case 80:
-#line 510 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_BEACON, (double)yyvsp[0].Integer); }
-    break;
-case 81:
-#line 512 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(PROTO_MAXHOP, (double)yyvsp[0].Integer); }
-    break;
-case 82:
-#line 522 "ntp_parser.y"
-{ append_queue(my_config.stats_list, yyvsp[0].Queue);  }
-    break;
-case 83:
-#line 524 "ntp_parser.y"
-{ my_config.stats_dir = yyvsp[0].String;  }
+
+  case 71:
+#line 488 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 84:
-#line 526 "ntp_parser.y"
-{
+
+  case 72:
+#line 493 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_CEILING, (double)yyvsp[0].Integer); }
+    break;
+
+  case 73:
+#line 495 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_FLOOR, (double)yyvsp[0].Integer); }
+    break;
+
+  case 74:
+#line 497 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_COHORT, (double)yyvsp[0].Integer); }
+    break;
+
+  case 75:
+#line 499 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_ORPHAN, (double)yyvsp[0].Integer); }
+    break;
+
+  case 76:
+#line 501 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_MINDISP, yyvsp[0].Double); }
+    break;
+
+  case 77:
+#line 503 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_MAXDIST, yyvsp[0].Double); }
+    break;
+
+  case 78:
+#line 505 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_MINCLOCK, yyvsp[0].Double); }
+    break;
+
+  case 79:
+#line 507 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_MAXCLOCK, yyvsp[0].Double); }
+    break;
+
+  case 80:
+#line 509 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_MINSANE, (double)yyvsp[0].Integer); }
+    break;
+
+  case 81:
+#line 511 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_BEACON, (double)yyvsp[0].Integer); }
+    break;
+
+  case 82:
+#line 513 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(PROTO_MAXHOP, (double)yyvsp[0].Integer); }
+    break;
+
+  case 83:
+#line 523 "ntp_parser.y"
+    { append_queue(my_config.stats_list, yyvsp[0].Queue);  }
+    break;
+
+  case 84:
+#line 525 "ntp_parser.y"
+    { my_config.stats_dir = yyvsp[0].String;  }
+    break;
+
+  case 85:
+#line 527 "ntp_parser.y"
+    {
                         enqueue(my_config.filegen_opts, 
                                 create_filegen_node(yyvsp[-1].VoidPtr, yyvsp[0].Queue));                         
                     }
     break;
-case 85:
-#line 533 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
-    break;
-case 86:
+
+  case 86:
 #line 534 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].VoidPtr); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
     break;
-case 87:
-#line 539 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("clockstats"); }
+
+  case 87:
+#line 535 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].VoidPtr); }
     break;
-case 88:
-#line 541 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("cryptostats"); }
+
+  case 88:
+#line 540 "ntp_parser.y"
+    { yyval.VoidPtr = create_pval("clockstats"); }
     break;
-case 89:
-#line 543 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("loopstats"); }
+
+  case 89:
+#line 542 "ntp_parser.y"
+    { yyval.VoidPtr = create_pval("cryptostats"); }
     break;
-case 90:
-#line 545 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("peerstats"); }
+
+  case 90:
+#line 544 "ntp_parser.y"
+    { yyval.VoidPtr = create_pval("loopstats"); }
     break;
-case 91:
-#line 547 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("rawstats"); }
+
+  case 91:
+#line 546 "ntp_parser.y"
+    { yyval.VoidPtr = create_pval("peerstats"); }
     break;
-case 92:
-#line 549 "ntp_parser.y"
-{ yyval.VoidPtr = create_pval("sysstats"); }
+
+  case 92:
+#line 548 "ntp_parser.y"
+    { yyval.VoidPtr = create_pval("rawstats"); }
     break;
-case 93:
-#line 553 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 93:
+#line 550 "ntp_parser.y"
+    { yyval.VoidPtr = create_pval("sysstats"); }
     break;
-case 94:
+
+  case 94:
 #line 554 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 95:
-#line 558 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(T_File, yyvsp[0].String); }
+
+  case 95:
+#line 555 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 96:
+
+  case 96:
 #line 559 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Type, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_sval(T_File, yyvsp[0].String); }
     break;
-case 97:
+
+  case 97:
 #line 560 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, T_Link); }
+    { yyval.Attr_val = create_attr_ival(T_Type, yyvsp[0].Integer); }
     break;
-case 98:
+
+  case 98:
 #line 561 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, T_Nolink); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, T_Link); }
     break;
-case 99:
+
+  case 99:
 #line 562 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, T_Enable); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, T_Nolink); }
     break;
-case 100:
+
+  case 100:
 #line 563 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, T_Disable); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, T_Enable); }
     break;
-case 101:
-#line 567 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_NONE; }
+
+  case 101:
+#line 564 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(T_Flag, T_Disable); }
     break;
-case 102:
+
+  case 102:
 #line 568 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_PID; }
+    { yyval.Integer = FILEGEN_NONE; }
     break;
-case 103:
+
+  case 103:
 #line 569 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_DAY; }
+    { yyval.Integer = FILEGEN_PID; }
     break;
-case 104:
+
+  case 104:
 #line 570 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_WEEK; }
+    { yyval.Integer = FILEGEN_DAY; }
     break;
-case 105:
+
+  case 105:
 #line 571 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_MONTH; }
+    { yyval.Integer = FILEGEN_WEEK; }
     break;
-case 106:
+
+  case 106:
 #line 572 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_YEAR; }
+    { yyval.Integer = FILEGEN_MONTH; }
     break;
-case 107:
+
+  case 107:
 #line 573 "ntp_parser.y"
-{ yyval.Integer = FILEGEN_AGE; }
+    { yyval.Integer = FILEGEN_YEAR; }
     break;
-case 108:
-#line 583 "ntp_parser.y"
-{   append_queue(my_config.discard_opts, yyvsp[0].Queue); }
-    break;
-case 109:
-#line 585 "ntp_parser.y"
-{ 
+
+  case 108:
+#line 574 "ntp_parser.y"
+    { yyval.Integer = FILEGEN_AGE; }
+    break;
+
+  case 109:
+#line 584 "ntp_parser.y"
+    {   append_queue(my_config.discard_opts, yyvsp[0].Queue); }
+    break;
+
+  case 110:
+#line 586 "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 590 "ntp_parser.y"
-{ 
+
+  case 111:
+#line 591 "ntp_parser.y"
+    { 
                         enqueue(my_config.restrict_opts, 
                                 create_restrict_node(NULL, NULL, yyvsp[0].Queue, ip_file->line_no)); 
                     }
     break;
-case 111:
-#line 595 "ntp_parser.y"
-{ 
+
+  case 112:
+#line 596 "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 602 "ntp_parser.y"
-{ yyval.Queue = create_queue(); }
-    break;
-case 113:
+
+  case 113:
 #line 603 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
+    { yyval.Queue = create_queue(); }
     break;
-case 114:
-#line 607 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_IGNORE); }
+
+  case 114:
+#line 604 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].VoidPtr); }
     break;
-case 115:
+
+  case 115:
 #line 608 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_DEMOBILIZE); }
+    { yyval.VoidPtr = create_ival(RES_IGNORE); }
     break;
-case 116:
+
+  case 116:
 #line 609 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_LIMITED); }
+    { yyval.VoidPtr = create_ival(RES_DEMOBILIZE); }
     break;
-case 117:
+
+  case 117:
 #line 610 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_LPTRAP); }
+    { yyval.VoidPtr = create_ival(RES_LIMITED); }
     break;
-case 118:
+
+  case 118:
 #line 611 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_NOMODIFY); }
+    { yyval.VoidPtr = create_ival(RES_LPTRAP); }
     break;
-case 119:
+
+  case 119:
 #line 612 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_NOPEER); }
+    { yyval.VoidPtr = create_ival(RES_NOMODIFY); }
     break;
-case 120:
+
+  case 120:
 #line 613 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_NOQUERY); }
+    { yyval.VoidPtr = create_ival(RES_NOPEER); }
     break;
-case 121:
+
+  case 121:
 #line 614 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_DONTSERVE); }
+    { yyval.VoidPtr = create_ival(RES_NOQUERY); }
     break;
-case 122:
+
+  case 122:
 #line 615 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_NOTRAP); }
+    { yyval.VoidPtr = create_ival(RES_DONTSERVE); }
     break;
-case 123:
+
+  case 123:
 #line 616 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_DONTTRUST); }
+    { yyval.VoidPtr = create_ival(RES_NOTRAP); }
     break;
-case 124:
+
+  case 124:
 #line 617 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RESM_NTPONLY); }
+    { yyval.VoidPtr = create_ival(RES_DONTTRUST); }
     break;
-case 125:
+
+  case 125:
 #line 618 "ntp_parser.y"
-{ yyval.VoidPtr = create_ival(RES_VERSION); }
+    { yyval.VoidPtr = create_ival(RESM_NTPONLY); }
     break;
-case 126:
-#line 622 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 126:
+#line 619 "ntp_parser.y"
+    { yyval.VoidPtr = create_ival(RES_VERSION); }
     break;
-case 127:
+
+  case 127:
 #line 623 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 128:
-#line 627 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Average, yyvsp[0].Integer); }
+
+  case 128:
+#line 624 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 129:
+
+  case 129:
 #line 628 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Minimum, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Average, yyvsp[0].Integer); }
     break;
-case 130:
+
+  case 130:
 #line 629 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Monitor, yyvsp[0].Integer); }
+    { yyval.Attr_val = create_attr_ival(T_Minimum, yyvsp[0].Integer); }
     break;
-case 131:
-#line 638 "ntp_parser.y"
-{ enqueue(my_config.fudge, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
+
+  case 131:
+#line 630 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(T_Monitor, yyvsp[0].Integer); }
     break;
-case 132:
-#line 642 "ntp_parser.y"
-{ enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 132:
+#line 639 "ntp_parser.y"
+    { enqueue(my_config.fudge, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
     break;
-case 133:
+
+  case 133:
 #line 643 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 134:
-#line 648 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(CLK_HAVETIME1, yyvsp[0].Double); }
+
+  case 134:
+#line 644 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 135:
-#line 650 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(CLK_HAVETIME2, yyvsp[0].Double); }
+
+  case 135:
+#line 649 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(CLK_HAVETIME1, yyvsp[0].Double); }
     break;
-case 136:
-#line 652 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEVAL1,  yyvsp[0].Integer); }
+
+  case 136:
+#line 651 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(CLK_HAVETIME2, yyvsp[0].Double); }
     break;
-case 137:
-#line 654 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(CLK_HAVEVAL2,  yyvsp[0].String); }
+
+  case 137:
+#line 653 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(CLK_HAVEVAL1,  yyvsp[0].Integer); }
     break;
-case 138:
-#line 656 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG1, yyvsp[0].Integer); }
+
+  case 138:
+#line 655 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_sval(CLK_HAVEVAL2,  yyvsp[0].String); }
     break;
-case 139:
-#line 658 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG2, yyvsp[0].Integer); }
+
+  case 139:
+#line 657 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG1, yyvsp[0].Integer); }
     break;
-case 140:
-#line 660 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG3, yyvsp[0].Integer); }
+
+  case 140:
+#line 659 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG2, yyvsp[0].Integer); }
     break;
-case 141:
-#line 662 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG4, yyvsp[0].Integer); }
+
+  case 141:
+#line 661 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG3, yyvsp[0].Integer); }
     break;
-case 142:
-#line 671 "ntp_parser.y"
-{ append_queue(my_config.enable_opts,yyvsp[0].Queue);  }
+
+  case 142:
+#line 663 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(CLK_HAVEFLAG4, yyvsp[0].Integer); }
     break;
-case 143:
-#line 673 "ntp_parser.y"
-{ append_queue(my_config.disable_opts,yyvsp[0].Queue);  }
+
+  case 143:
+#line 672 "ntp_parser.y"
+    { append_queue(my_config.enable_opts,yyvsp[0].Queue);  }
     break;
-case 144:
-#line 677 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 144:
+#line 674 "ntp_parser.y"
+    { append_queue(my_config.disable_opts,yyvsp[0].Queue);  }
     break;
-case 145:
+
+  case 145:
 #line 678 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 146:
-#line 682 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); }
+
+  case 146:
+#line 679 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 147:
+
+  case 147:
 #line 683 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_BROADCLIENT); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_AUTHENTICATE); }
     break;
-case 148:
+
+  case 148:
 #line 684 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_CAL); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_BROADCLIENT); }
     break;
-case 149:
+
+  case 149:
 #line 685 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_KERNEL); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_CAL); }
     break;
-case 150:
+
+  case 150:
 #line 686 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_MONITOR); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_KERNEL); }
     break;
-case 151:
+
+  case 151:
 #line 687 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_NTP); }
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_MONITOR); }
     break;
-case 152:
-#line 689 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Flag, PROTO_FILEGEN); }
+
+  case 152:
+#line 688 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_NTP); }
     break;
-case 153:
-#line 697 "ntp_parser.y"
-{ append_queue(my_config.tinker, yyvsp[0].Queue);  }
+
+  case 153:
+#line 690 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_ival(T_Flag, PROTO_FILEGEN); }
     break;
-case 154:
-#line 701 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 154:
+#line 698 "ntp_parser.y"
+    { append_queue(my_config.tinker, yyvsp[0].Queue);  }
     break;
-case 155:
+
+  case 155:
 #line 702 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 156:
-#line 706 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_ALLAN, yyvsp[0].Double); }
+
+  case 156:
+#line 703 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 157:
+
+  case 157:
 #line 707 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_PHI, yyvsp[0].Double); }
+    { yyval.Attr_val = create_attr_dval(LOOP_ALLAN, yyvsp[0].Double); }
     break;
-case 158:
+
+  case 158:
 #line 708 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_FREQ, yyvsp[0].Double); }
+    { yyval.Attr_val = create_attr_dval(LOOP_PHI, yyvsp[0].Double); }
     break;
-case 159:
+
+  case 159:
 #line 709 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_HUFFPUFF, yyvsp[0].Double); }
+    { yyval.Attr_val = create_attr_dval(LOOP_FREQ, yyvsp[0].Double); }
     break;
-case 160:
+
+  case 160:
 #line 710 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_PANIC, yyvsp[0].Double); }
+    { yyval.Attr_val = create_attr_dval(LOOP_HUFFPUFF, yyvsp[0].Double); }
     break;
-case 161:
+
+  case 161:
 #line 711 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_MAX, yyvsp[0].Double); }
+    { yyval.Attr_val = create_attr_dval(LOOP_PANIC, yyvsp[0].Double); }
     break;
-case 162:
+
+  case 162:
 #line 712 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(LOOP_MINSTEP, yyvsp[0].Double); }
+    { yyval.Attr_val = create_attr_dval(LOOP_MAX, yyvsp[0].Double); }
     break;
-case 163:
-#line 721 "ntp_parser.y"
-{
+
+  case 163:
+#line 713 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(LOOP_MINSTEP, yyvsp[0].Double); }
+    break;
+
+  case 164:
+#line 722 "ntp_parser.y"
+    {
                     if (curr_include_level >= MAXINCLUDELEVEL) {
                         fprintf(stderr, "getconfig: Maximum include file level exceeded.\n");
                         msyslog(LOG_INFO, "getconfig: Maximum include file level exceeded.");
@@ -2091,100 +2500,133 @@ case 163:
                     }
                 }
     break;
-case 164:
-#line 737 "ntp_parser.y"
-{
+
+  case 165:
+#line 738 "ntp_parser.y"
+    {
                     while (curr_include_level != -1) 
                         FCLOSE(fp[curr_include_level--]);
                 }
     break;
-case 165:
-#line 743 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_dval(T_Broadcastdelay, yyvsp[0].Double));  }
-    break;
-case 166:
-#line 745 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_ival(T_Calldelay, yyvsp[0].Integer));  }
-    break;
-case 167:
-#line 747 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_dval(T_Tick, yyvsp[0].Double));  }
-    break;
-case 168:
-#line 749 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_sval(T_Driftfile, yyvsp[0].String));  }
-    break;
-case 169:
-#line 751 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_sval(T_Pidfile, yyvsp[0].String));  }
+
+  case 166:
+#line 744 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_dval(T_Broadcastdelay, yyvsp[0].Double));  }
+    break;
+
+  case 167:
+#line 746 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_ival(T_Calldelay, yyvsp[0].Integer));  }
     break;
-case 170:
+
+  case 168:
+#line 748 "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)); }
+    break;
+
+  case 170:
 #line 753 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_sval(T_Logfile, yyvsp[0].String));  }
+    { enqueue(my_config.vars, create_attr_sval(T_Pidfile, yyvsp[0].String));  }
     break;
-case 171:
+
+  case 171:
 #line 755 "ntp_parser.y"
-{ enqueue(my_config.vars, create_attr_ival(T_Automax, yyvsp[0].Integer));  }
+    { enqueue(my_config.vars, create_attr_sval(T_Logfile, yyvsp[0].String));  }
     break;
-case 172:
-#line 758 "ntp_parser.y"
-{ append_queue(my_config.logconfig, yyvsp[0].Queue);  }
+
+  case 172:
+#line 757 "ntp_parser.y"
+    { enqueue(my_config.vars, create_attr_ival(T_Automax, yyvsp[0].Integer));  }
     break;
-case 173:
+
+  case 173:
 #line 760 "ntp_parser.y"
-{ append_queue(my_config.phone, yyvsp[0].Queue);  }
+    { append_queue(my_config.logconfig, yyvsp[0].Queue);  }
     break;
-case 174:
+
+  case 174:
 #line 762 "ntp_parser.y"
-{ enqueue(my_config.setvar, yyvsp[0].Set_var);  }
+    { append_queue(my_config.phone, yyvsp[0].Queue);  }
     break;
-case 175:
+
+  case 175:
 #line 764 "ntp_parser.y"
-{ enqueue(my_config.trap, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
+    { enqueue(my_config.setvar, yyvsp[0].Set_var);  }
     break;
-case 176:
+
+  case 176:
 #line 766 "ntp_parser.y"
-{ append_queue(my_config.ttl, yyvsp[0].Queue); }
+    { enqueue(my_config.trap, create_addr_opts_node(yyvsp[-1].Address_node, yyvsp[0].Queue));  }
     break;
-case 177:
+
+  case 177:
+#line 768 "ntp_parser.y"
+    { append_queue(my_config.ttl, yyvsp[0].Queue); }
+    break;
+
+  case 178:
 #line 771 "ntp_parser.y"
-{ yyval.Set_var = create_setvar_node(yyvsp[-3].String, yyvsp[-1].String, DEF); }
+    { /* Null command */ }
     break;
-case 178:
+
+  case 179:
 #line 773 "ntp_parser.y"
-{ yyval.Set_var = create_setvar_node(yyvsp[-2].String, yyvsp[0].String, 0); }
+    { enqueue(my_config.vars, create_attr_ival(T_DriftMinutes, yyvsp[0].Integer)); }
     break;
-case 179:
+
+  case 180:
 #line 778 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
-    break;
-case 180:
-#line 779 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Set_var = create_setvar_node(yyvsp[-3].String, yyvsp[-1].String, DEF); }
     break;
-case 181:
-#line 783 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_ival(T_Port, yyvsp[0].Integer); }
+
+  case 181:
+#line 780 "ntp_parser.y"
+    { yyval.Set_var = create_setvar_node(yyvsp[-2].String, yyvsp[0].String, 0); }
     break;
-case 182:
-#line 784 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_pval(T_Interface, yyvsp[0].Address_node); }
+
+  case 182:
+#line 785 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
     break;
-case 183:
-#line 789 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+
+  case 183:
+#line 786 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
     break;
-case 184:
+
+  case 184:
 #line 790 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Attr_val); }
+    { yyval.Attr_val = create_attr_ival(T_Port, yyvsp[0].Integer); }
     break;
-case 185:
-#line 794 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_sval(yyvsp[-1].Integer, yyvsp[0].String); }
+
+  case 185:
+#line 791 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_pval(T_Interface, yyvsp[0].Address_node); }
     break;
-case 186:
+
+  case 186:
 #line 796 "ntp_parser.y"
-{ 
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Attr_val); }
+    break;
+
+  case 187:
+#line 797 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_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); }
+    break;
+
+  case 189:
+#line 803 "ntp_parser.y"
+    { 
                     /* YUCK!! This is needed because '+' and '-' are not special characters 
                      * while '=' is. 
                      * We really need a better way of defining strings
@@ -2198,45 +2640,55 @@ case 186:
                         yyval.Attr_val = create_attr_sval(prefix, type);
                 }
     break;
-case 187:
-#line 812 "ntp_parser.y"
-{ yyval.Integer = '+'; }
-    break;
-case 188:
-#line 813 "ntp_parser.y"
-{ yyval.Integer = '-'; }
-    break;
-case 189:
-#line 814 "ntp_parser.y"
-{ yyval.Integer = '='; }
-    break;
-case 190:
-#line 823 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, create_ival(yyvsp[0].Integer)); }
-    break;
-case 191:
-#line 824 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(create_ival(yyvsp[0].Integer)); }
-    break;
-case 192:
-#line 828 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, create_pval(yyvsp[0].String)); }
-    break;
-case 193:
-#line 829 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(create_pval(yyvsp[0].String)); }
-    break;
-case 194:
-#line 833 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Address_node); }
-    break;
-case 195:
-#line 834 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Address_node); }
-    break;
-case 196:
-#line 839 "ntp_parser.y"
-{ 
+
+  case 190:
+#line 819 "ntp_parser.y"
+    { yyval.Integer = '+'; }
+    break;
+
+  case 191:
+#line 820 "ntp_parser.y"
+    { yyval.Integer = '-'; }
+    break;
+
+  case 192:
+#line 821 "ntp_parser.y"
+    { yyval.Integer = '='; }
+    break;
+
+  case 193:
+#line 830 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, create_ival(yyvsp[0].Integer)); }
+    break;
+
+  case 194:
+#line 831 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(create_ival(yyvsp[0].Integer)); }
+    break;
+
+  case 195:
+#line 835 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, create_pval(yyvsp[0].String)); }
+    break;
+
+  case 196:
+#line 836 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(create_pval(yyvsp[0].String)); }
+    break;
+
+  case 197:
+#line 840 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Address_node); }
+    break;
+
+  case 198:
+#line 841 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Address_node); }
+    break;
+
+  case 199:
+#line 846 "ntp_parser.y"
+    { 
                     if (yyvsp[0].Integer != 0 && yyvsp[0].Integer != 1) {
                         yyerror("Integer value is not boolean (0 or 1). Assuming 1");
                         yyval.Integer = 1;
@@ -2245,129 +2697,156 @@ case 196:
                         yyval.Integer = yyvsp[0].Integer; 
                 }
     break;
-case 197:
-#line 847 "ntp_parser.y"
-{ yyval.Integer = 1; }
-    break;
-case 198:
-#line 848 "ntp_parser.y"
-{ yyval.Integer = 0; }
-    break;
-case 199:
-#line 852 "ntp_parser.y"
-{ yyval.Double = (double)yyvsp[0].Integer; }
-    break;
-case 200:
-#line 853 "ntp_parser.y"
-{ yyval.Double = yyvsp[0].Double; }
+
+  case 200:
+#line 854 "ntp_parser.y"
+    { yyval.Integer = 1; }
     break;
-case 201:
-#line 862 "ntp_parser.y"
-{
+
+  case 201:
+#line 855 "ntp_parser.y"
+    { yyval.Integer = 0; }
+    break;
+
+  case 202:
+#line 859 "ntp_parser.y"
+    { yyval.Double = (double)yyvsp[0].Integer; }
+    break;
+
+  case 203:
+#line 860 "ntp_parser.y"
+    { yyval.Double = yyvsp[0].Double; }
+    break;
+
+  case 204:
+#line 869 "ntp_parser.y"
+    {
                  my_config.sim_details = create_sim_node(yyvsp[-2].Queue, yyvsp[-1].Queue);
 
                  /* Reset the old_config_style variable */
                  old_config_style = 1;
              }
     break;
-case 202:
-#line 876 "ntp_parser.y"
-{ old_config_style = 0; }
-    break;
-case 203:
-#line 880 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
-    break;
-case 204:
-#line 881 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
-    break;
-case 205:
-#line 885 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Beep_Delay, yyvsp[0].Double); }
-    break;
-case 206:
-#line 886 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Sim_Duration, yyvsp[0].Double); }
-    break;
-case 207:
-#line 890 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_server); }
-    break;
-case 208:
-#line 891 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_server); }
-    break;
-case 209:
-#line 896 "ntp_parser.y"
-{ yyval.Sim_server = create_sim_server(yyvsp[-4].Address_node, yyvsp[-2].Double, yyvsp[-1].Queue); }
-    break;
-case 210:
-#line 900 "ntp_parser.y"
-{ yyval.Double = yyvsp[-1].Double; }
-    break;
-case 211:
-#line 904 "ntp_parser.y"
-{ yyval.Address_node = yyvsp[0].Address_node; }
-    break;
-case 212:
-#line 908 "ntp_parser.y"
-{ yyval.Address_node = yyvsp[0].Address_node; }
-    break;
-case 213:
-#line 909 "ntp_parser.y"
-{ yyval.Address_node = create_address_node(yyvsp[0].String, T_String); }
-    break;
-case 214:
-#line 913 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_script); }
-    break;
-case 215:
-#line 914 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_script); }
-    break;
-case 216:
-#line 919 "ntp_parser.y"
-{ yyval.Sim_script = create_sim_script_info(yyvsp[-3].Double, yyvsp[-1].Queue); }
-    break;
-case 217:
-#line 923 "ntp_parser.y"
-{ yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
-    break;
-case 218:
-#line 924 "ntp_parser.y"
-{ yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
-    break;
-case 219:
-#line 929 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Freq_Offset, yyvsp[0].Double); }
+
+  case 205:
+#line 883 "ntp_parser.y"
+    { old_config_style = 0; }
+    break;
+
+  case 206:
+#line 887 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
+    break;
+
+  case 207:
+#line 888 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
     break;
-case 220:
+
+  case 208:
+#line 892 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Beep_Delay, yyvsp[0].Double); }
+    break;
+
+  case 209:
+#line 893 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Sim_Duration, yyvsp[0].Double); }
+    break;
+
+  case 210:
+#line 897 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_server); }
+    break;
+
+  case 211:
+#line 898 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_server); }
+    break;
+
+  case 212:
+#line 903 "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"
+    { yyval.Double = yyvsp[-1].Double; }
+    break;
+
+  case 214:
+#line 911 "ntp_parser.y"
+    { yyval.Address_node = yyvsp[0].Address_node; }
+    break;
+
+  case 215:
+#line 915 "ntp_parser.y"
+    { yyval.Address_node = yyvsp[0].Address_node; }
+    break;
+
+  case 216:
+#line 916 "ntp_parser.y"
+    { yyval.Address_node = create_address_node(yyvsp[0].String, T_String); }
+    break;
+
+  case 217:
+#line 920 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-1].Queue, yyvsp[0].Sim_script); }
+    break;
+
+  case 218:
+#line 921 "ntp_parser.y"
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[0].Sim_script); }
+    break;
+
+  case 219:
+#line 926 "ntp_parser.y"
+    { yyval.Sim_script = create_sim_script_info(yyvsp[-3].Double, yyvsp[-1].Queue); }
+    break;
+
+  case 220:
+#line 930 "ntp_parser.y"
+    { yyval.Queue = enqueue(yyvsp[-2].Queue, yyvsp[-1].Attr_val); }
+    break;
+
+  case 221:
 #line 931 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Wander, yyvsp[0].Double); }
+    { yyval.Queue = enqueue_in_new_queue(yyvsp[-1].Attr_val); }
     break;
-case 221:
-#line 933 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Jitter, yyvsp[0].Double); }
-    break;
-case 222:
-#line 935 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Prop_Delay, yyvsp[0].Double); }
-    break;
-case 223:
-#line 937 "ntp_parser.y"
-{ yyval.Attr_val = create_attr_dval(T_Proc_Delay, yyvsp[0].Double); }
+
+  case 222:
+#line 936 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Freq_Offset, yyvsp[0].Double); }
+    break;
+
+  case 223:
+#line 938 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Wander, yyvsp[0].Double); }
+    break;
+
+  case 224:
+#line 940 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Jitter, yyvsp[0].Double); }
     break;
-}
 
-#line 705 "/usr/local/gnu/share/bison/bison.simple"
+  case 225:
+#line 942 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Prop_Delay, yyvsp[0].Double); }
+    break;
+
+  case 226:
+#line 944 "ntp_parser.y"
+    { yyval.Attr_val = create_attr_dval(T_Proc_Delay, yyvsp[0].Double); }
+    break;
+
+
+    }
 
+/* Line 1016 of /usr/local/share/bison/yacc.c.  */
+#line 2846 "ntp_parser.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
-#if YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
+
 
 #if YYDEBUG
   if (yydebug)
@@ -2381,9 +2860,7 @@ case 223:
 #endif
 
   *++yyvsp = yyval;
-#if YYLSP_NEEDED
-  *++yylsp = yyloc;
-#endif
+
 
   /* Now `shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
@@ -2391,11 +2868,11 @@ case 223:
 
   yyn = yyr1[yyn];
 
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
     yystate = yytable[yystate];
   else
-    yystate = yydefgoto[yyn - YYNTBASE];
+    yystate = yydefgoto[yyn - YYNTOKENS];
 
   goto yynewstate;
 
@@ -2408,13 +2885,13 @@ yyerrlab:
   if (!yyerrstatus)
     {
       ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
+#if YYERROR_VERBOSE
       yyn = yypact[yystate];
 
-      if (yyn > YYFLAG && yyn < YYLAST)
+      if (YYPACT_NINF < yyn && yyn < YYLAST)
 	{
 	  YYSIZE_T yysize = 0;
+	  int yytype = YYTRANSLATE (yychar);
 	  char *yymsg;
 	  int yyx, yycount;
 
@@ -2423,15 +2900,15 @@ yyerrlab:
 	     YYCHECK.  */
 	  for (yyx = yyn < 0 ? -yyn : 0;
 	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
-	    if (yycheck[yyx + yyn] == yyx)
+	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
 	  yysize += yystrlen ("parse error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
+	  yysize += yystrlen (yytname[yytype]);
 	  yymsg = (char *) YYSTACK_ALLOC (yysize);
 	  if (yymsg != 0)
 	    {
 	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
+	      yyp = yystpcpy (yyp, yytname[yytype]);
 
 	      if (yycount < 5)
 		{
@@ -2439,7 +2916,7 @@ yyerrlab:
 		  for (yyx = yyn < 0 ? -yyn : 0;
 		       yyx < (int) (sizeof (yytname) / sizeof (char *));
 		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx)
+		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
 		      {
 			const char *yyq = ! yycount ? ", expecting " : " or ";
 			yyp = yystpcpy (yyp, yyq);
@@ -2454,99 +2931,90 @@ yyerrlab:
 	    yyerror ("parse error; also virtual memory exhausted");
 	}
       else
-#endif /* defined (YYERROR_VERBOSE) */
+#endif /* YYERROR_VERBOSE */
 	yyerror ("parse error");
     }
   goto yyerrlab1;
 
 
-/*--------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action |
-`--------------------------------------------------*/
+/*----------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action.  |
+`----------------------------------------------------*/
 yyerrlab1:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
 	 error, discard it.  */
 
-      /* return failure if at end of input */
+      /* Return failure if at end of input.  */
       if (yychar == YYEOF)
-	YYABORT;
+        {
+	  /* Pop the error token.  */
+          YYPOPSTACK;
+	  /* Pop the rest of the stack.  */
+	  while (yyssp > yyss)
+	    {
+	      YYDPRINTF ((stderr, "Error: popping "));
+	      YYDSYMPRINT ((stderr,
+			    yystos[*yyssp],
+			    *yyvsp));
+	      YYDPRINTF ((stderr, "\n"));
+	      yydestruct (yystos[*yyssp], *yyvsp);
+	      YYPOPSTACK;
+	    }
+	  YYABORT;
+        }
+
       YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
 		  yychar, yytname[yychar1]));
+      yydestruct (yychar1, yylval);
       yychar = YYEMPTY;
     }
 
   /* Else will try to reuse lookahead token after shifting the error
      token.  */
 
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
+  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+	{
+	  yyn += YYTERROR;
+	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+	    {
+	      yyn = yytable[yyn];
+	      if (0 < yyn)
+		break;
+	    }
+	}
 
-/*-------------------------------------------------------------------.
-| yyerrdefault -- current state does not do anything special for the |
-| error token.                                                       |
-`-------------------------------------------------------------------*/
-yyerrdefault:
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-
-  /* If its default is to accept any token, ok.  Otherwise pop it.  */
-  yyn = yydefact[yystate];
-  if (yyn)
-    goto yydefault;
-#endif
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+	YYABORT;
 
+      YYDPRINTF ((stderr, "Error: popping "));
+      YYDSYMPRINT ((stderr,
+		    yystos[*yyssp], *yyvsp));
+      YYDPRINTF ((stderr, "\n"));
+
+      yydestruct (yystos[yystate], *yyvsp);
+      yyvsp--;
+      yystate = *--yyssp;
 
-/*---------------------------------------------------------------.
-| yyerrpop -- pop the current state because it cannot handle the |
-| error token                                                    |
-`---------------------------------------------------------------*/
-yyerrpop:
-  if (yyssp == yyss)
-    YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#if YYLSP_NEEDED
-  yylsp--;
-#endif
 
 #if YYDEBUG
-  if (yydebug)
-    {
-      short *yyssp1 = yyss - 1;
-      YYFPRINTF (stderr, "Error: state stack now");
-      while (yyssp1 != yyssp)
-	YYFPRINTF (stderr, " %d", *++yyssp1);
-      YYFPRINTF (stderr, "\n");
-    }
+      if (yydebug)
+	{
+	  short *yyssp1 = yyss - 1;
+	  YYFPRINTF (stderr, "Error: state stack now");
+	  while (yyssp1 != yyssp)
+	    YYFPRINTF (stderr, " %d", *++yyssp1);
+	  YYFPRINTF (stderr, "\n");
+	}
 #endif
-
-/*--------------.
-| yyerrhandle.  |
-`--------------*/
-yyerrhandle:
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
     }
-  else if (yyn == 0)
-    goto yyerrpop;
 
   if (yyn == YYFINAL)
     YYACCEPT;
@@ -2554,9 +3022,7 @@ yyerrhandle:
   YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
-#if YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
+
 
   yystate = yyn;
   goto yynewstate;
@@ -2576,13 +3042,15 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-/*---------------------------------------------.
-| yyoverflowab -- parser overflow comes here.  |
-`---------------------------------------------*/
+#ifndef yyoverflow
+/*----------------------------------------------.
+| yyoverflowlab -- parser overflow comes here.  |
+`----------------------------------------------*/
 yyoverflowlab:
   yyerror ("parser stack overflow");
   yyresult = 2;
   /* Fall through.  */
+#endif
 
 yyreturn:
 #ifndef yyoverflow
@@ -2591,7 +3059,9 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 941 "ntp_parser.y"
+
+
+#line 948 "ntp_parser.y"
 
 
 /* KEYWORDS
@@ -2632,4 +3102,5 @@ int main(int argc, char *argv[])
     return 0;
 }
 */
+
 

==== ntpd/ntp_parser.h ====
2007-06-07 10:45:39-04:00, neal at pogo.udel.edu +345 -154
  [Bug 850] driftfile parsing changes.

--- 1.2/ntpd/ntp_parser.h	2007-04-23 12:33:45 -04:00
+++ 1.3/ntpd/ntp_parser.h	2007-06-07 10:45:39 -04:00
@@ -1,7 +1,345 @@
-#ifndef BISON_______NTPD_NTP_PARSER_H
-# define BISON_______NTPD_NTP_PARSER_H
+/* A Bison parser, made from /ntpdev/ntpd/ntp_parser.y, by GNU bison 1.75.  */
+
+/* Skeleton parser for Yacc-like parsing with Bison,
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* As a special exception, when this file is copied by Bison into a
+   Bison output file, you may use that output file without restriction.
+   This special exception was added by the Free Software Foundation
+   in version 1.24 of Bison.  */
+
+#ifndef BISON_NTP_PARSER_H
+# define BISON_NTP_PARSER_H
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     T_Age = 258,
+     T_Allan = 259,
+     T_Auth = 260,
+     T_Autokey = 261,
+     T_Automax = 262,
+     T_Average = 263,
+     T_Bclient = 264,
+     T_Beacon = 265,
+     T_Broadcast = 266,
+     T_Broadcastclient = 267,
+     T_Broadcastdelay = 268,
+     T_Burst = 269,
+     T_Calibrate = 270,
+     T_Calldelay = 271,
+     T_Ceiling = 272,
+     T_Cert = 273,
+     T_Clockstats = 274,
+     T_Cohort = 275,
+     T_ControlKey = 276,
+     T_Crypto = 277,
+     T_Cryptostats = 278,
+     T_Day = 279,
+     T_Default = 280,
+     T_Disable = 281,
+     T_Discard = 282,
+     T_Dispersion = 283,
+     T_Double = 284,
+     T_Driftfile = 285,
+     T_DriftMinutes = 286,
+     T_Enable = 287,
+     T_End = 288,
+     T_False = 289,
+     T_File = 290,
+     T_Filegen = 291,
+     T_Flag1 = 292,
+     T_Flag2 = 293,
+     T_Flag3 = 294,
+     T_Flag4 = 295,
+     T_Floor = 296,
+     T_Freq = 297,
+     T_Fudge = 298,
+     T_Gqpar = 299,
+     T_Host = 300,
+     T_Huffpuff = 301,
+     T_IPv4_address = 302,
+     T_IPv6_address = 303,
+     T_Iburst = 304,
+     T_Ident = 305,
+     T_Iffpar = 306,
+     T_Ignore = 307,
+     T_Includefile = 308,
+     T_Integer = 309,
+     T_Interface = 310,
+     T_Kernel = 311,
+     T_Key = 312,
+     T_Keys = 313,
+     T_Keysdir = 314,
+     T_Kod = 315,
+     T_Leap = 316,
+     T_Limited = 317,
+     T_Link = 318,
+     T_Logconfig = 319,
+     T_Logfile = 320,
+     T_Loopstats = 321,
+     T_Lowpriotrap = 322,
+     T_Manycastclient = 323,
+     T_Manycastserver = 324,
+     T_Mask = 325,
+     T_Maxclock = 326,
+     T_Maxdist = 327,
+     T_Maxhop = 328,
+     T_Maxpoll = 329,
+     T_Minclock = 330,
+     T_Mindist = 331,
+     T_Minimum = 332,
+     T_Minpoll = 333,
+     T_Minsane = 334,
+     T_Mode = 335,
+     T_Monitor = 336,
+     T_Month = 337,
+     T_Multicastclient = 338,
+     T_Mvpar = 339,
+     T_Nolink = 340,
+     T_Nomodify = 341,
+     T_None = 342,
+     T_Nopeer = 343,
+     T_Noquery = 344,
+     T_Noselect = 345,
+     T_Noserve = 346,
+     T_Notrap = 347,
+     T_Notrust = 348,
+     T_Novolley = 349,
+     T_Ntp = 350,
+     T_Ntpport = 351,
+     T_Orphan = 352,
+     T_Panic = 353,
+     T_Peer = 354,
+     T_Peerstats = 355,
+     T_Phone = 356,
+     T_Pid = 357,
+     T_Pidfile = 358,
+     T_Pool = 359,
+     T_Port = 360,
+     T_Pps = 361,
+     T_Preempt = 362,
+     T_Prefer = 363,
+     T_Pw = 364,
+     T_RandFile = 365,
+     T_Rawstats = 366,
+     T_Refid = 367,
+     T_Requestkey = 368,
+     T_Restrict = 369,
+     T_Revoke = 370,
+     T_Server = 371,
+     T_Setvar = 372,
+     T_Sign = 373,
+     T_Statistics = 374,
+     T_Stats = 375,
+     T_Statsdir = 376,
+     T_Step = 377,
+     T_Stepout = 378,
+     T_Stratum = 379,
+     T_String = 380,
+     T_Sysstats = 381,
+     T_Tick = 382,
+     T_Time1 = 383,
+     T_Time2 = 384,
+     T_Tinker = 385,
+     T_Tos = 386,
+     T_Trap = 387,
+     T_True = 388,
+     T_Trustedkey = 389,
+     T_Ttl = 390,
+     T_Type = 391,
+     T_Version = 392,
+     T_Week = 393,
+     T_Year = 394,
+     T_Flag = 395,
+     T_Void = 396,
+     T_EOC = 397,
+     T_Simulate = 398,
+     T_Beep_Delay = 399,
+     T_Sim_Duration = 400,
+     T_Server_Offset = 401,
+     T_Duration = 402,
+     T_Freq_Offset = 403,
+     T_Wander = 404,
+     T_Jitter = 405,
+     T_Prop_Delay = 406,
+     T_Proc_Delay = 407
+   };
+#endif
+#define T_Age 258
+#define T_Allan 259
+#define T_Auth 260
+#define T_Autokey 261
+#define T_Automax 262
+#define T_Average 263
+#define T_Bclient 264
+#define T_Beacon 265
+#define T_Broadcast 266
+#define T_Broadcastclient 267
+#define T_Broadcastdelay 268
+#define T_Burst 269
+#define T_Calibrate 270
+#define T_Calldelay 271
+#define T_Ceiling 272
+#define T_Cert 273
+#define T_Clockstats 274
+#define T_Cohort 275
+#define T_ControlKey 276
+#define T_Crypto 277
+#define T_Cryptostats 278
+#define T_Day 279
+#define T_Default 280
+#define T_Disable 281
+#define T_Discard 282
+#define T_Dispersion 283
+#define T_Double 284
+#define T_Driftfile 285
+#define T_DriftMinutes 286
+#define T_Enable 287
+#define T_End 288
+#define T_False 289
+#define T_File 290
+#define T_Filegen 291
+#define T_Flag1 292
+#define T_Flag2 293
+#define T_Flag3 294
+#define T_Flag4 295
+#define T_Floor 296
+#define T_Freq 297
+#define T_Fudge 298
+#define T_Gqpar 299
+#define T_Host 300
+#define T_Huffpuff 301
+#define T_IPv4_address 302
+#define T_IPv6_address 303
+#define T_Iburst 304
+#define T_Ident 305
+#define T_Iffpar 306
+#define T_Ignore 307
+#define T_Includefile 308
+#define T_Integer 309
+#define T_Interface 310
+#define T_Kernel 311
+#define T_Key 312
+#define T_Keys 313
+#define T_Keysdir 314
+#define T_Kod 315
+#define T_Leap 316
+#define T_Limited 317
+#define T_Link 318
+#define T_Logconfig 319
+#define T_Logfile 320
+#define T_Loopstats 321
+#define T_Lowpriotrap 322
+#define T_Manycastclient 323
+#define T_Manycastserver 324
+#define T_Mask 325
+#define T_Maxclock 326
+#define T_Maxdist 327
+#define T_Maxhop 328
+#define T_Maxpoll 329
+#define T_Minclock 330
+#define T_Mindist 331
+#define T_Minimum 332
+#define T_Minpoll 333
+#define T_Minsane 334
+#define T_Mode 335
+#define T_Monitor 336
+#define T_Month 337
+#define T_Multicastclient 338
+#define T_Mvpar 339
+#define T_Nolink 340
+#define T_Nomodify 341
+#define T_None 342
+#define T_Nopeer 343
+#define T_Noquery 344
+#define T_Noselect 345
+#define T_Noserve 346
+#define T_Notrap 347
+#define T_Notrust 348
+#define T_Novolley 349
+#define T_Ntp 350
+#define T_Ntpport 351
+#define T_Orphan 352
+#define T_Panic 353
+#define T_Peer 354
+#define T_Peerstats 355
+#define T_Phone 356
+#define T_Pid 357
+#define T_Pidfile 358
+#define T_Pool 359
+#define T_Port 360
+#define T_Pps 361
+#define T_Preempt 362
+#define T_Prefer 363
+#define T_Pw 364
+#define T_RandFile 365
+#define T_Rawstats 366
+#define T_Refid 367
+#define T_Requestkey 368
+#define T_Restrict 369
+#define T_Revoke 370
+#define T_Server 371
+#define T_Setvar 372
+#define T_Sign 373
+#define T_Statistics 374
+#define T_Stats 375
+#define T_Statsdir 376
+#define T_Step 377
+#define T_Stepout 378
+#define T_Stratum 379
+#define T_String 380
+#define T_Sysstats 381
+#define T_Tick 382
+#define T_Time1 383
+#define T_Time2 384
+#define T_Tinker 385
+#define T_Tos 386
+#define T_Trap 387
+#define T_True 388
+#define T_Trustedkey 389
+#define T_Ttl 390
+#define T_Type 391
+#define T_Version 392
+#define T_Week 393
+#define T_Year 394
+#define T_Flag 395
+#define T_Void 396
+#define T_EOC 397
+#define T_Simulate 398
+#define T_Beep_Delay 399
+#define T_Sim_Duration 400
+#define T_Server_Offset 401
+#define T_Duration 402
+#define T_Freq_Offset 403
+#define T_Wander 404
+#define T_Jitter 405
+#define T_Prop_Delay 406
+#define T_Proc_Delay 407
+
+
+
 
 #ifndef YYSTYPE
+#line 67 "ntp_parser.y"
 typedef union {
     char   *String;
     double  Double;
@@ -16,160 +354,13 @@ typedef union {
     server_info *Sim_server;
     script_info *Sim_script;
 } yystype;
+/* Line 1281 of /usr/local/share/bison/yacc.c.  */
+#line 359 "ntp_parser.h"
 # define YYSTYPE yystype
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
-# define	T_Age	257
-# define	T_Allan	258
-# define	T_Auth	259
-# define	T_Autokey	260
-# define	T_Automax	261
-# define	T_Average	262
-# define	T_Bclient	263
-# define	T_Beacon	264
-# define	T_Broadcast	265
-# define	T_Broadcastclient	266
-# define	T_Broadcastdelay	267
-# define	T_Burst	268
-# define	T_Calibrate	269
-# define	T_Calldelay	270
-# define	T_Ceiling	271
-# define	T_Cert	272
-# define	T_Clockstats	273
-# define	T_Cohort	274
-# define	T_ControlKey	275
-# define	T_Crypto	276
-# define	T_Cryptostats	277
-# define	T_Day	278
-# define	T_Default	279
-# define	T_Disable	280
-# define	T_Discard	281
-# define	T_Dispersion	282
-# define	T_Double	283
-# define	T_Driftfile	284
-# define	T_Enable	285
-# define	T_End	286
-# define	T_False	287
-# define	T_File	288
-# define	T_Filegen	289
-# define	T_Flag1	290
-# define	T_Flag2	291
-# define	T_Flag3	292
-# define	T_Flag4	293
-# define	T_Floor	294
-# define	T_Freq	295
-# define	T_Fudge	296
-# define	T_Gqpar	297
-# define	T_Host	298
-# define	T_Huffpuff	299
-# define	T_IPv4_address	300
-# define	T_IPv6_address	301
-# define	T_Iburst	302
-# define	T_Ident	303
-# define	T_Iffpar	304
-# define	T_Ignore	305
-# define	T_Includefile	306
-# define	T_Integer	307
-# define	T_Interface	308
-# define	T_Kernel	309
-# define	T_Key	310
-# define	T_Keys	311
-# define	T_Keysdir	312
-# define	T_Kod	313
-# define	T_Leap	314
-# define	T_Limited	315
-# define	T_Link	316
-# define	T_Logconfig	317
-# define	T_Logfile	318
-# define	T_Loopstats	319
-# define	T_Lowpriotrap	320
-# define	T_Manycastclient	321
-# define	T_Manycastserver	322
-# define	T_Mask	323
-# define	T_Maxclock	324
-# define	T_Maxdist	325
-# define	T_Maxhop	326
-# define	T_Maxpoll	327
-# define	T_Minclock	328
-# define	T_Mindist	329
-# define	T_Minimum	330
-# define	T_Minpoll	331
-# define	T_Minsane	332
-# define	T_Mode	333
-# define	T_Monitor	334
-# define	T_Month	335
-# define	T_Multicastclient	336
-# define	T_Mvpar	337
-# define	T_Nolink	338
-# define	T_Nomodify	339
-# define	T_None	340
-# define	T_Nopeer	341
-# define	T_Noquery	342
-# define	T_Noselect	343
-# define	T_Noserve	344
-# define	T_Notrap	345
-# define	T_Notrust	346
-# define	T_Novolley	347
-# define	T_Ntp	348
-# define	T_Ntpport	349
-# define	T_Orphan	350
-# define	T_Panic	351
-# define	T_Peer	352
-# define	T_Peerstats	353
-# define	T_Phone	354
-# define	T_Pid	355
-# define	T_Pidfile	356
-# define	T_Pool	357
-# define	T_Port	358
-# define	T_Pps	359
-# define	T_Preempt	360
-# define	T_Prefer	361
-# define	T_Pw	362
-# define	T_RandFile	363
-# define	T_Rawstats	364
-# define	T_Refid	365
-# define	T_Requestkey	366
-# define	T_Restrict	367
-# define	T_Revoke	368
-# define	T_Server	369
-# define	T_Setvar	370
-# define	T_Sign	371
-# define	T_Statistics	372
-# define	T_Stats	373
-# define	T_Statsdir	374
-# define	T_Step	375
-# define	T_Stepout	376
-# define	T_Stratum	377
-# define	T_String	378
-# define	T_Sysstats	379
-# define	T_Tick	380
-# define	T_Time1	381
-# define	T_Time2	382
-# define	T_Tinker	383
-# define	T_Tos	384
-# define	T_Trap	385
-# define	T_True	386
-# define	T_Trustedkey	387
-# define	T_Ttl	388
-# define	T_Type	389
-# define	T_Version	390
-# define	T_Week	391
-# define	T_Year	392
-# define	T_Flag	393
-# define	T_Void	394
-# define	T_EOC	395
-# define	T_Simulate	396
-# define	T_Beep_Delay	397
-# define	T_Sim_Duration	398
-# define	T_Server_Offset	399
-# define	T_Duration	400
-# define	T_Freq_Offset	401
-# define	T_Wander	402
-# define	T_Jitter	403
-# define	T_Prop_Delay	404
-# define	T_Proc_Delay	405
-
 
 extern YYSTYPE yylval;
 
-#endif /* not BISON_______NTPD_NTP_PARSER_H */
+
+#endif /* not BISON_NTP_PARSER_H */
+

==== ntpd/ntp_parser.y ====
2007-06-07 10:45:55-04:00, neal at pogo.udel.edu +9 -2
  [Bug 850] driftfile parsing changes.

--- 1.7/ntpd/ntp_parser.y	2007-06-01 07:51:22 -04:00
+++ 1.8/ntpd/ntp_parser.y	2007-06-07 10:45:55 -04:00
@@ -108,6 +108,7 @@
 %token		T_Dispersion
 %token <Double>	T_Double
 %token		T_Driftfile
+%token <Integer> T_DriftMinutes
 %token		T_Enable
 %token		T_End
 %token		T_False
@@ -745,8 +746,9 @@ 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
-                    { enqueue(my_config.vars, create_attr_sval(T_Driftfile, $2));  }
+	|	T_Driftfile T_String drift_parm
+         { enqueue(my_config.vars, create_attr_sval(T_Driftfile, $2)); }
+
 	|	T_Pidfile T_String 
                     { enqueue(my_config.vars, create_attr_sval(T_Pidfile, $2));  }
 	|	T_Logfile T_String 
@@ -765,6 +767,11 @@ miscellaneous_command
 	|	T_Ttl integer_list 
                     { append_queue(my_config.ttl, $2); }
 	;	
+drift_parm
+	:	{ /* Null command */ }
+	|   T_Integer 
+		{ enqueue(my_config.vars, create_attr_ival(T_DriftMinutes, $1)); }
+	;
 
 variable_assign
         :	T_String '=' T_String T_Default  


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