Module Name: src
Committed By: christos
Date: Fri Jun 3 20:39:03 UTC 2016
Modified Files:
src/external/bsd/ntp: importdate
src/external/bsd/ntp/dist/include: ntp.h
src/external/bsd/ntp/dist/ntpd: keyword-gen.c ntp_config.c ntp_io.c
ntp_keyword.h ntp_parser.y ntp_proto.c ntpd-opts.c ntpd-opts.h
refclock_parse.c
src/external/bsd/ntp/dist/ntpdc: ntpdc-opts.c ntpdc-opts.h ntpdc.c
src/external/bsd/ntp/dist/ntpq: ntpq-opts.c ntpq-opts.h ntpq.c
src/external/bsd/ntp/dist/ntpsnmpd: ntpsnmpd-opts.c ntpsnmpd-opts.h
src/external/bsd/ntp/dist/sntp: sntp-opts.c sntp-opts.h
src/external/bsd/ntp/dist/util: ntp-keygen-opts.c ntp-keygen-opts.h
src/external/bsd/ntp/include: config.h
src/external/bsd/ntp/scripts: mkver
Log Message:
resolve conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/importdate
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/include/ntp.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/ntpd/keyword-gen.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/ntpd/ntp_config.c
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/ntp/dist/ntpd/ntp_io.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpd/ntp_keyword.h \
src/external/bsd/ntp/dist/ntpd/ntpd-opts.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpd/ntp_parser.y
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/ntpd/ntp_proto.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpd/ntpd-opts.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/ntp/dist/ntpd/refclock_parse.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c \
src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpdc/ntpdc.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpq/ntpq-opts.c \
src/external/bsd/ntp/dist/ntpq/ntpq-opts.h
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/dist/ntpq/ntpq.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c \
src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/sntp/sntp-opts.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/sntp/sntp-opts.h
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/util/ntp-keygen-opts.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/util/ntp-keygen-opts.h
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/include/config.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/scripts/mkver
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/importdate
diff -u src/external/bsd/ntp/importdate:1.9 src/external/bsd/ntp/importdate:1.10
--- src/external/bsd/ntp/importdate:1.9 Sun May 1 19:32:00 2016
+++ src/external/bsd/ntp/importdate Fri Jun 3 16:39:02 2016
@@ -1 +1 @@
-Sun May 1 13:19:23 EDT 2016 (import)
+Fri Jun 3 16:38:21 EDT 2016 (import)
Index: src/external/bsd/ntp/dist/include/ntp.h
diff -u src/external/bsd/ntp/dist/include/ntp.h:1.6 src/external/bsd/ntp/dist/include/ntp.h:1.7
--- src/external/bsd/ntp/dist/include/ntp.h:1.6 Sun May 1 19:32:00 2016
+++ src/external/bsd/ntp/dist/include/ntp.h Fri Jun 3 16:39:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp.h,v 1.6 2016/05/01 23:32:00 christos Exp $ */
+/* $NetBSD: ntp.h,v 1.7 2016/06/03 20:39:02 christos Exp $ */
/*
* ntp.h - NTP definitions for the masses
@@ -725,6 +725,7 @@ struct pkt {
#define PROTO_UECRYPTO 29
#define PROTO_UECRYPTONAK 30
#define PROTO_UEDIGEST 31
+#define PROTO_PCEDIGEST 32
/*
* Configuration items for the loop filter
Index: src/external/bsd/ntp/dist/ntpd/keyword-gen.c
diff -u src/external/bsd/ntp/dist/ntpd/keyword-gen.c:1.9 src/external/bsd/ntp/dist/ntpd/keyword-gen.c:1.10
--- src/external/bsd/ntp/dist/ntpd/keyword-gen.c:1.9 Sun May 1 19:32:00 2016
+++ src/external/bsd/ntp/dist/ntpd/keyword-gen.c Fri Jun 3 16:39:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: keyword-gen.c,v 1.9 2016/05/01 23:32:00 christos Exp $ */
+/* $NetBSD: keyword-gen.c,v 1.10 2016/06/03 20:39:02 christos Exp $ */
/*
* keyword-gen.c -- generate keyword scanner finite state machine and
@@ -201,8 +201,9 @@ struct key_tok ntp_keywords[] = {
{ "bclient", T_Bclient, FOLLBY_TOKEN },
{ "calibrate", T_Calibrate, FOLLBY_TOKEN },
{ "kernel", T_Kernel, FOLLBY_TOKEN },
-{ "ntp", T_Ntp, FOLLBY_TOKEN },
{ "mode7", T_Mode7, FOLLBY_TOKEN },
+{ "ntp", T_Ntp, FOLLBY_TOKEN },
+{ "peer_clear_digest_early", T_PCEdigest, FOLLBY_TOKEN },
{ "stats", T_Stats, FOLLBY_TOKEN },
{ "unpeer_crypto_early", T_UEcrypto, FOLLBY_TOKEN },
{ "unpeer_crypto_nak_early", T_UEcryptonak, FOLLBY_TOKEN },
Index: src/external/bsd/ntp/dist/ntpd/ntp_config.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.14 src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.15
--- src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.14 Sun May 1 19:32:00 2016
+++ src/external/bsd/ntp/dist/ntpd/ntp_config.c Fri Jun 3 16:39:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_config.c,v 1.14 2016/05/01 23:32:00 christos Exp $ */
+/* $NetBSD: ntp_config.c,v 1.15 2016/06/03 20:39:02 christos Exp $ */
/* ntp_config.c
*
@@ -2973,12 +2973,16 @@ apply_enable_disable(
proto_config(PROTO_MONITOR, enable, 0., NULL);
break;
+ case T_Mode7:
+ proto_config(PROTO_MODE7, enable, 0., NULL);
+ break;
+
case T_Ntp:
proto_config(PROTO_NTP, enable, 0., NULL);
break;
- case T_Mode7:
- proto_config(PROTO_MODE7, enable, 0., NULL);
+ case T_PCEdigest:
+ proto_config(PROTO_PCEDIGEST, enable, 0., NULL);
break;
case T_Stats:
Index: src/external/bsd/ntp/dist/ntpd/ntp_io.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_io.c:1.22 src/external/bsd/ntp/dist/ntpd/ntp_io.c:1.23
--- src/external/bsd/ntp/dist/ntpd/ntp_io.c:1.22 Sun May 1 19:32:00 2016
+++ src/external/bsd/ntp/dist/ntpd/ntp_io.c Fri Jun 3 16:39:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_io.c,v 1.22 2016/05/01 23:32:00 christos Exp $ */
+/* $NetBSD: ntp_io.c,v 1.23 2016/06/03 20:39:02 christos Exp $ */
/*
* ntp_io.c - input/output routines for ntpd. The socket-opening code
@@ -3328,15 +3328,6 @@ fetch_timestamp(
)
{
struct cmsghdr * cmsghdr;
-#ifdef HAVE_BINTIME
- struct bintime * btp;
-#endif
-#ifdef HAVE_TIMESTAMPNS
- struct timespec * tsp;
-#endif
-#ifdef HAVE_TIMESTAMP
- struct timeval * tvp;
-#endif
unsigned long ticks;
double fuzz;
l_fp lfpfuzz;
@@ -3363,49 +3354,58 @@ fetch_timestamp(
{
#ifdef HAVE_BINTIME
case SCM_BINTIME:
- btp = (struct bintime *)CMSG_DATA(cmsghdr);
- /*
- * bintime documentation is at http://phk.freebsd.dk/pubs/timecounter.pdf
- */
- nts.l_i = btp->sec + JAN_1970;
- nts.l_uf = (u_int32)(btp->frac >> 32);
- if (sys_tick > measured_tick &&
- sys_tick > 1e-9) {
- ticks = (unsigned long)(nts.l_uf / (unsigned long)(sys_tick * FRAC));
- nts.l_uf = (unsigned long)(ticks * (unsigned long)(sys_tick * FRAC));
+ {
+ struct bintime pbt;
+ memcpy(&pbt, CMSG_DATA(cmsghdr), sizeof(pbt));
+ /*
+ * bintime documentation is at http://phk.freebsd.dk/pubs/timecounter.pdf
+ */
+ nts.l_i = pbt.sec + JAN_1970;
+ nts.l_uf = (u_int32)(pbt.frac >> 32);
+ if (sys_tick > measured_tick &&
+ sys_tick > 1e-9) {
+ ticks = (unsigned long)(nts.l_uf / (unsigned long)(sys_tick * FRAC));
+ nts.l_uf = (unsigned long)(ticks * (unsigned long)(sys_tick * FRAC));
+ }
+ DPRINTF(4, ("fetch_timestamp: system bintime network time stamp: %ld.%09lu\n",
+ pbt.sec, (unsigned long)((nts.l_uf / FRAC) * 1e9)));
}
- DPRINTF(4, ("fetch_timestamp: system bintime network time stamp: %ld.%09lu\n",
- btp->sec, (unsigned long)((nts.l_uf / FRAC) * 1e9)));
break;
#endif /* HAVE_BINTIME */
#ifdef HAVE_TIMESTAMPNS
case SCM_TIMESTAMPNS:
- tsp = UA_PTR(struct timespec, CMSG_DATA(cmsghdr));
- if (sys_tick > measured_tick &&
- sys_tick > 1e-9) {
- ticks = (unsigned long)((tsp->tv_nsec * 1e-9) /
- sys_tick);
- tsp->tv_nsec = (long)(ticks * 1e9 *
- sys_tick);
+ {
+ struct timespec pts;
+ memcpy(&pts, CMSG_DATA(cmsghdr), sizeof(pts));
+ if (sys_tick > measured_tick &&
+ sys_tick > 1e-9) {
+ ticks = (unsigned long)((pts.tv_nsec * 1e-9) /
+ sys_tick);
+ pts.tv_nsec = (long)(ticks * 1e9 *
+ sys_tick);
+ }
+ DPRINTF(4, ("fetch_timestamp: system nsec network time stamp: %ld.%09ld\n",
+ pts.tv_sec, pts.tv_nsec));
+ nts = tspec_stamp_to_lfp(pts);
}
- DPRINTF(4, ("fetch_timestamp: system nsec network time stamp: %ld.%09ld\n",
- tsp->tv_sec, tsp->tv_nsec));
- nts = tspec_stamp_to_lfp(*tsp);
break;
#endif /* HAVE_TIMESTAMPNS */
#ifdef HAVE_TIMESTAMP
case SCM_TIMESTAMP:
- tvp = (struct timeval *)CMSG_DATA(cmsghdr);
- if (sys_tick > measured_tick &&
- sys_tick > 1e-6) {
- ticks = (unsigned long)((tvp->tv_usec * 1e-6) /
- sys_tick);
- tvp->tv_usec = (long)(ticks * 1e6 *
- sys_tick);
+ {
+ struct timeval ptv;
+ memcpy(&ptv, CMSG_DATA(cmsghdr), sizeof(ptv));
+ if (sys_tick > measured_tick &&
+ sys_tick > 1e-6) {
+ ticks = (unsigned long)((ptv.tv_usec * 1e-6) /
+ sys_tick);
+ ptv.tv_usec = (long)(ticks * 1e6 *
+ sys_tick);
+ }
+ DPRINTF(4, ("fetch_timestamp: system usec network time stamp: %jd.%06ld\n",
+ (intmax_t)ptv.tv_sec, (long)ptv.tv_usec));
+ nts = tval_stamp_to_lfp(ptv);
}
- DPRINTF(4, ("fetch_timestamp: system usec network time stamp: %jd.%06ld\n",
- (intmax_t)tvp->tv_sec, (long)tvp->tv_usec));
- nts = tval_stamp_to_lfp(*tvp);
break;
#endif /* HAVE_TIMESTAMP */
}
Index: src/external/bsd/ntp/dist/ntpd/ntp_keyword.h
diff -u src/external/bsd/ntp/dist/ntpd/ntp_keyword.h:1.10 src/external/bsd/ntp/dist/ntpd/ntp_keyword.h:1.11
--- src/external/bsd/ntp/dist/ntpd/ntp_keyword.h:1.10 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/ntpd/ntp_keyword.h Fri Jun 3 16:39:02 2016
@@ -1,8 +1,9 @@
+/* $NetBSD: ntp_keyword.h,v 1.11 2016/06/03 20:39:02 christos Exp $ */
/*
* ntp_keyword.h
*
* NOTE: edit this file with caution, it is generated by keyword-gen.c
- * Generated 2016-05-01 17:15:52 UTC diff_ignore_line
+ * Generated 2016-06-03 20:34:30 UTC diff_ignore_line
*
*/
#include "ntp_scanner.h"
@@ -10,7 +11,7 @@
#define LOWEST_KEYWORD_ID 257
-const char * const keyword_text[194] = {
+const char * const keyword_text[195] = {
/* 0 257 257 */ "abbrev",
/* 1 258 258 */ "age",
/* 2 259 259 */ "all",
@@ -133,83 +134,84 @@ const char * const keyword_text[194] = {
/* 119 376 376 */ "ntpsigndsocket",
/* 120 377 377 */ "orphan",
/* 121 378 378 */ "orphanwait",
- /* 122 379 379 */ "panic",
- /* 123 380 380 */ "peer",
- /* 124 381 381 */ "peerstats",
- /* 125 382 382 */ "phone",
- /* 126 383 383 */ "pid",
- /* 127 384 384 */ "pidfile",
- /* 128 385 385 */ "pool",
- /* 129 386 386 */ "port",
- /* 130 387 387 */ "preempt",
- /* 131 388 388 */ "prefer",
- /* 132 389 389 */ "protostats",
- /* 133 390 390 */ "pw",
- /* 134 391 391 */ "randfile",
- /* 135 392 392 */ "rawstats",
- /* 136 393 393 */ "refid",
- /* 137 394 394 */ "requestkey",
- /* 138 395 395 */ "reset",
- /* 139 396 396 */ "restrict",
- /* 140 397 397 */ "revoke",
- /* 141 398 398 */ "rlimit",
- /* 142 399 399 */ "saveconfigdir",
- /* 143 400 400 */ "server",
- /* 144 401 401 */ "setvar",
- /* 145 402 402 */ "source",
- /* 146 403 403 */ "stacksize",
- /* 147 404 404 */ "statistics",
- /* 148 405 405 */ "stats",
- /* 149 406 406 */ "statsdir",
- /* 150 407 407 */ "step",
- /* 151 408 408 */ "stepback",
- /* 152 409 409 */ "stepfwd",
- /* 153 410 410 */ "stepout",
- /* 154 411 411 */ "stratum",
- /* 155 412 412 */ NULL,
- /* 156 413 413 */ "sys",
- /* 157 414 414 */ "sysstats",
- /* 158 415 415 */ "tick",
- /* 159 416 416 */ "time1",
- /* 160 417 417 */ "time2",
- /* 161 418 418 */ "timer",
- /* 162 419 419 */ "timingstats",
- /* 163 420 420 */ "tinker",
- /* 164 421 421 */ "tos",
- /* 165 422 422 */ "trap",
- /* 166 423 423 */ "true",
- /* 167 424 424 */ "trustedkey",
- /* 168 425 425 */ "ttl",
- /* 169 426 426 */ "type",
- /* 170 427 427 */ NULL,
- /* 171 428 428 */ "unpeer_crypto_early",
- /* 172 429 429 */ "unpeer_crypto_nak_early",
- /* 173 430 430 */ "unpeer_digest_early",
- /* 174 431 431 */ "unconfig",
- /* 175 432 432 */ "unpeer",
- /* 176 433 433 */ "version",
- /* 177 434 434 */ NULL,
- /* 178 435 435 */ "week",
- /* 179 436 436 */ "wildcard",
- /* 180 437 437 */ "xleave",
- /* 181 438 438 */ "year",
- /* 182 439 439 */ NULL,
+ /* 122 379 379 */ "peer_clear_digest_early",
+ /* 123 380 380 */ "panic",
+ /* 124 381 381 */ "peer",
+ /* 125 382 382 */ "peerstats",
+ /* 126 383 383 */ "phone",
+ /* 127 384 384 */ "pid",
+ /* 128 385 385 */ "pidfile",
+ /* 129 386 386 */ "pool",
+ /* 130 387 387 */ "port",
+ /* 131 388 388 */ "preempt",
+ /* 132 389 389 */ "prefer",
+ /* 133 390 390 */ "protostats",
+ /* 134 391 391 */ "pw",
+ /* 135 392 392 */ "randfile",
+ /* 136 393 393 */ "rawstats",
+ /* 137 394 394 */ "refid",
+ /* 138 395 395 */ "requestkey",
+ /* 139 396 396 */ "reset",
+ /* 140 397 397 */ "restrict",
+ /* 141 398 398 */ "revoke",
+ /* 142 399 399 */ "rlimit",
+ /* 143 400 400 */ "saveconfigdir",
+ /* 144 401 401 */ "server",
+ /* 145 402 402 */ "setvar",
+ /* 146 403 403 */ "source",
+ /* 147 404 404 */ "stacksize",
+ /* 148 405 405 */ "statistics",
+ /* 149 406 406 */ "stats",
+ /* 150 407 407 */ "statsdir",
+ /* 151 408 408 */ "step",
+ /* 152 409 409 */ "stepback",
+ /* 153 410 410 */ "stepfwd",
+ /* 154 411 411 */ "stepout",
+ /* 155 412 412 */ "stratum",
+ /* 156 413 413 */ NULL,
+ /* 157 414 414 */ "sys",
+ /* 158 415 415 */ "sysstats",
+ /* 159 416 416 */ "tick",
+ /* 160 417 417 */ "time1",
+ /* 161 418 418 */ "time2",
+ /* 162 419 419 */ "timer",
+ /* 163 420 420 */ "timingstats",
+ /* 164 421 421 */ "tinker",
+ /* 165 422 422 */ "tos",
+ /* 166 423 423 */ "trap",
+ /* 167 424 424 */ "true",
+ /* 168 425 425 */ "trustedkey",
+ /* 169 426 426 */ "ttl",
+ /* 170 427 427 */ "type",
+ /* 171 428 428 */ NULL,
+ /* 172 429 429 */ "unpeer_crypto_early",
+ /* 173 430 430 */ "unpeer_crypto_nak_early",
+ /* 174 431 431 */ "unpeer_digest_early",
+ /* 175 432 432 */ "unconfig",
+ /* 176 433 433 */ "unpeer",
+ /* 177 434 434 */ "version",
+ /* 178 435 435 */ NULL,
+ /* 179 436 436 */ "week",
+ /* 180 437 437 */ "wildcard",
+ /* 181 438 438 */ "xleave",
+ /* 182 439 439 */ "year",
/* 183 440 440 */ NULL,
- /* 184 441 441 */ "simulate",
- /* 185 442 442 */ "beep_delay",
- /* 186 443 443 */ "simulation_duration",
- /* 187 444 444 */ "server_offset",
- /* 188 445 445 */ "duration",
- /* 189 446 446 */ "freq_offset",
- /* 190 447 447 */ "wander",
- /* 191 448 448 */ "jitter",
- /* 192 449 449 */ "prop_delay",
- /* 193 450 450 */ "proc_delay"
+ /* 184 441 441 */ NULL,
+ /* 185 442 442 */ "simulate",
+ /* 186 443 443 */ "beep_delay",
+ /* 187 444 444 */ "simulation_duration",
+ /* 188 445 445 */ "server_offset",
+ /* 189 446 446 */ "duration",
+ /* 190 447 447 */ "freq_offset",
+ /* 191 448 448 */ "wander",
+ /* 192 449 449 */ "jitter",
+ /* 193 450 450 */ "prop_delay",
+ /* 194 451 451 */ "proc_delay"
};
-#define SCANNER_INIT_S 887
+#define SCANNER_INIT_S 906
-const scan_state sst[890] = {
+const scan_state sst[909] = {
/*SS_T( ch, f-by, match, other ), */
0, /* 0 */
S_ST( '-', 3, 322, 0 ), /* 1 */
@@ -255,7 +257,7 @@ const scan_state sst[890] = {
S_ST( 'd', 3, 42, 0 ), /* 41 beep_ */
S_ST( 'e', 3, 43, 0 ), /* 42 beep_d */
S_ST( 'l', 3, 44, 0 ), /* 43 beep_de */
- S_ST( 'a', 3, 442, 0 ), /* 44 beep_del */
+ S_ST( 'a', 3, 443, 0 ), /* 44 beep_del */
S_ST( 'r', 3, 46, 34 ), /* 45 b */
S_ST( 'o', 3, 47, 0 ), /* 46 br */
S_ST( 'a', 3, 48, 0 ), /* 47 bro */
@@ -355,7 +357,7 @@ const scan_state sst[890] = {
S_ST( 'a', 3, 142, 0 ), /* 141 dur */
S_ST( 't', 3, 143, 0 ), /* 142 dura */
S_ST( 'i', 3, 144, 0 ), /* 143 durat */
- S_ST( 'o', 3, 445, 0 ), /* 144 durati */
+ S_ST( 'o', 3, 446, 0 ), /* 144 durati */
S_ST( 'e', 3, 146, 105 ), /* 145 */
S_ST( 'n', 3, 292, 0 ), /* 146 e */
S_ST( 'a', 3, 148, 0 ), /* 147 en */
@@ -381,7 +383,7 @@ const scan_state sst[890] = {
S_ST( 'f', 3, 168, 0 ), /* 167 freq_o */
S_ST( 'f', 3, 169, 0 ), /* 168 freq_of */
S_ST( 's', 3, 170, 0 ), /* 169 freq_off */
- S_ST( 'e', 3, 446, 0 ), /* 170 freq_offs */
+ S_ST( 'e', 3, 447, 0 ), /* 170 freq_offs */
S_ST( 'u', 3, 172, 163 ), /* 171 f */
S_ST( 'd', 3, 173, 0 ), /* 172 fu */
S_ST( 'g', 3, 304, 0 ), /* 173 fud */
@@ -441,7 +443,7 @@ const scan_state sst[890] = {
S_ST( 'i', 3, 228, 0 ), /* 227 j */
S_ST( 't', 3, 229, 0 ), /* 228 ji */
S_ST( 't', 3, 230, 0 ), /* 229 jit */
- S_ST( 'e', 3, 448, 0 ), /* 230 jitt */
+ S_ST( 'e', 3, 449, 0 ), /* 230 jitt */
S_ST( 'k', 3, 238, 226 ), /* 231 */
S_ST( 'e', 3, 324, 0 ), /* 232 k */
S_ST( 'r', 3, 234, 0 ), /* 233 ke */
@@ -450,7 +452,7 @@ const scan_state sst[890] = {
S_ST( 'd', 3, 237, 0 ), /* 236 keys */
S_ST( 'i', 3, 326, 0 ), /* 237 keysd */
S_ST( 'o', 3, 327, 232 ), /* 238 k */
- S_ST( 'l', 3, 452, 231 ), /* 239 */
+ S_ST( 'l', 3, 453, 231 ), /* 239 */
S_ST( 'e', 3, 241, 0 ), /* 240 l */
S_ST( 'a', 3, 242, 0 ), /* 241 le */
S_ST( 'p', 3, 246, 0 ), /* 242 lea */
@@ -504,7 +506,7 @@ const scan_state sst[890] = {
S_ST( '.', 0, 0, 0 ), /* 290 290 */
S_ST( 'e', 0, 0, 0 ), /* 291 291 */
S_ST( 'd', 0, 0, 147 ), /* 292 292 */
- S_ST( 'i', 3, 439, 240 ), /* 293 l */
+ S_ST( 'i', 3, 440, 240 ), /* 293 l */
S_ST( 'e', 1, 155, 0 ), /* 294 294 */
S_ST( 'n', 0, 0, 0 ), /* 295 295 */
S_ST( 'm', 0, 0, 0 ), /* 296 296 */
@@ -528,7 +530,7 @@ const scan_state sst[890] = {
S_ST( 'e', 1, 0, 0 ), /* 314 314 */
S_ST( 'm', 3, 317, 0 ), /* 315 li */
S_ST( 'e', 0, 0, 0 ), /* 316 316 */
- S_ST( 'i', 3, 412, 0 ), /* 317 lim */
+ S_ST( 'i', 3, 413, 0 ), /* 317 lim */
S_ST( 'o', 0, 0, 195 ), /* 318 318 */
S_ST( '4', 0, 0, 0 ), /* 319 319 */
S_ST( '4', 0, 0, 0 ), /* 320 320 */
@@ -559,7 +561,7 @@ const scan_state sst[890] = {
S_ST( 'm', 0, 0, 0 ), /* 345 345 */
S_ST( 'l', 0, 0, 0 ), /* 346 346 */
S_ST( 's', 0, 0, 0 ), /* 347 347 */
- S_ST( 'm', 0, 521, 0 ), /* 348 348 */
+ S_ST( 'm', 0, 522, 0 ), /* 348 348 */
S_ST( 'k', 0, 0, 0 ), /* 349 349 */
S_ST( 'k', 0, 0, 0 ), /* 350 350 */
S_ST( 'h', 0, 0, 0 ), /* 351 351 */
@@ -585,521 +587,540 @@ const scan_state sst[890] = {
S_ST( 'e', 0, 0, 0 ), /* 371 371 */
S_ST( 'p', 0, 0, 0 ), /* 372 372 */
S_ST( 't', 0, 0, 0 ), /* 373 373 */
- S_ST( 'p', 0, 617, 0 ), /* 374 374 */
+ S_ST( 'p', 0, 618, 0 ), /* 374 374 */
S_ST( 't', 0, 0, 0 ), /* 375 375 */
S_ST( 't', 1, 0, 0 ), /* 376 376 */
- S_ST( 'n', 0, 632, 0 ), /* 377 377 */
+ S_ST( 'n', 0, 633, 0 ), /* 377 377 */
S_ST( 't', 0, 0, 0 ), /* 378 378 */
- S_ST( 'c', 0, 0, 0 ), /* 379 379 */
- S_ST( 'r', 1, 641, 0 ), /* 380 380 */
- S_ST( 's', 0, 0, 0 ), /* 381 381 */
- S_ST( 'e', 2, 0, 0 ), /* 382 382 */
- S_ST( 'd', 0, 649, 0 ), /* 383 383 */
- S_ST( 'e', 1, 0, 0 ), /* 384 384 */
- S_ST( 'l', 1, 0, 0 ), /* 385 385 */
- S_ST( 't', 0, 0, 0 ), /* 386 386 */
+ S_ST( 'y', 0, 0, 0 ), /* 379 379 */
+ S_ST( 'c', 0, 0, 0 ), /* 380 380 */
+ S_ST( 'r', 1, 660, 0 ), /* 381 381 */
+ S_ST( 's', 0, 0, 0 ), /* 382 382 */
+ S_ST( 'e', 2, 0, 0 ), /* 383 383 */
+ S_ST( 'd', 0, 668, 0 ), /* 384 384 */
+ S_ST( 'e', 1, 0, 0 ), /* 385 385 */
+ S_ST( 'l', 1, 0, 0 ), /* 386 386 */
S_ST( 't', 0, 0, 0 ), /* 387 387 */
- S_ST( 'r', 0, 0, 0 ), /* 388 388 */
- S_ST( 's', 0, 0, 0 ), /* 389 389 */
- S_ST( 'w', 1, 0, 655 ), /* 390 390 */
- S_ST( 'e', 1, 0, 0 ), /* 391 391 */
- S_ST( 's', 0, 0, 0 ), /* 392 392 */
- S_ST( 'd', 1, 0, 0 ), /* 393 393 */
- S_ST( 'y', 0, 0, 0 ), /* 394 394 */
- S_ST( 't', 0, 0, 0 ), /* 395 395 */
+ S_ST( 't', 0, 0, 0 ), /* 388 388 */
+ S_ST( 'r', 0, 0, 0 ), /* 389 389 */
+ S_ST( 's', 0, 0, 0 ), /* 390 390 */
+ S_ST( 'w', 1, 0, 674 ), /* 391 391 */
+ S_ST( 'e', 1, 0, 0 ), /* 392 392 */
+ S_ST( 's', 0, 0, 0 ), /* 393 393 */
+ S_ST( 'd', 1, 0, 0 ), /* 394 394 */
+ S_ST( 'y', 0, 0, 0 ), /* 395 395 */
S_ST( 't', 0, 0, 0 ), /* 396 396 */
- S_ST( 'e', 0, 0, 0 ), /* 397 397 */
- S_ST( 't', 0, 0, 0 ), /* 398 398 */
- S_ST( 'r', 1, 0, 0 ), /* 399 399 */
- S_ST( 'r', 1, 732, 0 ), /* 400 400 */
- S_ST( 'r', 1, 0, 0 ), /* 401 401 */
- S_ST( 'e', 0, 0, 0 ), /* 402 402 */
+ S_ST( 't', 0, 0, 0 ), /* 397 397 */
+ S_ST( 'e', 0, 0, 0 ), /* 398 398 */
+ S_ST( 't', 0, 0, 0 ), /* 399 399 */
+ S_ST( 'r', 1, 0, 0 ), /* 400 400 */
+ S_ST( 'r', 1, 751, 0 ), /* 401 401 */
+ S_ST( 'r', 1, 0, 0 ), /* 402 402 */
S_ST( 'e', 0, 0, 0 ), /* 403 403 */
- S_ST( 's', 0, 0, 0 ), /* 404 404 */
- S_ST( 's', 0, 775, 770 ), /* 405 405 */
- S_ST( 'r', 1, 0, 0 ), /* 406 406 */
- S_ST( 'p', 0, 783, 0 ), /* 407 407 */
- S_ST( 'k', 0, 0, 0 ), /* 408 408 */
- S_ST( 'd', 0, 0, 0 ), /* 409 409 */
- S_ST( 't', 0, 0, 0 ), /* 410 410 */
- S_ST( 'm', 0, 0, 0 ), /* 411 411 */
- S_ST( 't', 3, 427, 0 ), /* 412 limi */
- S_ST( 's', 0, 790, 0 ), /* 413 413 */
- S_ST( 's', 0, 0, 0 ), /* 414 414 */
- S_ST( 'k', 0, 0, 0 ), /* 415 415 */
- S_ST( '1', 0, 0, 0 ), /* 416 416 */
- S_ST( '2', 0, 0, 416 ), /* 417 417 */
- S_ST( 'r', 0, 0, 417 ), /* 418 418 */
- S_ST( 's', 0, 0, 0 ), /* 419 419 */
- S_ST( 'r', 0, 0, 0 ), /* 420 420 */
- S_ST( 's', 0, 0, 0 ), /* 421 421 */
- S_ST( 'p', 1, 0, 0 ), /* 422 422 */
- S_ST( 'e', 0, 0, 0 ), /* 423 423 */
- S_ST( 'y', 0, 0, 0 ), /* 424 424 */
- S_ST( 'l', 0, 0, 0 ), /* 425 425 */
- S_ST( 'e', 0, 0, 0 ), /* 426 426 */
- S_ST( 'e', 3, 331, 0 ), /* 427 limit */
- S_ST( 'y', 0, 0, 0 ), /* 428 428 */
+ S_ST( 'e', 0, 0, 0 ), /* 404 404 */
+ S_ST( 's', 0, 0, 0 ), /* 405 405 */
+ S_ST( 's', 0, 794, 789 ), /* 406 406 */
+ S_ST( 'r', 1, 0, 0 ), /* 407 407 */
+ S_ST( 'p', 0, 802, 0 ), /* 408 408 */
+ S_ST( 'k', 0, 0, 0 ), /* 409 409 */
+ S_ST( 'd', 0, 0, 0 ), /* 410 410 */
+ S_ST( 't', 0, 0, 0 ), /* 411 411 */
+ S_ST( 'm', 0, 0, 0 ), /* 412 412 */
+ S_ST( 't', 3, 428, 0 ), /* 413 limi */
+ S_ST( 's', 0, 809, 0 ), /* 414 414 */
+ S_ST( 's', 0, 0, 0 ), /* 415 415 */
+ S_ST( 'k', 0, 0, 0 ), /* 416 416 */
+ S_ST( '1', 0, 0, 0 ), /* 417 417 */
+ S_ST( '2', 0, 0, 417 ), /* 418 418 */
+ S_ST( 'r', 0, 0, 418 ), /* 419 419 */
+ S_ST( 's', 0, 0, 0 ), /* 420 420 */
+ S_ST( 'r', 0, 0, 0 ), /* 421 421 */
+ S_ST( 's', 0, 0, 0 ), /* 422 422 */
+ S_ST( 'p', 1, 0, 0 ), /* 423 423 */
+ S_ST( 'e', 0, 0, 0 ), /* 424 424 */
+ S_ST( 'y', 0, 0, 0 ), /* 425 425 */
+ S_ST( 'l', 0, 0, 0 ), /* 426 426 */
+ S_ST( 'e', 0, 0, 0 ), /* 427 427 */
+ S_ST( 'e', 3, 331, 0 ), /* 428 limit */
S_ST( 'y', 0, 0, 0 ), /* 429 429 */
S_ST( 'y', 0, 0, 0 ), /* 430 430 */
- S_ST( 'g', 1, 0, 0 ), /* 431 431 */
- S_ST( 'r', 1, 832, 0 ), /* 432 432 */
- S_ST( 'n', 0, 0, 0 ), /* 433 433 */
- S_ST( 'n', 3, 332, 315 ), /* 434 li */
- S_ST( 'k', 0, 0, 0 ), /* 435 435 */
- S_ST( 'd', 0, 0, 0 ), /* 436 436 */
- S_ST( 'e', 0, 0, 0 ), /* 437 437 */
- S_ST( 'r', 0, 0, 0 ), /* 438 438 */
- S_ST( 's', 3, 440, 434 ), /* 439 li */
- S_ST( 't', 3, 451, 0 ), /* 440 lis */
- S_ST( 'e', 0, 0, 0 ), /* 441 441 */
- S_ST( 'y', 0, 0, 0 ), /* 442 442 */
- S_ST( 'n', 0, 0, 0 ), /* 443 443 */
- S_ST( 't', 0, 0, 0 ), /* 444 444 */
- S_ST( 'n', 0, 0, 0 ), /* 445 445 */
- S_ST( 't', 0, 0, 0 ), /* 446 446 */
- S_ST( 'r', 0, 0, 0 ), /* 447 447 */
+ S_ST( 'y', 0, 0, 0 ), /* 431 431 */
+ S_ST( 'g', 1, 0, 0 ), /* 432 432 */
+ S_ST( 'r', 1, 851, 0 ), /* 433 433 */
+ S_ST( 'n', 0, 0, 0 ), /* 434 434 */
+ S_ST( 'n', 3, 332, 315 ), /* 435 li */
+ S_ST( 'k', 0, 0, 0 ), /* 436 436 */
+ S_ST( 'd', 0, 0, 0 ), /* 437 437 */
+ S_ST( 'e', 0, 0, 0 ), /* 438 438 */
+ S_ST( 'r', 0, 0, 0 ), /* 439 439 */
+ S_ST( 's', 3, 441, 435 ), /* 440 li */
+ S_ST( 't', 3, 452, 0 ), /* 441 lis */
+ S_ST( 'e', 0, 0, 0 ), /* 442 442 */
+ S_ST( 'y', 0, 0, 0 ), /* 443 443 */
+ S_ST( 'n', 0, 0, 0 ), /* 444 444 */
+ S_ST( 't', 0, 0, 0 ), /* 445 445 */
+ S_ST( 'n', 0, 0, 0 ), /* 446 446 */
+ S_ST( 't', 0, 0, 0 ), /* 447 447 */
S_ST( 'r', 0, 0, 0 ), /* 448 448 */
- S_ST( 'y', 0, 0, 0 ), /* 449 449 */
+ S_ST( 'r', 0, 0, 0 ), /* 449 449 */
S_ST( 'y', 0, 0, 0 ), /* 450 450 */
- S_ST( 'e', 3, 333, 0 ), /* 451 list */
- S_ST( 'o', 3, 468, 293 ), /* 452 l */
- S_ST( 'g', 3, 459, 0 ), /* 453 lo */
- S_ST( 'c', 3, 455, 0 ), /* 454 log */
- S_ST( 'o', 3, 456, 0 ), /* 455 logc */
- S_ST( 'n', 3, 457, 0 ), /* 456 logco */
- S_ST( 'f', 3, 458, 0 ), /* 457 logcon */
- S_ST( 'i', 3, 334, 0 ), /* 458 logconf */
- S_ST( 'f', 3, 460, 454 ), /* 459 log */
- S_ST( 'i', 3, 461, 0 ), /* 460 logf */
- S_ST( 'l', 3, 335, 0 ), /* 461 logfi */
- S_ST( 'o', 3, 463, 453 ), /* 462 lo */
- S_ST( 'p', 3, 464, 0 ), /* 463 loo */
- S_ST( 's', 3, 465, 0 ), /* 464 loop */
- S_ST( 't', 3, 466, 0 ), /* 465 loops */
- S_ST( 'a', 3, 467, 0 ), /* 466 loopst */
- S_ST( 't', 3, 336, 0 ), /* 467 loopsta */
- S_ST( 'w', 3, 469, 462 ), /* 468 lo */
- S_ST( 'p', 3, 470, 0 ), /* 469 low */
- S_ST( 'r', 3, 471, 0 ), /* 470 lowp */
- S_ST( 'i', 3, 472, 0 ), /* 471 lowpr */
- S_ST( 'o', 3, 473, 0 ), /* 472 lowpri */
- S_ST( 't', 3, 474, 0 ), /* 473 lowprio */
- S_ST( 'r', 3, 475, 0 ), /* 474 lowpriot */
- S_ST( 'a', 3, 337, 0 ), /* 475 lowpriotr */
- S_ST( 'm', 3, 557, 239 ), /* 476 */
- S_ST( 'a', 3, 495, 0 ), /* 477 m */
- S_ST( 'n', 3, 479, 0 ), /* 478 ma */
- S_ST( 'y', 3, 480, 0 ), /* 479 man */
- S_ST( 'c', 3, 481, 0 ), /* 480 many */
- S_ST( 'a', 3, 482, 0 ), /* 481 manyc */
- S_ST( 's', 3, 483, 0 ), /* 482 manyca */
- S_ST( 't', 3, 489, 0 ), /* 483 manycas */
- S_ST( 'c', 3, 485, 0 ), /* 484 manycast */
- S_ST( 'l', 3, 486, 0 ), /* 485 manycastc */
- S_ST( 'i', 3, 487, 0 ), /* 486 manycastcl */
- S_ST( 'e', 3, 488, 0 ), /* 487 manycastcli */
- S_ST( 'n', 3, 338, 0 ), /* 488 manycastclie */
- S_ST( 's', 3, 490, 484 ), /* 489 manycast */
- S_ST( 'e', 3, 491, 0 ), /* 490 manycasts */
- S_ST( 'r', 3, 492, 0 ), /* 491 manycastse */
- S_ST( 'v', 3, 493, 0 ), /* 492 manycastser */
- S_ST( 'e', 3, 339, 0 ), /* 493 manycastserv */
- S_ST( 's', 3, 340, 478 ), /* 494 ma */
- S_ST( 'x', 3, 510, 494 ), /* 495 ma */
- S_ST( 'a', 3, 497, 0 ), /* 496 max */
- S_ST( 'g', 3, 341, 0 ), /* 497 maxa */
- S_ST( 'c', 3, 499, 496 ), /* 498 max */
- S_ST( 'l', 3, 500, 0 ), /* 499 maxc */
- S_ST( 'o', 3, 501, 0 ), /* 500 maxcl */
- S_ST( 'c', 3, 342, 0 ), /* 501 maxclo */
- S_ST( 'd', 3, 506, 498 ), /* 502 max */
- S_ST( 'e', 3, 504, 0 ), /* 503 maxd */
- S_ST( 'p', 3, 505, 0 ), /* 504 maxde */
- S_ST( 't', 3, 343, 0 ), /* 505 maxdep */
- S_ST( 'i', 3, 507, 503 ), /* 506 maxd */
- S_ST( 's', 3, 344, 0 ), /* 507 maxdi */
- S_ST( 'm', 3, 509, 502 ), /* 508 max */
- S_ST( 'e', 3, 345, 0 ), /* 509 maxm */
- S_ST( 'p', 3, 511, 508 ), /* 510 max */
- S_ST( 'o', 3, 512, 0 ), /* 511 maxp */
- S_ST( 'l', 3, 346, 0 ), /* 512 maxpo */
- S_ST( 'd', 3, 514, 477 ), /* 513 m */
- S_ST( 'n', 3, 515, 0 ), /* 514 md */
- S_ST( 's', 3, 516, 0 ), /* 515 mdn */
- S_ST( 't', 3, 517, 0 ), /* 516 mdns */
- S_ST( 'r', 3, 518, 0 ), /* 517 mdnst */
- S_ST( 'i', 3, 519, 0 ), /* 518 mdnstr */
- S_ST( 'e', 3, 347, 0 ), /* 519 mdnstri */
- S_ST( 'e', 3, 348, 513 ), /* 520 m */
- S_ST( 'l', 3, 522, 0 ), /* 521 mem */
- S_ST( 'o', 3, 523, 0 ), /* 522 meml */
- S_ST( 'c', 3, 349, 0 ), /* 523 memlo */
- S_ST( 'i', 3, 525, 520 ), /* 524 m */
- S_ST( 'n', 3, 542, 0 ), /* 525 mi */
- S_ST( 'c', 3, 527, 0 ), /* 526 min */
- S_ST( 'l', 3, 528, 0 ), /* 527 minc */
- S_ST( 'o', 3, 529, 0 ), /* 528 mincl */
- S_ST( 'c', 3, 350, 0 ), /* 529 minclo */
- S_ST( 'd', 3, 534, 526 ), /* 530 min */
- S_ST( 'e', 3, 532, 0 ), /* 531 mind */
- S_ST( 'p', 3, 533, 0 ), /* 532 minde */
- S_ST( 't', 3, 351, 0 ), /* 533 mindep */
- S_ST( 'i', 3, 535, 531 ), /* 534 mind */
- S_ST( 's', 3, 352, 0 ), /* 535 mindi */
- S_ST( 'i', 3, 537, 530 ), /* 536 min */
- S_ST( 'm', 3, 538, 0 ), /* 537 mini */
- S_ST( 'u', 3, 353, 0 ), /* 538 minim */
- S_ST( 'p', 3, 540, 536 ), /* 539 min */
- S_ST( 'o', 3, 541, 0 ), /* 540 minp */
- S_ST( 'l', 3, 354, 0 ), /* 541 minpo */
- S_ST( 's', 3, 543, 539 ), /* 542 min */
- S_ST( 'a', 3, 544, 0 ), /* 543 mins */
- S_ST( 'n', 3, 355, 0 ), /* 544 minsa */
- S_ST( 'o', 3, 547, 524 ), /* 545 m */
- S_ST( 'd', 3, 356, 0 ), /* 546 mo */
- S_ST( 'n', 3, 551, 546 ), /* 547 mo */
- S_ST( 'i', 3, 549, 0 ), /* 548 mon */
- S_ST( 't', 3, 550, 0 ), /* 549 moni */
- S_ST( 'o', 3, 358, 0 ), /* 550 monit */
- S_ST( 't', 3, 359, 548 ), /* 551 mon */
- S_ST( 'r', 3, 360, 545 ), /* 552 m */
- S_ST( 's', 3, 554, 552 ), /* 553 m */
- S_ST( 's', 3, 555, 0 ), /* 554 ms */
- S_ST( 'n', 3, 556, 0 ), /* 555 mss */
- S_ST( 't', 3, 328, 0 ), /* 556 mssn */
- S_ST( 'u', 3, 558, 553 ), /* 557 m */
- S_ST( 'l', 3, 559, 0 ), /* 558 mu */
- S_ST( 't', 3, 560, 0 ), /* 559 mul */
- S_ST( 'i', 3, 561, 0 ), /* 560 mult */
- S_ST( 'c', 3, 562, 0 ), /* 561 multi */
- S_ST( 'a', 3, 563, 0 ), /* 562 multic */
- S_ST( 's', 3, 564, 0 ), /* 563 multica */
- S_ST( 't', 3, 565, 0 ), /* 564 multicas */
- S_ST( 'c', 3, 566, 0 ), /* 565 multicast */
- S_ST( 'l', 3, 567, 0 ), /* 566 multicastc */
- S_ST( 'i', 3, 568, 0 ), /* 567 multicastcl */
- S_ST( 'e', 3, 569, 0 ), /* 568 multicastcli */
- S_ST( 'n', 3, 361, 0 ), /* 569 multicastclie */
- S_ST( 'n', 3, 613, 476 ), /* 570 */
- S_ST( 'i', 3, 362, 0 ), /* 571 n */
- S_ST( 'o', 3, 608, 571 ), /* 572 n */
- S_ST( 'l', 3, 574, 0 ), /* 573 no */
- S_ST( 'i', 3, 575, 0 ), /* 574 nol */
- S_ST( 'n', 3, 363, 0 ), /* 575 noli */
- S_ST( 'm', 3, 581, 573 ), /* 576 no */
- S_ST( 'o', 3, 578, 0 ), /* 577 nom */
- S_ST( 'd', 3, 579, 0 ), /* 578 nomo */
- S_ST( 'i', 3, 580, 0 ), /* 579 nomod */
- S_ST( 'f', 3, 364, 0 ), /* 580 nomodi */
- S_ST( 'r', 3, 582, 577 ), /* 581 nom */
- S_ST( 'u', 3, 583, 0 ), /* 582 nomr */
- S_ST( 'l', 3, 584, 0 ), /* 583 nomru */
- S_ST( 'i', 3, 585, 0 ), /* 584 nomrul */
- S_ST( 's', 3, 365, 0 ), /* 585 nomruli */
- S_ST( 'n', 3, 587, 576 ), /* 586 no */
- S_ST( 'v', 3, 588, 366 ), /* 587 non */
- S_ST( 'o', 3, 589, 0 ), /* 588 nonv */
- S_ST( 'l', 3, 590, 0 ), /* 589 nonvo */
- S_ST( 'a', 3, 591, 0 ), /* 590 nonvol */
- S_ST( 't', 3, 592, 0 ), /* 591 nonvola */
- S_ST( 'i', 3, 593, 0 ), /* 592 nonvolat */
- S_ST( 'l', 3, 367, 0 ), /* 593 nonvolati */
- S_ST( 'p', 3, 595, 586 ), /* 594 no */
- S_ST( 'e', 3, 596, 0 ), /* 595 nop */
- S_ST( 'e', 3, 368, 0 ), /* 596 nope */
- S_ST( 'q', 3, 598, 594 ), /* 597 no */
- S_ST( 'u', 3, 599, 0 ), /* 598 noq */
- S_ST( 'e', 3, 600, 0 ), /* 599 noqu */
- S_ST( 'r', 3, 369, 0 ), /* 600 noque */
- S_ST( 's', 3, 602, 597 ), /* 601 no */
- S_ST( 'e', 3, 606, 0 ), /* 602 nos */
- S_ST( 'l', 3, 604, 0 ), /* 603 nose */
- S_ST( 'e', 3, 605, 0 ), /* 604 nosel */
- S_ST( 'c', 3, 370, 0 ), /* 605 nosele */
- S_ST( 'r', 3, 607, 603 ), /* 606 nose */
- S_ST( 'v', 3, 371, 0 ), /* 607 noser */
- S_ST( 't', 3, 609, 601 ), /* 608 no */
- S_ST( 'r', 3, 611, 0 ), /* 609 not */
- S_ST( 'a', 3, 372, 0 ), /* 610 notr */
- S_ST( 'u', 3, 612, 610 ), /* 611 notr */
- S_ST( 's', 3, 373, 0 ), /* 612 notru */
- S_ST( 't', 3, 374, 572 ), /* 613 n */
- S_ST( 'p', 3, 615, 0 ), /* 614 ntp */
- S_ST( 'o', 3, 616, 0 ), /* 615 ntpp */
- S_ST( 'r', 3, 375, 0 ), /* 616 ntppo */
- S_ST( 's', 3, 618, 614 ), /* 617 ntp */
- S_ST( 'i', 3, 619, 0 ), /* 618 ntps */
- S_ST( 'g', 3, 620, 0 ), /* 619 ntpsi */
- S_ST( 'n', 3, 621, 0 ), /* 620 ntpsig */
- S_ST( 'd', 3, 622, 0 ), /* 621 ntpsign */
- S_ST( 's', 3, 623, 0 ), /* 622 ntpsignd */
- S_ST( 'o', 3, 624, 0 ), /* 623 ntpsignds */
- S_ST( 'c', 3, 625, 0 ), /* 624 ntpsigndso */
- S_ST( 'k', 3, 626, 0 ), /* 625 ntpsigndsoc */
- S_ST( 'e', 3, 376, 0 ), /* 626 ntpsigndsock */
- S_ST( 'o', 3, 628, 570 ), /* 627 */
- S_ST( 'r', 3, 629, 0 ), /* 628 o */
- S_ST( 'p', 3, 630, 0 ), /* 629 or */
- S_ST( 'h', 3, 631, 0 ), /* 630 orp */
- S_ST( 'a', 3, 377, 0 ), /* 631 orph */
- S_ST( 'w', 3, 633, 0 ), /* 632 orphan */
- S_ST( 'a', 3, 634, 0 ), /* 633 orphanw */
- S_ST( 'i', 3, 378, 0 ), /* 634 orphanwa */
- S_ST( 'p', 3, 390, 627 ), /* 635 */
- S_ST( 'a', 3, 637, 0 ), /* 636 p */
- S_ST( 'n', 3, 638, 0 ), /* 637 pa */
- S_ST( 'i', 3, 379, 0 ), /* 638 pan */
- S_ST( 'e', 3, 640, 636 ), /* 639 p */
- S_ST( 'e', 3, 380, 0 ), /* 640 pe */
- S_ST( 's', 3, 642, 0 ), /* 641 peer */
- S_ST( 't', 3, 643, 0 ), /* 642 peers */
- S_ST( 'a', 3, 644, 0 ), /* 643 peerst */
- S_ST( 't', 3, 381, 0 ), /* 644 peersta */
- S_ST( 'h', 3, 646, 639 ), /* 645 p */
- S_ST( 'o', 3, 647, 0 ), /* 646 ph */
- S_ST( 'n', 3, 382, 0 ), /* 647 pho */
- S_ST( 'i', 3, 383, 645 ), /* 648 p */
- S_ST( 'f', 3, 650, 0 ), /* 649 pid */
- S_ST( 'i', 3, 651, 0 ), /* 650 pidf */
- S_ST( 'l', 3, 384, 0 ), /* 651 pidfi */
- S_ST( 'o', 3, 654, 648 ), /* 652 p */
- S_ST( 'o', 3, 385, 0 ), /* 653 po */
- S_ST( 'r', 3, 386, 653 ), /* 654 po */
- S_ST( 'r', 3, 662, 652 ), /* 655 p */
- S_ST( 'e', 3, 660, 0 ), /* 656 pr */
- S_ST( 'e', 3, 658, 0 ), /* 657 pre */
- S_ST( 'm', 3, 659, 0 ), /* 658 pree */
- S_ST( 'p', 3, 387, 0 ), /* 659 preem */
- S_ST( 'f', 3, 661, 657 ), /* 660 pre */
- S_ST( 'e', 3, 388, 0 ), /* 661 pref */
- S_ST( 'o', 3, 675, 656 ), /* 662 pr */
- S_ST( 'c', 3, 664, 0 ), /* 663 pro */
- S_ST( '_', 3, 665, 0 ), /* 664 proc */
- S_ST( 'd', 3, 666, 0 ), /* 665 proc_ */
- S_ST( 'e', 3, 667, 0 ), /* 666 proc_d */
- S_ST( 'l', 3, 668, 0 ), /* 667 proc_de */
- S_ST( 'a', 3, 450, 0 ), /* 668 proc_del */
- S_ST( 'p', 3, 670, 663 ), /* 669 pro */
- S_ST( '_', 3, 671, 0 ), /* 670 prop */
- S_ST( 'd', 3, 672, 0 ), /* 671 prop_ */
- S_ST( 'e', 3, 673, 0 ), /* 672 prop_d */
- S_ST( 'l', 3, 674, 0 ), /* 673 prop_de */
- S_ST( 'a', 3, 449, 0 ), /* 674 prop_del */
- S_ST( 't', 3, 676, 669 ), /* 675 pro */
- S_ST( 'o', 3, 677, 0 ), /* 676 prot */
- S_ST( 's', 3, 678, 0 ), /* 677 proto */
- S_ST( 't', 3, 679, 0 ), /* 678 protos */
- S_ST( 'a', 3, 680, 0 ), /* 679 protost */
- S_ST( 't', 3, 389, 0 ), /* 680 protosta */
- S_ST( 'r', 3, 712, 635 ), /* 681 */
- S_ST( 'a', 3, 688, 0 ), /* 682 r */
- S_ST( 'n', 3, 684, 0 ), /* 683 ra */
- S_ST( 'd', 3, 685, 0 ), /* 684 ran */
- S_ST( 'f', 3, 686, 0 ), /* 685 rand */
- S_ST( 'i', 3, 687, 0 ), /* 686 randf */
- S_ST( 'l', 3, 391, 0 ), /* 687 randfi */
- S_ST( 'w', 3, 689, 683 ), /* 688 ra */
- S_ST( 's', 3, 690, 0 ), /* 689 raw */
- S_ST( 't', 3, 691, 0 ), /* 690 raws */
- S_ST( 'a', 3, 692, 0 ), /* 691 rawst */
- S_ST( 't', 3, 392, 0 ), /* 692 rawsta */
- S_ST( 'e', 3, 709, 682 ), /* 693 r */
- S_ST( 'f', 3, 695, 0 ), /* 694 re */
- S_ST( 'i', 3, 393, 0 ), /* 695 ref */
- S_ST( 'q', 3, 697, 694 ), /* 696 re */
- S_ST( 'u', 3, 698, 0 ), /* 697 req */
- S_ST( 'e', 3, 699, 0 ), /* 698 requ */
- S_ST( 's', 3, 700, 0 ), /* 699 reque */
- S_ST( 't', 3, 701, 0 ), /* 700 reques */
- S_ST( 'k', 3, 702, 0 ), /* 701 request */
- S_ST( 'e', 3, 394, 0 ), /* 702 requestk */
- S_ST( 's', 3, 705, 696 ), /* 703 re */
- S_ST( 'e', 3, 395, 0 ), /* 704 res */
- S_ST( 't', 3, 706, 704 ), /* 705 res */
- S_ST( 'r', 3, 707, 0 ), /* 706 rest */
- S_ST( 'i', 3, 708, 0 ), /* 707 restr */
- S_ST( 'c', 3, 396, 0 ), /* 708 restri */
- S_ST( 'v', 3, 710, 703 ), /* 709 re */
- S_ST( 'o', 3, 711, 0 ), /* 710 rev */
- S_ST( 'k', 3, 397, 0 ), /* 711 revo */
- S_ST( 'l', 3, 713, 693 ), /* 712 r */
- S_ST( 'i', 3, 714, 0 ), /* 713 rl */
- S_ST( 'm', 3, 715, 0 ), /* 714 rli */
- S_ST( 'i', 3, 398, 0 ), /* 715 rlim */
- S_ST( 's', 3, 789, 681 ), /* 716 */
- S_ST( 'a', 3, 718, 0 ), /* 717 s */
- S_ST( 'v', 3, 719, 0 ), /* 718 sa */
- S_ST( 'e', 3, 720, 0 ), /* 719 sav */
- S_ST( 'c', 3, 721, 0 ), /* 720 save */
- S_ST( 'o', 3, 722, 0 ), /* 721 savec */
- S_ST( 'n', 3, 723, 0 ), /* 722 saveco */
- S_ST( 'f', 3, 724, 0 ), /* 723 savecon */
- S_ST( 'i', 3, 725, 0 ), /* 724 saveconf */
- S_ST( 'g', 3, 726, 0 ), /* 725 saveconfi */
- S_ST( 'd', 3, 727, 0 ), /* 726 saveconfig */
- S_ST( 'i', 3, 399, 0 ), /* 727 saveconfigd */
- S_ST( 'e', 3, 738, 717 ), /* 728 s */
- S_ST( 'r', 3, 730, 0 ), /* 729 se */
- S_ST( 'v', 3, 731, 0 ), /* 730 ser */
- S_ST( 'e', 3, 400, 0 ), /* 731 serv */
- S_ST( '_', 3, 733, 0 ), /* 732 server */
- S_ST( 'o', 3, 734, 0 ), /* 733 server_ */
- S_ST( 'f', 3, 735, 0 ), /* 734 server_o */
- S_ST( 'f', 3, 736, 0 ), /* 735 server_of */
- S_ST( 's', 3, 737, 0 ), /* 736 server_off */
- S_ST( 'e', 3, 444, 0 ), /* 737 server_offs */
- S_ST( 't', 3, 739, 729 ), /* 738 se */
- S_ST( 'v', 3, 740, 0 ), /* 739 set */
- S_ST( 'a', 3, 401, 0 ), /* 740 setv */
- S_ST( 'i', 3, 742, 728 ), /* 741 s */
- S_ST( 'm', 3, 743, 0 ), /* 742 si */
- S_ST( 'u', 3, 744, 0 ), /* 743 sim */
- S_ST( 'l', 3, 745, 0 ), /* 744 simu */
- S_ST( 'a', 3, 746, 0 ), /* 745 simul */
- S_ST( 't', 3, 747, 0 ), /* 746 simula */
- S_ST( 'i', 3, 748, 441 ), /* 747 simulat */
- S_ST( 'o', 3, 749, 0 ), /* 748 simulati */
- S_ST( 'n', 3, 750, 0 ), /* 749 simulatio */
- S_ST( '_', 3, 751, 0 ), /* 750 simulation */
- S_ST( 'd', 3, 752, 0 ), /* 751 simulation_ */
- S_ST( 'u', 3, 753, 0 ), /* 752 simulation_d */
- S_ST( 'r', 3, 754, 0 ), /* 753 simulation_du */
- S_ST( 'a', 3, 755, 0 ), /* 754 simulation_dur */
- S_ST( 't', 3, 756, 0 ), /* 755 simulation_dura */
- S_ST( 'i', 3, 757, 0 ), /* 756 simulation_durat */
- S_ST( 'o', 3, 443, 0 ), /* 757 simulation_durati */
- S_ST( 'o', 3, 759, 741 ), /* 758 s */
- S_ST( 'u', 3, 760, 0 ), /* 759 so */
- S_ST( 'r', 3, 761, 0 ), /* 760 sou */
- S_ST( 'c', 3, 402, 0 ), /* 761 sour */
- S_ST( 't', 3, 785, 758 ), /* 762 s */
- S_ST( 'a', 3, 769, 0 ), /* 763 st */
- S_ST( 'c', 3, 765, 0 ), /* 764 sta */
- S_ST( 'k', 3, 766, 0 ), /* 765 stac */
- S_ST( 's', 3, 767, 0 ), /* 766 stack */
- S_ST( 'i', 3, 768, 0 ), /* 767 stacks */
- S_ST( 'z', 3, 403, 0 ), /* 768 stacksi */
- S_ST( 't', 3, 405, 764 ), /* 769 sta */
- S_ST( 'i', 3, 771, 0 ), /* 770 stat */
- S_ST( 's', 3, 772, 0 ), /* 771 stati */
- S_ST( 't', 3, 773, 0 ), /* 772 statis */
- S_ST( 'i', 3, 774, 0 ), /* 773 statist */
- S_ST( 'c', 3, 404, 0 ), /* 774 statisti */
- S_ST( 'd', 3, 776, 0 ), /* 775 stats */
- S_ST( 'i', 3, 406, 0 ), /* 776 statsd */
- S_ST( 'e', 3, 407, 763 ), /* 777 st */
- S_ST( 'b', 3, 779, 0 ), /* 778 step */
- S_ST( 'a', 3, 780, 0 ), /* 779 stepb */
- S_ST( 'c', 3, 408, 0 ), /* 780 stepba */
- S_ST( 'f', 3, 782, 778 ), /* 781 step */
- S_ST( 'w', 3, 409, 0 ), /* 782 stepf */
- S_ST( 'o', 3, 784, 781 ), /* 783 step */
- S_ST( 'u', 3, 410, 0 ), /* 784 stepo */
- S_ST( 'r', 3, 786, 777 ), /* 785 st */
- S_ST( 'a', 3, 787, 0 ), /* 786 str */
- S_ST( 't', 3, 788, 0 ), /* 787 stra */
- S_ST( 'u', 3, 411, 0 ), /* 788 strat */
- S_ST( 'y', 3, 413, 762 ), /* 789 s */
- S_ST( 's', 3, 791, 0 ), /* 790 sys */
- S_ST( 't', 3, 792, 0 ), /* 791 syss */
- S_ST( 'a', 3, 793, 0 ), /* 792 sysst */
- S_ST( 't', 3, 414, 0 ), /* 793 syssta */
- S_ST( 't', 3, 820, 716 ), /* 794 */
- S_ST( 'i', 3, 806, 0 ), /* 795 t */
- S_ST( 'c', 3, 415, 0 ), /* 796 ti */
- S_ST( 'm', 3, 799, 796 ), /* 797 ti */
- S_ST( 'e', 3, 418, 0 ), /* 798 tim */
- S_ST( 'i', 3, 800, 798 ), /* 799 tim */
- S_ST( 'n', 3, 801, 0 ), /* 800 timi */
- S_ST( 'g', 3, 802, 0 ), /* 801 timin */
- S_ST( 's', 3, 803, 0 ), /* 802 timing */
- S_ST( 't', 3, 804, 0 ), /* 803 timings */
- S_ST( 'a', 3, 805, 0 ), /* 804 timingst */
- S_ST( 't', 3, 419, 0 ), /* 805 timingsta */
- S_ST( 'n', 3, 807, 797 ), /* 806 ti */
- S_ST( 'k', 3, 808, 0 ), /* 807 tin */
- S_ST( 'e', 3, 420, 0 ), /* 808 tink */
- S_ST( 'o', 3, 421, 795 ), /* 809 t */
- S_ST( 'r', 3, 812, 809 ), /* 810 t */
- S_ST( 'a', 3, 422, 0 ), /* 811 tr */
- S_ST( 'u', 3, 813, 811 ), /* 812 tr */
- S_ST( 's', 3, 814, 423 ), /* 813 tru */
- S_ST( 't', 3, 815, 0 ), /* 814 trus */
- S_ST( 'e', 3, 816, 0 ), /* 815 trust */
- S_ST( 'd', 3, 817, 0 ), /* 816 truste */
- S_ST( 'k', 3, 818, 0 ), /* 817 trusted */
- S_ST( 'e', 3, 424, 0 ), /* 818 trustedk */
- S_ST( 't', 3, 425, 810 ), /* 819 t */
- S_ST( 'y', 3, 821, 819 ), /* 820 t */
- S_ST( 'p', 3, 426, 0 ), /* 821 ty */
- S_ST( 'u', 3, 823, 794 ), /* 822 */
- S_ST( 'n', 3, 829, 0 ), /* 823 u */
- S_ST( 'c', 3, 825, 0 ), /* 824 un */
- S_ST( 'o', 3, 826, 0 ), /* 825 unc */
- S_ST( 'n', 3, 827, 0 ), /* 826 unco */
- S_ST( 'f', 3, 828, 0 ), /* 827 uncon */
- S_ST( 'i', 3, 431, 0 ), /* 828 unconf */
- S_ST( 'p', 3, 830, 824 ), /* 829 un */
- S_ST( 'e', 3, 831, 0 ), /* 830 unp */
- S_ST( 'e', 3, 432, 0 ), /* 831 unpe */
- S_ST( '_', 3, 852, 0 ), /* 832 unpeer */
- S_ST( 'c', 3, 834, 0 ), /* 833 unpeer_ */
- S_ST( 'r', 3, 835, 0 ), /* 834 unpeer_c */
- S_ST( 'y', 3, 836, 0 ), /* 835 unpeer_cr */
- S_ST( 'p', 3, 837, 0 ), /* 836 unpeer_cry */
- S_ST( 't', 3, 838, 0 ), /* 837 unpeer_cryp */
- S_ST( 'o', 3, 839, 0 ), /* 838 unpeer_crypt */
- S_ST( '_', 3, 844, 0 ), /* 839 unpeer_crypto */
- S_ST( 'e', 3, 841, 0 ), /* 840 unpeer_crypto_ */
- S_ST( 'a', 3, 842, 0 ), /* 841 unpeer_crypto_e */
- S_ST( 'r', 3, 843, 0 ), /* 842 unpeer_crypto_ea */
- S_ST( 'l', 3, 428, 0 ), /* 843 unpeer_crypto_ear */
- S_ST( 'n', 3, 845, 840 ), /* 844 unpeer_crypto_ */
- S_ST( 'a', 3, 846, 0 ), /* 845 unpeer_crypto_n */
- S_ST( 'k', 3, 847, 0 ), /* 846 unpeer_crypto_na */
- S_ST( '_', 3, 848, 0 ), /* 847 unpeer_crypto_nak */
- S_ST( 'e', 3, 849, 0 ), /* 848 unpeer_crypto_nak_ */
- S_ST( 'a', 3, 850, 0 ), /* 849 unpeer_crypto_nak_e */
- S_ST( 'r', 3, 851, 0 ), /* 850 unpeer_crypto_nak_ea */
- S_ST( 'l', 3, 429, 0 ), /* 851 unpeer_crypto_nak_ear */
- S_ST( 'd', 3, 853, 833 ), /* 852 unpeer_ */
- S_ST( 'i', 3, 854, 0 ), /* 853 unpeer_d */
- S_ST( 'g', 3, 855, 0 ), /* 854 unpeer_di */
- S_ST( 'e', 3, 856, 0 ), /* 855 unpeer_dig */
- S_ST( 's', 3, 857, 0 ), /* 856 unpeer_dige */
- S_ST( 't', 3, 858, 0 ), /* 857 unpeer_diges */
- S_ST( '_', 3, 859, 0 ), /* 858 unpeer_digest */
- S_ST( 'e', 3, 860, 0 ), /* 859 unpeer_digest_ */
- S_ST( 'a', 3, 861, 0 ), /* 860 unpeer_digest_e */
- S_ST( 'r', 3, 862, 0 ), /* 861 unpeer_digest_ea */
- S_ST( 'l', 3, 430, 0 ), /* 862 unpeer_digest_ear */
- S_ST( 'v', 3, 864, 822 ), /* 863 */
- S_ST( 'e', 3, 865, 0 ), /* 864 v */
- S_ST( 'r', 3, 866, 0 ), /* 865 ve */
- S_ST( 's', 3, 867, 0 ), /* 866 ver */
- S_ST( 'i', 3, 868, 0 ), /* 867 vers */
- S_ST( 'o', 3, 433, 0 ), /* 868 versi */
- S_ST( 'w', 3, 876, 863 ), /* 869 */
- S_ST( 'a', 3, 871, 0 ), /* 870 w */
- S_ST( 'n', 3, 872, 0 ), /* 871 wa */
- S_ST( 'd', 3, 873, 0 ), /* 872 wan */
- S_ST( 'e', 3, 447, 0 ), /* 873 wand */
- S_ST( 'e', 3, 875, 870 ), /* 874 w */
- S_ST( 'e', 3, 435, 0 ), /* 875 we */
- S_ST( 'i', 3, 877, 874 ), /* 876 w */
- S_ST( 'l', 3, 878, 0 ), /* 877 wi */
- S_ST( 'd', 3, 879, 0 ), /* 878 wil */
- S_ST( 'c', 3, 880, 0 ), /* 879 wild */
- S_ST( 'a', 3, 881, 0 ), /* 880 wildc */
- S_ST( 'r', 3, 436, 0 ), /* 881 wildca */
- S_ST( 'x', 3, 883, 869 ), /* 882 */
- S_ST( 'l', 3, 884, 0 ), /* 883 x */
- S_ST( 'e', 3, 885, 0 ), /* 884 xl */
- S_ST( 'a', 3, 886, 0 ), /* 885 xle */
- S_ST( 'v', 3, 437, 0 ), /* 886 xlea */
- S_ST( 'y', 3, 888, 882 ), /* 887 [initial state] */
- S_ST( 'e', 3, 889, 0 ), /* 888 y */
- S_ST( 'a', 3, 438, 0 ) /* 889 ye */
+ S_ST( 'y', 0, 0, 0 ), /* 451 451 */
+ S_ST( 'e', 3, 333, 0 ), /* 452 list */
+ S_ST( 'o', 3, 469, 293 ), /* 453 l */
+ S_ST( 'g', 3, 460, 0 ), /* 454 lo */
+ S_ST( 'c', 3, 456, 0 ), /* 455 log */
+ S_ST( 'o', 3, 457, 0 ), /* 456 logc */
+ S_ST( 'n', 3, 458, 0 ), /* 457 logco */
+ S_ST( 'f', 3, 459, 0 ), /* 458 logcon */
+ S_ST( 'i', 3, 334, 0 ), /* 459 logconf */
+ S_ST( 'f', 3, 461, 455 ), /* 460 log */
+ S_ST( 'i', 3, 462, 0 ), /* 461 logf */
+ S_ST( 'l', 3, 335, 0 ), /* 462 logfi */
+ S_ST( 'o', 3, 464, 454 ), /* 463 lo */
+ S_ST( 'p', 3, 465, 0 ), /* 464 loo */
+ S_ST( 's', 3, 466, 0 ), /* 465 loop */
+ S_ST( 't', 3, 467, 0 ), /* 466 loops */
+ S_ST( 'a', 3, 468, 0 ), /* 467 loopst */
+ S_ST( 't', 3, 336, 0 ), /* 468 loopsta */
+ S_ST( 'w', 3, 470, 463 ), /* 469 lo */
+ S_ST( 'p', 3, 471, 0 ), /* 470 low */
+ S_ST( 'r', 3, 472, 0 ), /* 471 lowp */
+ S_ST( 'i', 3, 473, 0 ), /* 472 lowpr */
+ S_ST( 'o', 3, 474, 0 ), /* 473 lowpri */
+ S_ST( 't', 3, 475, 0 ), /* 474 lowprio */
+ S_ST( 'r', 3, 476, 0 ), /* 475 lowpriot */
+ S_ST( 'a', 3, 337, 0 ), /* 476 lowpriotr */
+ S_ST( 'm', 3, 558, 239 ), /* 477 */
+ S_ST( 'a', 3, 496, 0 ), /* 478 m */
+ S_ST( 'n', 3, 480, 0 ), /* 479 ma */
+ S_ST( 'y', 3, 481, 0 ), /* 480 man */
+ S_ST( 'c', 3, 482, 0 ), /* 481 many */
+ S_ST( 'a', 3, 483, 0 ), /* 482 manyc */
+ S_ST( 's', 3, 484, 0 ), /* 483 manyca */
+ S_ST( 't', 3, 490, 0 ), /* 484 manycas */
+ S_ST( 'c', 3, 486, 0 ), /* 485 manycast */
+ S_ST( 'l', 3, 487, 0 ), /* 486 manycastc */
+ S_ST( 'i', 3, 488, 0 ), /* 487 manycastcl */
+ S_ST( 'e', 3, 489, 0 ), /* 488 manycastcli */
+ S_ST( 'n', 3, 338, 0 ), /* 489 manycastclie */
+ S_ST( 's', 3, 491, 485 ), /* 490 manycast */
+ S_ST( 'e', 3, 492, 0 ), /* 491 manycasts */
+ S_ST( 'r', 3, 493, 0 ), /* 492 manycastse */
+ S_ST( 'v', 3, 494, 0 ), /* 493 manycastser */
+ S_ST( 'e', 3, 339, 0 ), /* 494 manycastserv */
+ S_ST( 's', 3, 340, 479 ), /* 495 ma */
+ S_ST( 'x', 3, 511, 495 ), /* 496 ma */
+ S_ST( 'a', 3, 498, 0 ), /* 497 max */
+ S_ST( 'g', 3, 341, 0 ), /* 498 maxa */
+ S_ST( 'c', 3, 500, 497 ), /* 499 max */
+ S_ST( 'l', 3, 501, 0 ), /* 500 maxc */
+ S_ST( 'o', 3, 502, 0 ), /* 501 maxcl */
+ S_ST( 'c', 3, 342, 0 ), /* 502 maxclo */
+ S_ST( 'd', 3, 507, 499 ), /* 503 max */
+ S_ST( 'e', 3, 505, 0 ), /* 504 maxd */
+ S_ST( 'p', 3, 506, 0 ), /* 505 maxde */
+ S_ST( 't', 3, 343, 0 ), /* 506 maxdep */
+ S_ST( 'i', 3, 508, 504 ), /* 507 maxd */
+ S_ST( 's', 3, 344, 0 ), /* 508 maxdi */
+ S_ST( 'm', 3, 510, 503 ), /* 509 max */
+ S_ST( 'e', 3, 345, 0 ), /* 510 maxm */
+ S_ST( 'p', 3, 512, 509 ), /* 511 max */
+ S_ST( 'o', 3, 513, 0 ), /* 512 maxp */
+ S_ST( 'l', 3, 346, 0 ), /* 513 maxpo */
+ S_ST( 'd', 3, 515, 478 ), /* 514 m */
+ S_ST( 'n', 3, 516, 0 ), /* 515 md */
+ S_ST( 's', 3, 517, 0 ), /* 516 mdn */
+ S_ST( 't', 3, 518, 0 ), /* 517 mdns */
+ S_ST( 'r', 3, 519, 0 ), /* 518 mdnst */
+ S_ST( 'i', 3, 520, 0 ), /* 519 mdnstr */
+ S_ST( 'e', 3, 347, 0 ), /* 520 mdnstri */
+ S_ST( 'e', 3, 348, 514 ), /* 521 m */
+ S_ST( 'l', 3, 523, 0 ), /* 522 mem */
+ S_ST( 'o', 3, 524, 0 ), /* 523 meml */
+ S_ST( 'c', 3, 349, 0 ), /* 524 memlo */
+ S_ST( 'i', 3, 526, 521 ), /* 525 m */
+ S_ST( 'n', 3, 543, 0 ), /* 526 mi */
+ S_ST( 'c', 3, 528, 0 ), /* 527 min */
+ S_ST( 'l', 3, 529, 0 ), /* 528 minc */
+ S_ST( 'o', 3, 530, 0 ), /* 529 mincl */
+ S_ST( 'c', 3, 350, 0 ), /* 530 minclo */
+ S_ST( 'd', 3, 535, 527 ), /* 531 min */
+ S_ST( 'e', 3, 533, 0 ), /* 532 mind */
+ S_ST( 'p', 3, 534, 0 ), /* 533 minde */
+ S_ST( 't', 3, 351, 0 ), /* 534 mindep */
+ S_ST( 'i', 3, 536, 532 ), /* 535 mind */
+ S_ST( 's', 3, 352, 0 ), /* 536 mindi */
+ S_ST( 'i', 3, 538, 531 ), /* 537 min */
+ S_ST( 'm', 3, 539, 0 ), /* 538 mini */
+ S_ST( 'u', 3, 353, 0 ), /* 539 minim */
+ S_ST( 'p', 3, 541, 537 ), /* 540 min */
+ S_ST( 'o', 3, 542, 0 ), /* 541 minp */
+ S_ST( 'l', 3, 354, 0 ), /* 542 minpo */
+ S_ST( 's', 3, 544, 540 ), /* 543 min */
+ S_ST( 'a', 3, 545, 0 ), /* 544 mins */
+ S_ST( 'n', 3, 355, 0 ), /* 545 minsa */
+ S_ST( 'o', 3, 548, 525 ), /* 546 m */
+ S_ST( 'd', 3, 356, 0 ), /* 547 mo */
+ S_ST( 'n', 3, 552, 547 ), /* 548 mo */
+ S_ST( 'i', 3, 550, 0 ), /* 549 mon */
+ S_ST( 't', 3, 551, 0 ), /* 550 moni */
+ S_ST( 'o', 3, 358, 0 ), /* 551 monit */
+ S_ST( 't', 3, 359, 549 ), /* 552 mon */
+ S_ST( 'r', 3, 360, 546 ), /* 553 m */
+ S_ST( 's', 3, 555, 553 ), /* 554 m */
+ S_ST( 's', 3, 556, 0 ), /* 555 ms */
+ S_ST( 'n', 3, 557, 0 ), /* 556 mss */
+ S_ST( 't', 3, 328, 0 ), /* 557 mssn */
+ S_ST( 'u', 3, 559, 554 ), /* 558 m */
+ S_ST( 'l', 3, 560, 0 ), /* 559 mu */
+ S_ST( 't', 3, 561, 0 ), /* 560 mul */
+ S_ST( 'i', 3, 562, 0 ), /* 561 mult */
+ S_ST( 'c', 3, 563, 0 ), /* 562 multi */
+ S_ST( 'a', 3, 564, 0 ), /* 563 multic */
+ S_ST( 's', 3, 565, 0 ), /* 564 multica */
+ S_ST( 't', 3, 566, 0 ), /* 565 multicas */
+ S_ST( 'c', 3, 567, 0 ), /* 566 multicast */
+ S_ST( 'l', 3, 568, 0 ), /* 567 multicastc */
+ S_ST( 'i', 3, 569, 0 ), /* 568 multicastcl */
+ S_ST( 'e', 3, 570, 0 ), /* 569 multicastcli */
+ S_ST( 'n', 3, 361, 0 ), /* 570 multicastclie */
+ S_ST( 'n', 3, 614, 477 ), /* 571 */
+ S_ST( 'i', 3, 362, 0 ), /* 572 n */
+ S_ST( 'o', 3, 609, 572 ), /* 573 n */
+ S_ST( 'l', 3, 575, 0 ), /* 574 no */
+ S_ST( 'i', 3, 576, 0 ), /* 575 nol */
+ S_ST( 'n', 3, 363, 0 ), /* 576 noli */
+ S_ST( 'm', 3, 582, 574 ), /* 577 no */
+ S_ST( 'o', 3, 579, 0 ), /* 578 nom */
+ S_ST( 'd', 3, 580, 0 ), /* 579 nomo */
+ S_ST( 'i', 3, 581, 0 ), /* 580 nomod */
+ S_ST( 'f', 3, 364, 0 ), /* 581 nomodi */
+ S_ST( 'r', 3, 583, 578 ), /* 582 nom */
+ S_ST( 'u', 3, 584, 0 ), /* 583 nomr */
+ S_ST( 'l', 3, 585, 0 ), /* 584 nomru */
+ S_ST( 'i', 3, 586, 0 ), /* 585 nomrul */
+ S_ST( 's', 3, 365, 0 ), /* 586 nomruli */
+ S_ST( 'n', 3, 588, 577 ), /* 587 no */
+ S_ST( 'v', 3, 589, 366 ), /* 588 non */
+ S_ST( 'o', 3, 590, 0 ), /* 589 nonv */
+ S_ST( 'l', 3, 591, 0 ), /* 590 nonvo */
+ S_ST( 'a', 3, 592, 0 ), /* 591 nonvol */
+ S_ST( 't', 3, 593, 0 ), /* 592 nonvola */
+ S_ST( 'i', 3, 594, 0 ), /* 593 nonvolat */
+ S_ST( 'l', 3, 367, 0 ), /* 594 nonvolati */
+ S_ST( 'p', 3, 596, 587 ), /* 595 no */
+ S_ST( 'e', 3, 597, 0 ), /* 596 nop */
+ S_ST( 'e', 3, 368, 0 ), /* 597 nope */
+ S_ST( 'q', 3, 599, 595 ), /* 598 no */
+ S_ST( 'u', 3, 600, 0 ), /* 599 noq */
+ S_ST( 'e', 3, 601, 0 ), /* 600 noqu */
+ S_ST( 'r', 3, 369, 0 ), /* 601 noque */
+ S_ST( 's', 3, 603, 598 ), /* 602 no */
+ S_ST( 'e', 3, 607, 0 ), /* 603 nos */
+ S_ST( 'l', 3, 605, 0 ), /* 604 nose */
+ S_ST( 'e', 3, 606, 0 ), /* 605 nosel */
+ S_ST( 'c', 3, 370, 0 ), /* 606 nosele */
+ S_ST( 'r', 3, 608, 604 ), /* 607 nose */
+ S_ST( 'v', 3, 371, 0 ), /* 608 noser */
+ S_ST( 't', 3, 610, 602 ), /* 609 no */
+ S_ST( 'r', 3, 612, 0 ), /* 610 not */
+ S_ST( 'a', 3, 372, 0 ), /* 611 notr */
+ S_ST( 'u', 3, 613, 611 ), /* 612 notr */
+ S_ST( 's', 3, 373, 0 ), /* 613 notru */
+ S_ST( 't', 3, 374, 573 ), /* 614 n */
+ S_ST( 'p', 3, 616, 0 ), /* 615 ntp */
+ S_ST( 'o', 3, 617, 0 ), /* 616 ntpp */
+ S_ST( 'r', 3, 375, 0 ), /* 617 ntppo */
+ S_ST( 's', 3, 619, 615 ), /* 618 ntp */
+ S_ST( 'i', 3, 620, 0 ), /* 619 ntps */
+ S_ST( 'g', 3, 621, 0 ), /* 620 ntpsi */
+ S_ST( 'n', 3, 622, 0 ), /* 621 ntpsig */
+ S_ST( 'd', 3, 623, 0 ), /* 622 ntpsign */
+ S_ST( 's', 3, 624, 0 ), /* 623 ntpsignd */
+ S_ST( 'o', 3, 625, 0 ), /* 624 ntpsignds */
+ S_ST( 'c', 3, 626, 0 ), /* 625 ntpsigndso */
+ S_ST( 'k', 3, 627, 0 ), /* 626 ntpsigndsoc */
+ S_ST( 'e', 3, 376, 0 ), /* 627 ntpsigndsock */
+ S_ST( 'o', 3, 629, 571 ), /* 628 */
+ S_ST( 'r', 3, 630, 0 ), /* 629 o */
+ S_ST( 'p', 3, 631, 0 ), /* 630 or */
+ S_ST( 'h', 3, 632, 0 ), /* 631 orp */
+ S_ST( 'a', 3, 377, 0 ), /* 632 orph */
+ S_ST( 'w', 3, 634, 0 ), /* 633 orphan */
+ S_ST( 'a', 3, 635, 0 ), /* 634 orphanw */
+ S_ST( 'i', 3, 378, 0 ), /* 635 orphanwa */
+ S_ST( 'p', 3, 391, 628 ), /* 636 */
+ S_ST( 'a', 3, 638, 0 ), /* 637 p */
+ S_ST( 'n', 3, 639, 0 ), /* 638 pa */
+ S_ST( 'i', 3, 380, 0 ), /* 639 pan */
+ S_ST( 'e', 3, 641, 637 ), /* 640 p */
+ S_ST( 'e', 3, 381, 0 ), /* 641 pe */
+ S_ST( '_', 3, 643, 0 ), /* 642 peer */
+ S_ST( 'c', 3, 644, 0 ), /* 643 peer_ */
+ S_ST( 'l', 3, 645, 0 ), /* 644 peer_c */
+ S_ST( 'e', 3, 646, 0 ), /* 645 peer_cl */
+ S_ST( 'a', 3, 647, 0 ), /* 646 peer_cle */
+ S_ST( 'r', 3, 648, 0 ), /* 647 peer_clea */
+ S_ST( '_', 3, 649, 0 ), /* 648 peer_clear */
+ S_ST( 'd', 3, 650, 0 ), /* 649 peer_clear_ */
+ S_ST( 'i', 3, 651, 0 ), /* 650 peer_clear_d */
+ S_ST( 'g', 3, 652, 0 ), /* 651 peer_clear_di */
+ S_ST( 'e', 3, 653, 0 ), /* 652 peer_clear_dig */
+ S_ST( 's', 3, 654, 0 ), /* 653 peer_clear_dige */
+ S_ST( 't', 3, 655, 0 ), /* 654 peer_clear_diges */
+ S_ST( '_', 3, 656, 0 ), /* 655 peer_clear_digest */
+ S_ST( 'e', 3, 657, 0 ), /* 656 peer_clear_digest_ */
+ S_ST( 'a', 3, 658, 0 ), /* 657 peer_clear_digest_e */
+ S_ST( 'r', 3, 659, 0 ), /* 658 peer_clear_digest_ea */
+ S_ST( 'l', 3, 379, 0 ), /* 659 peer_clear_digest_ear */
+ S_ST( 's', 3, 661, 642 ), /* 660 peer */
+ S_ST( 't', 3, 662, 0 ), /* 661 peers */
+ S_ST( 'a', 3, 663, 0 ), /* 662 peerst */
+ S_ST( 't', 3, 382, 0 ), /* 663 peersta */
+ S_ST( 'h', 3, 665, 640 ), /* 664 p */
+ S_ST( 'o', 3, 666, 0 ), /* 665 ph */
+ S_ST( 'n', 3, 383, 0 ), /* 666 pho */
+ S_ST( 'i', 3, 384, 664 ), /* 667 p */
+ S_ST( 'f', 3, 669, 0 ), /* 668 pid */
+ S_ST( 'i', 3, 670, 0 ), /* 669 pidf */
+ S_ST( 'l', 3, 385, 0 ), /* 670 pidfi */
+ S_ST( 'o', 3, 673, 667 ), /* 671 p */
+ S_ST( 'o', 3, 386, 0 ), /* 672 po */
+ S_ST( 'r', 3, 387, 672 ), /* 673 po */
+ S_ST( 'r', 3, 681, 671 ), /* 674 p */
+ S_ST( 'e', 3, 679, 0 ), /* 675 pr */
+ S_ST( 'e', 3, 677, 0 ), /* 676 pre */
+ S_ST( 'm', 3, 678, 0 ), /* 677 pree */
+ S_ST( 'p', 3, 388, 0 ), /* 678 preem */
+ S_ST( 'f', 3, 680, 676 ), /* 679 pre */
+ S_ST( 'e', 3, 389, 0 ), /* 680 pref */
+ S_ST( 'o', 3, 694, 675 ), /* 681 pr */
+ S_ST( 'c', 3, 683, 0 ), /* 682 pro */
+ S_ST( '_', 3, 684, 0 ), /* 683 proc */
+ S_ST( 'd', 3, 685, 0 ), /* 684 proc_ */
+ S_ST( 'e', 3, 686, 0 ), /* 685 proc_d */
+ S_ST( 'l', 3, 687, 0 ), /* 686 proc_de */
+ S_ST( 'a', 3, 451, 0 ), /* 687 proc_del */
+ S_ST( 'p', 3, 689, 682 ), /* 688 pro */
+ S_ST( '_', 3, 690, 0 ), /* 689 prop */
+ S_ST( 'd', 3, 691, 0 ), /* 690 prop_ */
+ S_ST( 'e', 3, 692, 0 ), /* 691 prop_d */
+ S_ST( 'l', 3, 693, 0 ), /* 692 prop_de */
+ S_ST( 'a', 3, 450, 0 ), /* 693 prop_del */
+ S_ST( 't', 3, 695, 688 ), /* 694 pro */
+ S_ST( 'o', 3, 696, 0 ), /* 695 prot */
+ S_ST( 's', 3, 697, 0 ), /* 696 proto */
+ S_ST( 't', 3, 698, 0 ), /* 697 protos */
+ S_ST( 'a', 3, 699, 0 ), /* 698 protost */
+ S_ST( 't', 3, 390, 0 ), /* 699 protosta */
+ S_ST( 'r', 3, 731, 636 ), /* 700 */
+ S_ST( 'a', 3, 707, 0 ), /* 701 r */
+ S_ST( 'n', 3, 703, 0 ), /* 702 ra */
+ S_ST( 'd', 3, 704, 0 ), /* 703 ran */
+ S_ST( 'f', 3, 705, 0 ), /* 704 rand */
+ S_ST( 'i', 3, 706, 0 ), /* 705 randf */
+ S_ST( 'l', 3, 392, 0 ), /* 706 randfi */
+ S_ST( 'w', 3, 708, 702 ), /* 707 ra */
+ S_ST( 's', 3, 709, 0 ), /* 708 raw */
+ S_ST( 't', 3, 710, 0 ), /* 709 raws */
+ S_ST( 'a', 3, 711, 0 ), /* 710 rawst */
+ S_ST( 't', 3, 393, 0 ), /* 711 rawsta */
+ S_ST( 'e', 3, 728, 701 ), /* 712 r */
+ S_ST( 'f', 3, 714, 0 ), /* 713 re */
+ S_ST( 'i', 3, 394, 0 ), /* 714 ref */
+ S_ST( 'q', 3, 716, 713 ), /* 715 re */
+ S_ST( 'u', 3, 717, 0 ), /* 716 req */
+ S_ST( 'e', 3, 718, 0 ), /* 717 requ */
+ S_ST( 's', 3, 719, 0 ), /* 718 reque */
+ S_ST( 't', 3, 720, 0 ), /* 719 reques */
+ S_ST( 'k', 3, 721, 0 ), /* 720 request */
+ S_ST( 'e', 3, 395, 0 ), /* 721 requestk */
+ S_ST( 's', 3, 724, 715 ), /* 722 re */
+ S_ST( 'e', 3, 396, 0 ), /* 723 res */
+ S_ST( 't', 3, 725, 723 ), /* 724 res */
+ S_ST( 'r', 3, 726, 0 ), /* 725 rest */
+ S_ST( 'i', 3, 727, 0 ), /* 726 restr */
+ S_ST( 'c', 3, 397, 0 ), /* 727 restri */
+ S_ST( 'v', 3, 729, 722 ), /* 728 re */
+ S_ST( 'o', 3, 730, 0 ), /* 729 rev */
+ S_ST( 'k', 3, 398, 0 ), /* 730 revo */
+ S_ST( 'l', 3, 732, 712 ), /* 731 r */
+ S_ST( 'i', 3, 733, 0 ), /* 732 rl */
+ S_ST( 'm', 3, 734, 0 ), /* 733 rli */
+ S_ST( 'i', 3, 399, 0 ), /* 734 rlim */
+ S_ST( 's', 3, 808, 700 ), /* 735 */
+ S_ST( 'a', 3, 737, 0 ), /* 736 s */
+ S_ST( 'v', 3, 738, 0 ), /* 737 sa */
+ S_ST( 'e', 3, 739, 0 ), /* 738 sav */
+ S_ST( 'c', 3, 740, 0 ), /* 739 save */
+ S_ST( 'o', 3, 741, 0 ), /* 740 savec */
+ S_ST( 'n', 3, 742, 0 ), /* 741 saveco */
+ S_ST( 'f', 3, 743, 0 ), /* 742 savecon */
+ S_ST( 'i', 3, 744, 0 ), /* 743 saveconf */
+ S_ST( 'g', 3, 745, 0 ), /* 744 saveconfi */
+ S_ST( 'd', 3, 746, 0 ), /* 745 saveconfig */
+ S_ST( 'i', 3, 400, 0 ), /* 746 saveconfigd */
+ S_ST( 'e', 3, 757, 736 ), /* 747 s */
+ S_ST( 'r', 3, 749, 0 ), /* 748 se */
+ S_ST( 'v', 3, 750, 0 ), /* 749 ser */
+ S_ST( 'e', 3, 401, 0 ), /* 750 serv */
+ S_ST( '_', 3, 752, 0 ), /* 751 server */
+ S_ST( 'o', 3, 753, 0 ), /* 752 server_ */
+ S_ST( 'f', 3, 754, 0 ), /* 753 server_o */
+ S_ST( 'f', 3, 755, 0 ), /* 754 server_of */
+ S_ST( 's', 3, 756, 0 ), /* 755 server_off */
+ S_ST( 'e', 3, 445, 0 ), /* 756 server_offs */
+ S_ST( 't', 3, 758, 748 ), /* 757 se */
+ S_ST( 'v', 3, 759, 0 ), /* 758 set */
+ S_ST( 'a', 3, 402, 0 ), /* 759 setv */
+ S_ST( 'i', 3, 761, 747 ), /* 760 s */
+ S_ST( 'm', 3, 762, 0 ), /* 761 si */
+ S_ST( 'u', 3, 763, 0 ), /* 762 sim */
+ S_ST( 'l', 3, 764, 0 ), /* 763 simu */
+ S_ST( 'a', 3, 765, 0 ), /* 764 simul */
+ S_ST( 't', 3, 766, 0 ), /* 765 simula */
+ S_ST( 'i', 3, 767, 442 ), /* 766 simulat */
+ S_ST( 'o', 3, 768, 0 ), /* 767 simulati */
+ S_ST( 'n', 3, 769, 0 ), /* 768 simulatio */
+ S_ST( '_', 3, 770, 0 ), /* 769 simulation */
+ S_ST( 'd', 3, 771, 0 ), /* 770 simulation_ */
+ S_ST( 'u', 3, 772, 0 ), /* 771 simulation_d */
+ S_ST( 'r', 3, 773, 0 ), /* 772 simulation_du */
+ S_ST( 'a', 3, 774, 0 ), /* 773 simulation_dur */
+ S_ST( 't', 3, 775, 0 ), /* 774 simulation_dura */
+ S_ST( 'i', 3, 776, 0 ), /* 775 simulation_durat */
+ S_ST( 'o', 3, 444, 0 ), /* 776 simulation_durati */
+ S_ST( 'o', 3, 778, 760 ), /* 777 s */
+ S_ST( 'u', 3, 779, 0 ), /* 778 so */
+ S_ST( 'r', 3, 780, 0 ), /* 779 sou */
+ S_ST( 'c', 3, 403, 0 ), /* 780 sour */
+ S_ST( 't', 3, 804, 777 ), /* 781 s */
+ S_ST( 'a', 3, 788, 0 ), /* 782 st */
+ S_ST( 'c', 3, 784, 0 ), /* 783 sta */
+ S_ST( 'k', 3, 785, 0 ), /* 784 stac */
+ S_ST( 's', 3, 786, 0 ), /* 785 stack */
+ S_ST( 'i', 3, 787, 0 ), /* 786 stacks */
+ S_ST( 'z', 3, 404, 0 ), /* 787 stacksi */
+ S_ST( 't', 3, 406, 783 ), /* 788 sta */
+ S_ST( 'i', 3, 790, 0 ), /* 789 stat */
+ S_ST( 's', 3, 791, 0 ), /* 790 stati */
+ S_ST( 't', 3, 792, 0 ), /* 791 statis */
+ S_ST( 'i', 3, 793, 0 ), /* 792 statist */
+ S_ST( 'c', 3, 405, 0 ), /* 793 statisti */
+ S_ST( 'd', 3, 795, 0 ), /* 794 stats */
+ S_ST( 'i', 3, 407, 0 ), /* 795 statsd */
+ S_ST( 'e', 3, 408, 782 ), /* 796 st */
+ S_ST( 'b', 3, 798, 0 ), /* 797 step */
+ S_ST( 'a', 3, 799, 0 ), /* 798 stepb */
+ S_ST( 'c', 3, 409, 0 ), /* 799 stepba */
+ S_ST( 'f', 3, 801, 797 ), /* 800 step */
+ S_ST( 'w', 3, 410, 0 ), /* 801 stepf */
+ S_ST( 'o', 3, 803, 800 ), /* 802 step */
+ S_ST( 'u', 3, 411, 0 ), /* 803 stepo */
+ S_ST( 'r', 3, 805, 796 ), /* 804 st */
+ S_ST( 'a', 3, 806, 0 ), /* 805 str */
+ S_ST( 't', 3, 807, 0 ), /* 806 stra */
+ S_ST( 'u', 3, 412, 0 ), /* 807 strat */
+ S_ST( 'y', 3, 414, 781 ), /* 808 s */
+ S_ST( 's', 3, 810, 0 ), /* 809 sys */
+ S_ST( 't', 3, 811, 0 ), /* 810 syss */
+ S_ST( 'a', 3, 812, 0 ), /* 811 sysst */
+ S_ST( 't', 3, 415, 0 ), /* 812 syssta */
+ S_ST( 't', 3, 839, 735 ), /* 813 */
+ S_ST( 'i', 3, 825, 0 ), /* 814 t */
+ S_ST( 'c', 3, 416, 0 ), /* 815 ti */
+ S_ST( 'm', 3, 818, 815 ), /* 816 ti */
+ S_ST( 'e', 3, 419, 0 ), /* 817 tim */
+ S_ST( 'i', 3, 819, 817 ), /* 818 tim */
+ S_ST( 'n', 3, 820, 0 ), /* 819 timi */
+ S_ST( 'g', 3, 821, 0 ), /* 820 timin */
+ S_ST( 's', 3, 822, 0 ), /* 821 timing */
+ S_ST( 't', 3, 823, 0 ), /* 822 timings */
+ S_ST( 'a', 3, 824, 0 ), /* 823 timingst */
+ S_ST( 't', 3, 420, 0 ), /* 824 timingsta */
+ S_ST( 'n', 3, 826, 816 ), /* 825 ti */
+ S_ST( 'k', 3, 827, 0 ), /* 826 tin */
+ S_ST( 'e', 3, 421, 0 ), /* 827 tink */
+ S_ST( 'o', 3, 422, 814 ), /* 828 t */
+ S_ST( 'r', 3, 831, 828 ), /* 829 t */
+ S_ST( 'a', 3, 423, 0 ), /* 830 tr */
+ S_ST( 'u', 3, 832, 830 ), /* 831 tr */
+ S_ST( 's', 3, 833, 424 ), /* 832 tru */
+ S_ST( 't', 3, 834, 0 ), /* 833 trus */
+ S_ST( 'e', 3, 835, 0 ), /* 834 trust */
+ S_ST( 'd', 3, 836, 0 ), /* 835 truste */
+ S_ST( 'k', 3, 837, 0 ), /* 836 trusted */
+ S_ST( 'e', 3, 425, 0 ), /* 837 trustedk */
+ S_ST( 't', 3, 426, 829 ), /* 838 t */
+ S_ST( 'y', 3, 840, 838 ), /* 839 t */
+ S_ST( 'p', 3, 427, 0 ), /* 840 ty */
+ S_ST( 'u', 3, 842, 813 ), /* 841 */
+ S_ST( 'n', 3, 848, 0 ), /* 842 u */
+ S_ST( 'c', 3, 844, 0 ), /* 843 un */
+ S_ST( 'o', 3, 845, 0 ), /* 844 unc */
+ S_ST( 'n', 3, 846, 0 ), /* 845 unco */
+ S_ST( 'f', 3, 847, 0 ), /* 846 uncon */
+ S_ST( 'i', 3, 432, 0 ), /* 847 unconf */
+ S_ST( 'p', 3, 849, 843 ), /* 848 un */
+ S_ST( 'e', 3, 850, 0 ), /* 849 unp */
+ S_ST( 'e', 3, 433, 0 ), /* 850 unpe */
+ S_ST( '_', 3, 871, 0 ), /* 851 unpeer */
+ S_ST( 'c', 3, 853, 0 ), /* 852 unpeer_ */
+ S_ST( 'r', 3, 854, 0 ), /* 853 unpeer_c */
+ S_ST( 'y', 3, 855, 0 ), /* 854 unpeer_cr */
+ S_ST( 'p', 3, 856, 0 ), /* 855 unpeer_cry */
+ S_ST( 't', 3, 857, 0 ), /* 856 unpeer_cryp */
+ S_ST( 'o', 3, 858, 0 ), /* 857 unpeer_crypt */
+ S_ST( '_', 3, 863, 0 ), /* 858 unpeer_crypto */
+ S_ST( 'e', 3, 860, 0 ), /* 859 unpeer_crypto_ */
+ S_ST( 'a', 3, 861, 0 ), /* 860 unpeer_crypto_e */
+ S_ST( 'r', 3, 862, 0 ), /* 861 unpeer_crypto_ea */
+ S_ST( 'l', 3, 429, 0 ), /* 862 unpeer_crypto_ear */
+ S_ST( 'n', 3, 864, 859 ), /* 863 unpeer_crypto_ */
+ S_ST( 'a', 3, 865, 0 ), /* 864 unpeer_crypto_n */
+ S_ST( 'k', 3, 866, 0 ), /* 865 unpeer_crypto_na */
+ S_ST( '_', 3, 867, 0 ), /* 866 unpeer_crypto_nak */
+ S_ST( 'e', 3, 868, 0 ), /* 867 unpeer_crypto_nak_ */
+ S_ST( 'a', 3, 869, 0 ), /* 868 unpeer_crypto_nak_e */
+ S_ST( 'r', 3, 870, 0 ), /* 869 unpeer_crypto_nak_ea */
+ S_ST( 'l', 3, 430, 0 ), /* 870 unpeer_crypto_nak_ear */
+ S_ST( 'd', 3, 872, 852 ), /* 871 unpeer_ */
+ S_ST( 'i', 3, 873, 0 ), /* 872 unpeer_d */
+ S_ST( 'g', 3, 874, 0 ), /* 873 unpeer_di */
+ S_ST( 'e', 3, 875, 0 ), /* 874 unpeer_dig */
+ S_ST( 's', 3, 876, 0 ), /* 875 unpeer_dige */
+ S_ST( 't', 3, 877, 0 ), /* 876 unpeer_diges */
+ S_ST( '_', 3, 878, 0 ), /* 877 unpeer_digest */
+ S_ST( 'e', 3, 879, 0 ), /* 878 unpeer_digest_ */
+ S_ST( 'a', 3, 880, 0 ), /* 879 unpeer_digest_e */
+ S_ST( 'r', 3, 881, 0 ), /* 880 unpeer_digest_ea */
+ S_ST( 'l', 3, 431, 0 ), /* 881 unpeer_digest_ear */
+ S_ST( 'v', 3, 883, 841 ), /* 882 */
+ S_ST( 'e', 3, 884, 0 ), /* 883 v */
+ S_ST( 'r', 3, 885, 0 ), /* 884 ve */
+ S_ST( 's', 3, 886, 0 ), /* 885 ver */
+ S_ST( 'i', 3, 887, 0 ), /* 886 vers */
+ S_ST( 'o', 3, 434, 0 ), /* 887 versi */
+ S_ST( 'w', 3, 895, 882 ), /* 888 */
+ S_ST( 'a', 3, 890, 0 ), /* 889 w */
+ S_ST( 'n', 3, 891, 0 ), /* 890 wa */
+ S_ST( 'd', 3, 892, 0 ), /* 891 wan */
+ S_ST( 'e', 3, 448, 0 ), /* 892 wand */
+ S_ST( 'e', 3, 894, 889 ), /* 893 w */
+ S_ST( 'e', 3, 436, 0 ), /* 894 we */
+ S_ST( 'i', 3, 896, 893 ), /* 895 w */
+ S_ST( 'l', 3, 897, 0 ), /* 896 wi */
+ S_ST( 'd', 3, 898, 0 ), /* 897 wil */
+ S_ST( 'c', 3, 899, 0 ), /* 898 wild */
+ S_ST( 'a', 3, 900, 0 ), /* 899 wildc */
+ S_ST( 'r', 3, 437, 0 ), /* 900 wildca */
+ S_ST( 'x', 3, 902, 888 ), /* 901 */
+ S_ST( 'l', 3, 903, 0 ), /* 902 x */
+ S_ST( 'e', 3, 904, 0 ), /* 903 xl */
+ S_ST( 'a', 3, 905, 0 ), /* 904 xle */
+ S_ST( 'v', 3, 438, 0 ), /* 905 xlea */
+ S_ST( 'y', 3, 907, 901 ), /* 906 [initial state] */
+ S_ST( 'e', 3, 908, 0 ), /* 907 y */
+ S_ST( 'a', 3, 439, 0 ) /* 908 ye */
};
Index: src/external/bsd/ntp/dist/ntpd/ntpd-opts.h
diff -u src/external/bsd/ntp/dist/ntpd/ntpd-opts.h:1.10 src/external/bsd/ntp/dist/ntpd/ntpd-opts.h:1.11
--- src/external/bsd/ntp/dist/ntpd/ntpd-opts.h:1.10 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/ntpd/ntpd-opts.h Fri Jun 3 16:39:02 2016
@@ -1,9 +1,9 @@
-/* $NetBSD: ntpd-opts.h,v 1.10 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntpd-opts.h,v 1.11 2016/06/03 20:39:02 christos Exp $ */
/*
* EDIT THIS FILE WITH CAUTION (ntpd-opts.h)
*
- * It has been AutoGen-ed April 26, 2016 at 08:26:13 PM by AutoGen 5.18.5
+ * It has been AutoGen-ed June 2, 2016 at 07:32:40 AM by AutoGen 5.18.5
* From the definitions ntpd-opts.def
* and the template file options
*
@@ -108,9 +108,9 @@ typedef enum {
/** count of all options for ntpd */
#define OPTION_CT 38
/** ntpd version */
-#define NTPD_VERSION "4.2.8p7"
+#define NTPD_VERSION "4.2.8p8"
/** Full ntpd version text */
-#define NTPD_FULL_VERSION "ntpd 4.2.8p7"
+#define NTPD_FULL_VERSION "ntpd 4.2.8p8"
/**
* Interface defines for all options. Replace "n" with the UPPER_CASED
Index: src/external/bsd/ntp/dist/ntpd/ntp_parser.y
diff -u src/external/bsd/ntp/dist/ntpd/ntp_parser.y:1.13 src/external/bsd/ntp/dist/ntpd/ntp_parser.y:1.14
--- src/external/bsd/ntp/dist/ntpd/ntp_parser.y:1.13 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/ntpd/ntp_parser.y Fri Jun 3 16:39:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_parser.y,v 1.13 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntp_parser.y,v 1.14 2016/06/03 20:39:02 christos Exp $ */
/* ntp_parser.y
*
@@ -192,6 +192,7 @@
%token <Integer> T_NtpSignDsocket
%token <Integer> T_Orphan
%token <Integer> T_Orphanwait
+%token <Integer> T_PCEdigest
%token <Integer> T_Panic
%token <Integer> T_Peer
%token <Integer> T_Peerstats
@@ -1087,6 +1088,7 @@ system_option_flag_keyword
system_option_local_flag_keyword
: T_Mode7
+ | T_PCEdigest
| T_Stats
| T_UEcrypto
| T_UEcryptonak
Index: src/external/bsd/ntp/dist/ntpd/ntp_proto.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_proto.c:1.11 src/external/bsd/ntp/dist/ntpd/ntp_proto.c:1.12
--- src/external/bsd/ntp/dist/ntpd/ntp_proto.c:1.11 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/ntpd/ntp_proto.c Fri Jun 3 16:39:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_proto.c,v 1.11 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntp_proto.c,v 1.12 2016/06/03 20:39:02 christos Exp $ */
/*
* ntp_proto.c - NTP version 4 protocol machinery
@@ -167,7 +167,7 @@ u_long sys_limitrejected; /* rate exceed
u_long sys_kodsent; /* KoD sent */
/*
- * Mechanism knobs: how soon do we unpeer()?
+ * Mechanism knobs: how soon do we peer_clear() or unpeer()?
*
* The default way is "on-receipt". If this was a packet from a
* well-behaved source, on-receipt will offer the fastest recovery.
@@ -175,6 +175,7 @@ u_long sys_kodsent; /* KoD sent */
* for a bad-guy to DoS us. So look and see what bites you harder
* and choose according to your environment.
*/
+int peer_clear_digest_early = 1; /* bad digest (TEST5) and Autokey */
int unpeer_crypto_early = 1; /* bad crypto (TEST9) */
int unpeer_crypto_nak_early = 1; /* crypto_NAK (TEST5) */
int unpeer_digest_early = 1; /* bad digest (TEST5) */
@@ -279,10 +280,12 @@ valid_NAK(
u_char hismode
)
{
- int base_packet_length = MIN_V4_PKT_LEN;
- int remainder_size;
- struct pkt *rpkt;
- int keyid;
+ int base_packet_length = MIN_V4_PKT_LEN;
+ int remainder_size;
+ struct pkt * rpkt;
+ int keyid;
+ l_fp p_org; /* origin timestamp */
+ const l_fp * myorg; /* selected peer origin */
/*
* Check to see if there is something beyond the basic packet
@@ -307,7 +310,7 @@ valid_NAK(
hismode != MODE_ACTIVE &&
hismode != MODE_PASSIVE
) {
- return (INVALIDNAK);
+ return INVALIDNAK;
}
/*
@@ -316,18 +319,35 @@ valid_NAK(
rpkt = &rbufp->recv_pkt;
keyid = ntohl(((u_int32 *)rpkt)[base_packet_length / 4]);
if (keyid != 0) {
- return (INVALIDNAK);
+ return INVALIDNAK;
}
/*
* Only valid if peer uses a key
*/
- if (peer->keyid > 0 || peer->flags & FLAG_SKEY) {
- return (VALIDNAK);
+ if (!peer || !peer->keyid || !(peer->flags & FLAG_SKEY)) {
+ return INVALIDNAK;
}
- else {
- return (INVALIDNAK);
+
+ /*
+ * The ORIGIN must match, or this cannot be a valid NAK, either.
+ */
+ NTOHL_FP(&rpkt->org, &p_org);
+ if (peer->flip > 0)
+ myorg = &peer->borg;
+ else
+ myorg = &peer->aorg;
+
+ if (L_ISZERO(&p_org) ||
+ L_ISZERO( myorg) ||
+ !L_ISEQU(&p_org, myorg)) {
+ return INVALIDNAK;
}
+
+ /* If we ever passed all that checks, we should be safe. Well,
+ * as safe as we can ever be with an unauthenticated crypto-nak.
+ */
+ return VALIDNAK;
}
@@ -570,7 +590,7 @@ receive(
int kissCode = NOKISS; /* Kiss Code */
int has_mac; /* length of MAC field */
int authlen; /* offset of MAC field */
- int is_authentic = 0; /* cryptosum ok */
+ int is_authentic = AUTH_NONE; /* cryptosum ok */
int crypto_nak_test; /* result of crypto-NAK check */
int retcode = AM_NOMATCH; /* match code */
keyid_t skeyid = 0; /* key IDs */
@@ -618,6 +638,8 @@ receive(
hisleap = PKT_LEAP(pkt->li_vn_mode);
hismode = (int)PKT_MODE(pkt->li_vn_mode);
hisstratum = PKT_TO_STRATUM(pkt->stratum);
+ INSIST(0 != hisstratum);
+
if (restrict_mask & RES_IGNORE) {
sys_restricted++;
return; /* ignore everything */
@@ -1514,7 +1536,7 @@ receive(
*/
if (L_ISZERO(&p_xmt)) {
peer->flash |= TEST3; /* unsynch */
- if (0 == hisstratum) { /* KoD packet */
+ if (STRATUM_UNSPEC == hisstratum) { /* KoD packet */
peer->bogusorg++; /* for TEST2 or TEST3 */
msyslog(LOG_INFO,
"receive: Unexpected zero transmit timestamp in KoD from %s",
@@ -1533,17 +1555,22 @@ receive(
return;
/*
- * If this is a broadcast mode packet, skip further checking. If
- * an initial volley, bail out now and let the client do its
- * stuff. If the origin timestamp is nonzero, this is an
- * interleaved broadcast. so restart the protocol.
+ * If this is a broadcast mode packet, make sure hisstratum
+ * is appropriate. Don't do anything else here - we wait to
+ * see if this is an interleave broadcast packet until after
+ * we've validated the MAC that SHOULD be provided.
+ *
+ * hisstratum should never be 0.
+ * If hisstratum is 15, then we'll advertise as UNSPEC but
+ * at least we'll be able to sync with the broadcast server.
*/
} else if (hismode == MODE_BROADCAST) {
- if (!L_ISZERO(&p_org) && !(peer->flags & FLAG_XB)) {
- peer->flags |= FLAG_XB;
- peer->aorg = p_xmt;
- peer->borg = rbufp->recv_time;
- report_event(PEVNT_XLEAVE, peer, NULL);
+ if ( 0 == hisstratum
+ || STRATUM_UNSPEC <= hisstratum) {
+ /* Is this a ++sys_declined or ??? */
+ msyslog(LOG_INFO,
+ "receive: Unexpected stratum (%d) in broadcast from %s",
+ hisstratum, ntoa(&peer->srcadr));
return;
}
@@ -1560,7 +1587,7 @@ receive(
* (nonzero) org, rec, and xmt timestamps set to the xmt timestamp
* that we have previously sent out. Watch interleave mode.
*/
- } else if (0 == hisstratum) {
+ } else if (STRATUM_UNSPEC == hisstratum) {
DEBUG_INSIST(!L_ISZERO(&p_xmt));
if ( L_ISZERO(&p_org) /* We checked p_xmt above */
|| L_ISZERO(&p_rec)) {
@@ -1619,6 +1646,7 @@ receive(
*/
} else if (peer->flip == 0) {
INSIST(0 != hisstratum);
+ INSIST(STRATUM_UNSPEC != hisstratum);
if (0) {
} else if (L_ISZERO(&p_org)) {
msyslog(LOG_INFO,
@@ -1656,8 +1684,9 @@ receive(
/*
* Check for valid nonzero timestamp fields.
*/
- } else if (L_ISZERO(&p_org) || L_ISZERO(&p_rec) ||
- L_ISZERO(&peer->dst)) {
+ } else if ( L_ISZERO(&p_org)
+ || L_ISZERO(&p_rec)
+ || L_ISZERO(&peer->dst)) {
peer->flash |= TEST3; /* unsynch */
/*
@@ -1673,6 +1702,8 @@ receive(
return; /* Bogus packet, we are done */
}
+ /**/
+
/*
* If this is a crypto_NAK, the server cannot authenticate a
* client packet. The server might have just changed keys. Clear
@@ -1689,8 +1720,9 @@ receive(
return;
}
#ifdef AUTOKEY
- if (peer->crypto)
+ if (peer->crypto) {
peer_clear(peer, "AUTH");
+ }
#endif /* AUTOKEY */
return;
@@ -1704,28 +1736,78 @@ receive(
*/
} else if (!AUTH(peer->keyid || has_mac ||
(restrict_mask & RES_DONTTRUST), is_authentic)) {
+
+ if (peer->flash & PKT_TEST_MASK) {
+ msyslog(LOG_INFO,
+ "receive: Bad auth in packet with bad timestamps from %s denied - spoof?",
+ ntoa(&peer->srcadr));
+ return;
+ }
+
report_event(PEVNT_AUTH, peer, "digest");
peer->flash |= TEST5; /* bad auth */
peer->badauth++;
if ( has_mac
- && (hismode == MODE_ACTIVE || hismode == MODE_PASSIVE))
+ && ( hismode == MODE_ACTIVE
+ || hismode == MODE_PASSIVE))
fast_xmit(rbufp, MODE_ACTIVE, 0, restrict_mask);
if (peer->flags & FLAG_PREEMPT) {
if (unpeer_digest_early) {
unpeer(peer);
}
- return;
}
#ifdef AUTOKEY
- if (peer->crypto)
+ else if (peer_clear_digest_early && peer->crypto) {
peer_clear(peer, "AUTH");
+ }
#endif /* AUTOKEY */
return;
}
/*
- * Update the state variables.
+ * For broadcast packets:
+ *
+ * HMS: This next line never made much sense to me, even
+ * when it was up higher:
+ * If an initial volley, bail out now and let the
+ * client do its stuff.
+ *
+ * If the packet has not failed authentication, then
+ * - if the origin timestamp is nonzero this is an
+ * interleaved broadcast, so restart the protocol.
+ * - else, this is not an interleaved broadcast packet.
*/
+ if (hismode == MODE_BROADCAST) {
+ if ( is_authentic == AUTH_OK
+ || is_authentic == AUTH_NONE) {
+ if (!L_ISZERO(&p_org)) {
+ if (!(peer->flags & FLAG_XB)) {
+ msyslog(LOG_INFO,
+ "receive: Broadcast server at %s is in interleave mode",
+ ntoa(&peer->srcadr));
+ peer->flags |= FLAG_XB;
+ peer->aorg = p_xmt;
+ peer->borg = rbufp->recv_time;
+ report_event(PEVNT_XLEAVE, peer, NULL);
+ return;
+ }
+ } else if (peer->flags & FLAG_XB) {
+ msyslog(LOG_INFO,
+ "receive: Broadcast server at %s is no longer in interleave mode",
+ ntoa(&peer->srcadr));
+ peer->flags &= ~FLAG_XB;
+ }
+ } else {
+ msyslog(LOG_INFO,
+ "receive: Bad broadcast auth (%d) from %s",
+ is_authentic, ntoa(&peer->srcadr));
+ }
+ }
+
+
+ /*
+ ** Update the state variables.
+ */
if (peer->flip == 0) {
if (hismode != MODE_BROADCAST)
peer->rec = p_xmt;
@@ -1768,6 +1850,12 @@ receive(
return; /* Drop any other kiss code packets */
}
+
+ /*
+ * XXX
+ */
+
+
/*
* If:
* - this is a *cast (uni-, broad-, or m-) server packet
@@ -1965,9 +2053,9 @@ receive(
/*
- * process_packet - Packet Procedure, a la Section 3.4.4 of the
- * specification. Or almost, at least. If we're in here we have a
- * reasonable expectation that we will be having a long term
+ * process_packet - Packet Procedure, a la Section 3.4.4 of RFC-1305
+ * Or almost, at least. If we're in here we have a reasonable
+ * expectation that we will be having a long term
* relationship with this host.
*/
void
@@ -1987,8 +2075,10 @@ process_packet(
double etemp, ftemp, td;
#endif /* ASSYM */
+#if 0
sys_processed++;
peer->processed++;
+#endif
p_del = FPTOD(NTOHS_FP(pkt->rootdelay));
p_offset = 0;
p_disp = FPTOD(NTOHS_FP(pkt->rootdisp));
@@ -2001,6 +2091,39 @@ process_packet(
pversion = PKT_VERSION(pkt->li_vn_mode);
pstratum = PKT_TO_STRATUM(pkt->stratum);
+ /**/
+
+ /**/
+
+ /*
+ * Verify the server is synchronized; that is, the leap bits,
+ * stratum and root distance are valid.
+ */
+ if ( pleap == LEAP_NOTINSYNC /* test 6 */
+ || pstratum < sys_floor || pstratum >= sys_ceiling)
+ peer->flash |= TEST6; /* bad synch or strat */
+ if (p_del / 2 + p_disp >= MAXDISPERSE) /* test 7 */
+ peer->flash |= TEST7; /* bad header */
+
+ /*
+ * If any tests fail at this point, the packet is discarded.
+ * Note that some flashers may have already been set in the
+ * receive() routine.
+ */
+ if (peer->flash & PKT_TEST_MASK) {
+ peer->seldisptoolarge++;
+ DPRINTF(1, ("packet: flash header %04x\n",
+ peer->flash));
+ return;
+ }
+
+ /**/
+
+#if 1
+ sys_processed++;
+ peer->processed++;
+#endif
+
/*
* Capture the header values in the client/peer association..
*/
@@ -2035,27 +2158,7 @@ process_packet(
}
poll_update(peer, peer->hpoll);
- /*
- * Verify the server is synchronized; that is, the leap bits,
- * stratum and root distance are valid.
- */
- if ( pleap == LEAP_NOTINSYNC /* test 6 */
- || pstratum < sys_floor || pstratum >= sys_ceiling)
- peer->flash |= TEST6; /* bad synch or strat */
- if (p_del / 2 + p_disp >= MAXDISPERSE) /* test 7 */
- peer->flash |= TEST7; /* bad header */
-
- /*
- * If any tests fail at this point, the packet is discarded.
- * Note that some flashers may have already been set in the
- * receive() routine.
- */
- if (peer->flash & PKT_TEST_MASK) {
- peer->seldisptoolarge++;
- DPRINTF(1, ("packet: flash header %04x\n",
- peer->flash));
- return;
- }
+ /**/
/*
* If the peer was previously unreachable, raise a trap. In any
@@ -4684,6 +4787,14 @@ proto_config(
break;
/*
+ * Peer_clear Early policy choices
+ */
+
+ case PROTO_PCEDIGEST: /* Digest */
+ peer_clear_digest_early = value;
+ break;
+
+ /*
* Unpeer Early policy choices
*/
Index: src/external/bsd/ntp/dist/ntpd/ntpd-opts.c
diff -u src/external/bsd/ntp/dist/ntpd/ntpd-opts.c:1.7 src/external/bsd/ntp/dist/ntpd/ntpd-opts.c:1.8
--- src/external/bsd/ntp/dist/ntpd/ntpd-opts.c:1.7 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/ntpd/ntpd-opts.c Fri Jun 3 16:39:02 2016
@@ -1,9 +1,9 @@
-/* $NetBSD: ntpd-opts.c,v 1.7 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntpd-opts.c,v 1.8 2016/06/03 20:39:02 christos Exp $ */
/*
* EDIT THIS FILE WITH CAUTION (ntpd-opts.c)
*
- * It has been AutoGen-ed April 26, 2016 at 08:26:14 PM by AutoGen 5.18.5
+ * It has been AutoGen-ed June 2, 2016 at 07:32:42 AM by AutoGen 5.18.5
* From the definitions ntpd-opts.def
* and the template file options
*
@@ -77,7 +77,7 @@ extern FILE * option_usage_fp;
* static const strings for ntpd options
*/
static char const ntpd_opt_strs[3129] =
-/* 0 */ "ntpd 4.2.8p7\n"
+/* 0 */ "ntpd 4.2.8p8\n"
"Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n"
"This is free software. It is licensed for use, modification and\n"
"redistribution under the terms of the NTP License, copies of which\n"
@@ -207,12 +207,12 @@ static char const ntpd_opt_strs[3129] =
/* 2900 */ "output version information and exit\0"
/* 2936 */ "version\0"
/* 2944 */ "NTPD\0"
-/* 2949 */ "ntpd - NTP daemon program - Ver. 4.2.8p7\n"
+/* 2949 */ "ntpd - NTP daemon program - Ver. 4.2.8p8\n"
"Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n"
"\t\t[ <server1> ... <serverN> ]\n\0"
/* 3080 */ "http://bugs.ntp.org, b...@ntp.org\0"
/* 3114 */ "\n\0"
-/* 3116 */ "ntpd 4.2.8p7";
+/* 3116 */ "ntpd 4.2.8p8";
/**
* ipv4 option description with
@@ -1531,7 +1531,7 @@ static void bogus_function(void) {
translate option names.
*/
/* referenced via ntpdOptions.pzCopyright */
- puts(_("ntpd 4.2.8p7\n\
+ puts(_("ntpd 4.2.8p8\n\
Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n\
This is free software. It is licensed for use, modification and\n\
redistribution under the terms of the NTP License, copies of which\n\
@@ -1672,7 +1672,7 @@ implied warranty.\n"));
puts(_("output version information and exit"));
/* referenced via ntpdOptions.pzUsageTitle */
- puts(_("ntpd - NTP daemon program - Ver. 4.2.8p7\n\
+ puts(_("ntpd - NTP daemon program - Ver. 4.2.8p8\n\
Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
\t\t[ <server1> ... <serverN> ]\n"));
@@ -1680,7 +1680,7 @@ Usage: %s [ -<flag> [<val>] | --<name>[
puts(_("\n"));
/* referenced via ntpdOptions.pzFullVersion */
- puts(_("ntpd 4.2.8p7"));
+ puts(_("ntpd 4.2.8p8"));
/* referenced via ntpdOptions.pzFullUsage */
puts(_("<<<NOT-FOUND>>>"));
Index: src/external/bsd/ntp/dist/ntpd/refclock_parse.c
diff -u src/external/bsd/ntp/dist/ntpd/refclock_parse.c:1.18 src/external/bsd/ntp/dist/ntpd/refclock_parse.c:1.19
--- src/external/bsd/ntp/dist/ntpd/refclock_parse.c:1.18 Fri Jan 8 16:35:39 2016
+++ src/external/bsd/ntp/dist/ntpd/refclock_parse.c Fri Jun 3 16:39:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: refclock_parse.c,v 1.18 2016/01/08 21:35:39 christos Exp $ */
+/* $NetBSD: refclock_parse.c,v 1.19 2016/06/03 20:39:02 christos Exp $ */
/*
* /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.81 2009/05/01 10:15:29 kardel RELEASE_20090105_A
@@ -2266,8 +2266,8 @@ local_input(
if (debug > 3)
{
printf(
- "parse: local_receive: fd %d PPSAPI seq %ld - PPS %s\n",
- rbufp->fd,
+ "parse: local_receive: fd %ld PPSAPI seq %ld - PPS %s\n",
+ (long)rbufp->fd,
(long)pps_info.assert_sequence + (long)pps_info.clear_sequence,
lfptoa(&parse->parseio.parse_dtime.parse_ptime.fp, 6));
}
@@ -2279,8 +2279,8 @@ local_input(
if (debug > 3)
{
printf(
- "parse: local_receive: fd %d PPSAPI seq assert %ld, seq clear %ld - NO PPS event\n",
- rbufp->fd,
+ "parse: local_receive: fd %ld PPSAPI seq assert %ld, seq clear %ld - NO PPS event\n",
+ (long)rbufp->fd,
(long)pps_info.assert_sequence, (long)pps_info.clear_sequence);
}
}
@@ -2293,8 +2293,8 @@ local_input(
if (debug > 3)
{
printf(
- "parse: local_receive: fd %d PPSAPI time_pps_fetch errno = %d\n",
- rbufp->fd,
+ "parse: local_receive: fd %ld PPSAPI time_pps_fetch errno = %d\n",
+ (long)rbufp->fd,
errno);
}
}
Index: src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c
diff -u src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c:1.7 src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c:1.8
--- src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c:1.7 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c Fri Jun 3 16:39:02 2016
@@ -1,9 +1,9 @@
-/* $NetBSD: ntpdc-opts.c,v 1.7 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntpdc-opts.c,v 1.8 2016/06/03 20:39:02 christos Exp $ */
/*
* EDIT THIS FILE WITH CAUTION (ntpdc-opts.c)
*
- * It has been AutoGen-ed April 26, 2016 at 08:28:50 PM by AutoGen 5.18.5
+ * It has been AutoGen-ed June 2, 2016 at 07:36:34 AM by AutoGen 5.18.5
* From the definitions ntpdc-opts.def
* and the template file options
*
@@ -71,7 +71,7 @@ extern FILE * option_usage_fp;
* static const strings for ntpdc options
*/
static char const ntpdc_opt_strs[1911] =
-/* 0 */ "ntpdc 4.2.8p7\n"
+/* 0 */ "ntpdc 4.2.8p8\n"
"Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n"
"This is free software. It is licensed for use, modification and\n"
"redistribution under the terms of the NTP License, copies of which\n"
@@ -130,14 +130,14 @@ static char const ntpdc_opt_strs[1911] =
/* 1694 */ "no-load-opts\0"
/* 1707 */ "no\0"
/* 1710 */ "NTPDC\0"
-/* 1716 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p7\n"
+/* 1716 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p8\n"
"Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n\0"
/* 1846 */ "$HOME\0"
/* 1852 */ ".\0"
/* 1854 */ ".ntprc\0"
/* 1861 */ "http://bugs.ntp.org, b...@ntp.org\0"
/* 1895 */ "\n\0"
-/* 1897 */ "ntpdc 4.2.8p7";
+/* 1897 */ "ntpdc 4.2.8p8";
/**
* ipv4 option description with
@@ -798,7 +798,7 @@ static void bogus_function(void) {
translate option names.
*/
/* referenced via ntpdcOptions.pzCopyright */
- puts(_("ntpdc 4.2.8p7\n\
+ puts(_("ntpdc 4.2.8p8\n\
Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n\
This is free software. It is licensed for use, modification and\n\
redistribution under the terms of the NTP License, copies of which\n\
@@ -864,14 +864,14 @@ implied warranty.\n"));
puts(_("load options from a config file"));
/* referenced via ntpdcOptions.pzUsageTitle */
- puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p7\n\
+ puts(_("ntpdc - vendor-specific NTPD control program - Ver. 4.2.8p8\n\
Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n"));
/* referenced via ntpdcOptions.pzExplain */
puts(_("\n"));
/* referenced via ntpdcOptions.pzFullVersion */
- puts(_("ntpdc 4.2.8p7"));
+ puts(_("ntpdc 4.2.8p8"));
/* referenced via ntpdcOptions.pzFullUsage */
puts(_("<<<NOT-FOUND>>>"));
Index: src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h
diff -u src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h:1.7 src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h:1.8
--- src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h:1.7 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h Fri Jun 3 16:39:02 2016
@@ -1,9 +1,9 @@
-/* $NetBSD: ntpdc-opts.h,v 1.7 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntpdc-opts.h,v 1.8 2016/06/03 20:39:02 christos Exp $ */
/*
* EDIT THIS FILE WITH CAUTION (ntpdc-opts.h)
*
- * It has been AutoGen-ed April 26, 2016 at 08:28:50 PM by AutoGen 5.18.5
+ * It has been AutoGen-ed June 2, 2016 at 07:36:34 AM by AutoGen 5.18.5
* From the definitions ntpdc-opts.def
* and the template file options
*
@@ -85,9 +85,9 @@ typedef enum {
/** count of all options for ntpdc */
#define OPTION_CT 15
/** ntpdc version */
-#define NTPDC_VERSION "4.2.8p7"
+#define NTPDC_VERSION "4.2.8p8"
/** Full ntpdc version text */
-#define NTPDC_FULL_VERSION "ntpdc 4.2.8p7"
+#define NTPDC_FULL_VERSION "ntpdc 4.2.8p8"
/**
* Interface defines for all options. Replace "n" with the UPPER_CASED
Index: src/external/bsd/ntp/dist/ntpdc/ntpdc.c
diff -u src/external/bsd/ntp/dist/ntpdc/ntpdc.c:1.13 src/external/bsd/ntp/dist/ntpdc/ntpdc.c:1.14
--- src/external/bsd/ntp/dist/ntpdc/ntpdc.c:1.13 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/ntpdc/ntpdc.c Fri Jun 3 16:39:02 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ntpdc.c,v 1.13 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntpdc.c,v 1.14 2016/06/03 20:39:02 christos Exp $ */
/*
* ntpdc - control and monitor your ntpd daemon
@@ -671,7 +671,7 @@ getresponse(
printf("Received sequence numbers");
for (n = 0; n <= MAXSEQ; n++)
if (haveseq[n])
- printf(" %zd,", n);
+ printf(" %zd,", (size_t)n);
if (lastseq != 999)
printf(" last frame received\n");
else
@@ -693,7 +693,7 @@ getresponse(
*/
if (n < (ssize_t)RESP_HEADER_SIZE) {
if (debug)
- printf("Short (%zd byte) packet received\n", n);
+ printf("Short (%zd byte) packet received\n", (size_t)n);
goto again;
}
if (INFO_VERSION(rpkt.rm_vn_mode) > NTP_VERSION ||
Index: src/external/bsd/ntp/dist/ntpq/ntpq-opts.c
diff -u src/external/bsd/ntp/dist/ntpq/ntpq-opts.c:1.7 src/external/bsd/ntp/dist/ntpq/ntpq-opts.c:1.8
--- src/external/bsd/ntp/dist/ntpq/ntpq-opts.c:1.7 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/ntpq/ntpq-opts.c Fri Jun 3 16:39:03 2016
@@ -1,9 +1,9 @@
-/* $NetBSD: ntpq-opts.c,v 1.7 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntpq-opts.c,v 1.8 2016/06/03 20:39:03 christos Exp $ */
/*
* EDIT THIS FILE WITH CAUTION (ntpq-opts.c)
*
- * It has been AutoGen-ed April 26, 2016 at 08:29:11 PM by AutoGen 5.18.5
+ * It has been AutoGen-ed June 2, 2016 at 07:37:05 AM by AutoGen 5.18.5
* From the definitions ntpq-opts.def
* and the template file options
*
@@ -71,7 +71,7 @@ extern FILE * option_usage_fp;
* static const strings for ntpq options
*/
static char const ntpq_opt_strs[1982] =
-/* 0 */ "ntpq 4.2.8p7\n"
+/* 0 */ "ntpq 4.2.8p8\n"
"Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n"
"This is free software. It is licensed for use, modification and\n"
"redistribution under the terms of the NTP License, copies of which\n"
@@ -134,13 +134,13 @@ static char const ntpq_opt_strs[1982] =
/* 1775 */ "no-load-opts\0"
/* 1788 */ "no\0"
/* 1791 */ "NTPQ\0"
-/* 1796 */ "ntpq - standard NTP query program - Ver. 4.2.8p7\n"
+/* 1796 */ "ntpq - standard NTP query program - Ver. 4.2.8p8\n"
"Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n\0"
/* 1915 */ "$HOME\0"
/* 1921 */ ".\0"
/* 1923 */ ".ntprc\0"
/* 1930 */ "http://bugs.ntp.org, b...@ntp.org\0"
-/* 1964 */ "ntpq 4.2.8p7\0"
+/* 1964 */ "ntpq 4.2.8p8\0"
/* 1977 */ "hash";
/**
@@ -843,7 +843,7 @@ static void bogus_function(void) {
translate option names.
*/
/* referenced via ntpqOptions.pzCopyright */
- puts(_("ntpq 4.2.8p7\n\
+ puts(_("ntpq 4.2.8p8\n\
Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n\
This is free software. It is licensed for use, modification and\n\
redistribution under the terms of the NTP License, copies of which\n\
@@ -912,11 +912,11 @@ implied warranty.\n"));
puts(_("load options from a config file"));
/* referenced via ntpqOptions.pzUsageTitle */
- puts(_("ntpq - standard NTP query program - Ver. 4.2.8p7\n\
+ puts(_("ntpq - standard NTP query program - Ver. 4.2.8p8\n\
Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n"));
/* referenced via ntpqOptions.pzFullVersion */
- puts(_("ntpq 4.2.8p7"));
+ puts(_("ntpq 4.2.8p8"));
/* referenced via ntpqOptions.pzFullUsage */
puts(_("<<<NOT-FOUND>>>"));
Index: src/external/bsd/ntp/dist/ntpq/ntpq-opts.h
diff -u src/external/bsd/ntp/dist/ntpq/ntpq-opts.h:1.7 src/external/bsd/ntp/dist/ntpq/ntpq-opts.h:1.8
--- src/external/bsd/ntp/dist/ntpq/ntpq-opts.h:1.7 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/ntpq/ntpq-opts.h Fri Jun 3 16:39:03 2016
@@ -1,9 +1,9 @@
-/* $NetBSD: ntpq-opts.h,v 1.7 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntpq-opts.h,v 1.8 2016/06/03 20:39:03 christos Exp $ */
/*
* EDIT THIS FILE WITH CAUTION (ntpq-opts.h)
*
- * It has been AutoGen-ed April 26, 2016 at 08:29:10 PM by AutoGen 5.18.5
+ * It has been AutoGen-ed June 2, 2016 at 07:37:04 AM by AutoGen 5.18.5
* From the definitions ntpq-opts.def
* and the template file options
*
@@ -86,9 +86,9 @@ typedef enum {
/** count of all options for ntpq */
#define OPTION_CT 16
/** ntpq version */
-#define NTPQ_VERSION "4.2.8p7"
+#define NTPQ_VERSION "4.2.8p8"
/** Full ntpq version text */
-#define NTPQ_FULL_VERSION "ntpq 4.2.8p7"
+#define NTPQ_FULL_VERSION "ntpq 4.2.8p8"
/**
* Interface defines for all options. Replace "n" with the UPPER_CASED
Index: src/external/bsd/ntp/dist/ntpq/ntpq.c
diff -u src/external/bsd/ntp/dist/ntpq/ntpq.c:1.15 src/external/bsd/ntp/dist/ntpq/ntpq.c:1.16
--- src/external/bsd/ntp/dist/ntpq/ntpq.c:1.15 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/ntpq/ntpq.c Fri Jun 3 16:39:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ntpq.c,v 1.15 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntpq.c,v 1.16 2016/06/03 20:39:03 christos Exp $ */
/*
* ntpq - query an NTP server using mode 6 commands
@@ -1065,7 +1065,7 @@ getresponse(
if (n < shouldbesize) {
printf("Response packet claims %u octets payload, above %ld received\n",
- count, (long)n - CTL_HEADER_LEN);
+ count, (long)(n - CTL_HEADER_LEN));
return ERR_INCOMPLETE;
}
@@ -1198,7 +1198,10 @@ getresponse(
* If we've seen the last fragment, look for holes in the sequence.
* If there aren't any, we're done.
*/
- maybe_final:
+#if !defined(SYS_WINNT) && defined(EINTR)
+ maybe_final:
+#endif
+
if (seenlastfrag && offsets[0] == 0) {
for (f = 1; f < numfrags; f++)
if (offsets[f-1] + counts[f-1] !=
Index: src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c
diff -u src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c:1.7 src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c:1.8
--- src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c:1.7 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c Fri Jun 3 16:39:03 2016
@@ -1,9 +1,9 @@
-/* $NetBSD: ntpsnmpd-opts.c,v 1.7 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntpsnmpd-opts.c,v 1.8 2016/06/03 20:39:03 christos Exp $ */
/*
* EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c)
*
- * It has been AutoGen-ed April 26, 2016 at 08:29:44 PM by AutoGen 5.18.5
+ * It has been AutoGen-ed June 2, 2016 at 07:37:55 AM by AutoGen 5.18.5
* From the definitions ntpsnmpd-opts.def
* and the template file options
*
@@ -63,7 +63,7 @@ extern FILE * option_usage_fp;
* static const strings for ntpsnmpd options
*/
static char const ntpsnmpd_opt_strs[1610] =
-/* 0 */ "ntpsnmpd 4.2.8p7\n"
+/* 0 */ "ntpsnmpd 4.2.8p8\n"
"Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n"
"This is free software. It is licensed for use, modification and\n"
"redistribution under the terms of the NTP License, copies of which\n"
@@ -103,14 +103,14 @@ static char const ntpsnmpd_opt_strs[1610
/* 1414 */ "no-load-opts\0"
/* 1427 */ "no\0"
/* 1430 */ "NTPSNMPD\0"
-/* 1439 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p7\n"
+/* 1439 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p8\n"
"Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
/* 1542 */ "$HOME\0"
/* 1548 */ ".\0"
/* 1550 */ ".ntprc\0"
/* 1557 */ "http://bugs.ntp.org, b...@ntp.org\0"
/* 1591 */ "\n\0"
-/* 1593 */ "ntpsnmpd 4.2.8p7";
+/* 1593 */ "ntpsnmpd 4.2.8p8";
/**
* nofork option description:
@@ -556,7 +556,7 @@ static void bogus_function(void) {
translate option names.
*/
/* referenced via ntpsnmpdOptions.pzCopyright */
- puts(_("ntpsnmpd 4.2.8p7\n\
+ puts(_("ntpsnmpd 4.2.8p8\n\
Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n\
This is free software. It is licensed for use, modification and\n\
redistribution under the terms of the NTP License, copies of which\n\
@@ -601,14 +601,14 @@ implied warranty.\n"));
puts(_("load options from a config file"));
/* referenced via ntpsnmpdOptions.pzUsageTitle */
- puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p7\n\
+ puts(_("ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.8p8\n\
Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
/* referenced via ntpsnmpdOptions.pzExplain */
puts(_("\n"));
/* referenced via ntpsnmpdOptions.pzFullVersion */
- puts(_("ntpsnmpd 4.2.8p7"));
+ puts(_("ntpsnmpd 4.2.8p8"));
/* referenced via ntpsnmpdOptions.pzFullUsage */
puts(_("<<<NOT-FOUND>>>"));
Index: src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h
diff -u src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h:1.7 src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h:1.8
--- src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h:1.7 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h Fri Jun 3 16:39:03 2016
@@ -1,9 +1,9 @@
-/* $NetBSD: ntpsnmpd-opts.h,v 1.7 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntpsnmpd-opts.h,v 1.8 2016/06/03 20:39:03 christos Exp $ */
/*
* EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h)
*
- * It has been AutoGen-ed April 26, 2016 at 08:29:43 PM by AutoGen 5.18.5
+ * It has been AutoGen-ed June 2, 2016 at 07:37:55 AM by AutoGen 5.18.5
* From the definitions ntpsnmpd-opts.def
* and the template file options
*
@@ -78,9 +78,9 @@ typedef enum {
/** count of all options for ntpsnmpd */
#define OPTION_CT 8
/** ntpsnmpd version */
-#define NTPSNMPD_VERSION "4.2.8p7"
+#define NTPSNMPD_VERSION "4.2.8p8"
/** Full ntpsnmpd version text */
-#define NTPSNMPD_FULL_VERSION "ntpsnmpd 4.2.8p7"
+#define NTPSNMPD_FULL_VERSION "ntpsnmpd 4.2.8p8"
/**
* Interface defines for all options. Replace "n" with the UPPER_CASED
Index: src/external/bsd/ntp/dist/sntp/sntp-opts.c
diff -u src/external/bsd/ntp/dist/sntp/sntp-opts.c:1.8 src/external/bsd/ntp/dist/sntp/sntp-opts.c:1.9
--- src/external/bsd/ntp/dist/sntp/sntp-opts.c:1.8 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/sntp/sntp-opts.c Fri Jun 3 16:39:03 2016
@@ -1,9 +1,9 @@
-/* $NetBSD: sntp-opts.c,v 1.8 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: sntp-opts.c,v 1.9 2016/06/03 20:39:03 christos Exp $ */
/*
* EDIT THIS FILE WITH CAUTION (sntp-opts.c)
*
- * It has been AutoGen-ed April 26, 2016 at 08:20:39 PM by AutoGen 5.18.5
+ * It has been AutoGen-ed June 2, 2016 at 07:18:42 AM by AutoGen 5.18.5
* From the definitions sntp-opts.def
* and the template file options
*
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
* static const strings for sntp options
*/
static char const sntp_opt_strs[2549] =
-/* 0 */ "sntp 4.2.8p7\n"
+/* 0 */ "sntp 4.2.8p8\n"
"Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n"
"This is free software. It is licensed for use, modification and\n"
"redistribution under the terms of the NTP License, copies of which\n"
@@ -157,7 +157,7 @@ static char const sntp_opt_strs[2549] =
/* 2298 */ "LOAD_OPTS\0"
/* 2308 */ "no-load-opts\0"
/* 2321 */ "SNTP\0"
-/* 2326 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p7\n"
+/* 2326 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p8\n"
"Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n"
"\t\t[ hostname-or-IP ...]\n\0"
/* 2485 */ "$HOME\0"
@@ -165,7 +165,7 @@ static char const sntp_opt_strs[2549] =
/* 2493 */ ".ntprc\0"
/* 2500 */ "http://bugs.ntp.org, b...@ntp.org\0"
/* 2534 */ "\n\0"
-/* 2536 */ "sntp 4.2.8p7";
+/* 2536 */ "sntp 4.2.8p8";
/**
* ipv4 option description with
@@ -1175,7 +1175,7 @@ static void bogus_function(void) {
translate option names.
*/
/* referenced via sntpOptions.pzCopyright */
- puts(_("sntp 4.2.8p7\n\
+ puts(_("sntp 4.2.8p8\n\
Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n\
This is free software. It is licensed for use, modification and\n\
redistribution under the terms of the NTP License, copies of which\n\
@@ -1265,7 +1265,7 @@ implied warranty.\n"));
puts(_("load options from a config file"));
/* referenced via sntpOptions.pzUsageTitle */
- puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p7\n\
+ puts(_("sntp - standard Simple Network Time Protocol client program - Ver. 4.2.8p8\n\
Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n\
\t\t[ hostname-or-IP ...]\n"));
@@ -1273,7 +1273,7 @@ Usage: %s [ -<flag> [<val>] | --<name>[
puts(_("\n"));
/* referenced via sntpOptions.pzFullVersion */
- puts(_("sntp 4.2.8p7"));
+ puts(_("sntp 4.2.8p8"));
/* referenced via sntpOptions.pzFullUsage */
puts(_("<<<NOT-FOUND>>>"));
Index: src/external/bsd/ntp/dist/sntp/sntp-opts.h
diff -u src/external/bsd/ntp/dist/sntp/sntp-opts.h:1.7 src/external/bsd/ntp/dist/sntp/sntp-opts.h:1.8
--- src/external/bsd/ntp/dist/sntp/sntp-opts.h:1.7 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/sntp/sntp-opts.h Fri Jun 3 16:39:03 2016
@@ -1,9 +1,9 @@
-/* $NetBSD: sntp-opts.h,v 1.7 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: sntp-opts.h,v 1.8 2016/06/03 20:39:03 christos Exp $ */
/*
* EDIT THIS FILE WITH CAUTION (sntp-opts.h)
*
- * It has been AutoGen-ed April 26, 2016 at 08:20:38 PM by AutoGen 5.18.5
+ * It has been AutoGen-ed June 2, 2016 at 07:18:40 AM by AutoGen 5.18.5
* From the definitions sntp-opts.def
* and the template file options
*
@@ -93,9 +93,9 @@ typedef enum {
/** count of all options for sntp */
#define OPTION_CT 23
/** sntp version */
-#define SNTP_VERSION "4.2.8p7"
+#define SNTP_VERSION "4.2.8p8"
/** Full sntp version text */
-#define SNTP_FULL_VERSION "sntp 4.2.8p7"
+#define SNTP_FULL_VERSION "sntp 4.2.8p8"
/**
* Interface defines for all options. Replace "n" with the UPPER_CASED
Index: src/external/bsd/ntp/dist/util/ntp-keygen-opts.c
diff -u src/external/bsd/ntp/dist/util/ntp-keygen-opts.c:1.12 src/external/bsd/ntp/dist/util/ntp-keygen-opts.c:1.13
--- src/external/bsd/ntp/dist/util/ntp-keygen-opts.c:1.12 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/util/ntp-keygen-opts.c Fri Jun 3 16:39:03 2016
@@ -1,9 +1,9 @@
-/* $NetBSD: ntp-keygen-opts.c,v 1.12 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntp-keygen-opts.c,v 1.13 2016/06/03 20:39:03 christos Exp $ */
/*
* EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.c)
*
- * It has been AutoGen-ed April 26, 2016 at 08:30:03 PM by AutoGen 5.18.5
+ * It has been AutoGen-ed June 2, 2016 at 07:39:24 AM by AutoGen 5.18.5
* From the definitions ntp-keygen-opts.def
* and the template file options
*
@@ -74,7 +74,7 @@ extern FILE * option_usage_fp;
* static const strings for ntp-keygen options
*/
static char const ntp_keygen_opt_strs[2419] =
-/* 0 */ "ntp-keygen (ntp) 4.2.8p7\n"
+/* 0 */ "ntp-keygen (ntp) 4.2.8p8\n"
"Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n"
"This is free software. It is licensed for use, modification and\n"
"redistribution under the terms of the NTP License, copies of which\n"
@@ -166,14 +166,14 @@ static char const ntp_keygen_opt_strs[24
/* 2202 */ "no-load-opts\0"
/* 2215 */ "no\0"
/* 2218 */ "NTP_KEYGEN\0"
-/* 2229 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p7\n"
+/* 2229 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p8\n"
"Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
/* 2343 */ "$HOME\0"
/* 2349 */ ".\0"
/* 2351 */ ".ntprc\0"
/* 2358 */ "http://bugs.ntp.org, b...@ntp.org\0"
/* 2392 */ "\n\0"
-/* 2394 */ "ntp-keygen (ntp) 4.2.8p7";
+/* 2394 */ "ntp-keygen (ntp) 4.2.8p8";
/**
* imbits option description:
@@ -1311,7 +1311,7 @@ static void bogus_function(void) {
translate option names.
*/
/* referenced via ntp_keygenOptions.pzCopyright */
- puts(_("ntp-keygen (ntp) 4.2.8p7\n\
+ puts(_("ntp-keygen (ntp) 4.2.8p8\n\
Copyright (C) 1992-2016 The University of Delaware and Network Time Foundation, all rights reserved.\n\
This is free software. It is licensed for use, modification and\n\
redistribution under the terms of the NTP License, copies of which\n\
@@ -1410,14 +1410,14 @@ implied warranty.\n"));
puts(_("load options from a config file"));
/* referenced via ntp_keygenOptions.pzUsageTitle */
- puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p7\n\
+ puts(_("ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.8p8\n\
Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
/* referenced via ntp_keygenOptions.pzExplain */
puts(_("\n"));
/* referenced via ntp_keygenOptions.pzFullVersion */
- puts(_("ntp-keygen (ntp) 4.2.8p7"));
+ puts(_("ntp-keygen (ntp) 4.2.8p8"));
/* referenced via ntp_keygenOptions.pzFullUsage */
puts(_("<<<NOT-FOUND>>>"));
Index: src/external/bsd/ntp/dist/util/ntp-keygen-opts.h
diff -u src/external/bsd/ntp/dist/util/ntp-keygen-opts.h:1.7 src/external/bsd/ntp/dist/util/ntp-keygen-opts.h:1.8
--- src/external/bsd/ntp/dist/util/ntp-keygen-opts.h:1.7 Sun May 1 19:32:01 2016
+++ src/external/bsd/ntp/dist/util/ntp-keygen-opts.h Fri Jun 3 16:39:03 2016
@@ -1,9 +1,9 @@
-/* $NetBSD: ntp-keygen-opts.h,v 1.7 2016/05/01 23:32:01 christos Exp $ */
+/* $NetBSD: ntp-keygen-opts.h,v 1.8 2016/06/03 20:39:03 christos Exp $ */
/*
* EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.h)
*
- * It has been AutoGen-ed April 26, 2016 at 08:30:02 PM by AutoGen 5.18.5
+ * It has been AutoGen-ed June 2, 2016 at 07:39:23 AM by AutoGen 5.18.5
* From the definitions ntp-keygen-opts.def
* and the template file options
*
@@ -96,9 +96,9 @@ typedef enum {
/** count of all options for ntp-keygen */
#define OPTION_CT 26
/** ntp-keygen version */
-#define NTP_KEYGEN_VERSION "4.2.8p7"
+#define NTP_KEYGEN_VERSION "4.2.8p8"
/** Full ntp-keygen version text */
-#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) 4.2.8p7"
+#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) 4.2.8p8"
/**
* Interface defines for all options. Replace "n" with the UPPER_CASED
Index: src/external/bsd/ntp/include/config.h
diff -u src/external/bsd/ntp/include/config.h:1.16 src/external/bsd/ntp/include/config.h:1.17
--- src/external/bsd/ntp/include/config.h:1.16 Sun May 1 19:32:02 2016
+++ src/external/bsd/ntp/include/config.h Fri Jun 3 16:39:03 2016
@@ -1459,7 +1459,7 @@
#define PACKAGE_NAME "ntp"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ntp 4.2.8p7"
+#define PACKAGE_STRING "ntp 4.2.8p8"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "ntp"
@@ -1468,7 +1468,7 @@
#define PACKAGE_URL "http://www.ntp.org./";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "4.2.8p7"
+#define PACKAGE_VERSION "4.2.8p8"
/* data dir */
#define PERLLIBDIR "/usr/local/share/ntp/lib"
@@ -1623,7 +1623,7 @@ typedef unsigned int uintptr_t;
/* #undef USE_UDP_SIGPOLL */
/* Version number of package */
-#define VERSION "4.2.8p7"
+#define VERSION "4.2.8p8"
/* vsnprintf expands "%m" to strerror(errno) */
/* #undef VSNPRINTF_PERCENT_M */
Index: src/external/bsd/ntp/scripts/mkver
diff -u src/external/bsd/ntp/scripts/mkver:1.10 src/external/bsd/ntp/scripts/mkver:1.11
--- src/external/bsd/ntp/scripts/mkver:1.10 Sun May 1 19:32:02 2016
+++ src/external/bsd/ntp/scripts/mkver Fri Jun 3 16:39:03 2016
@@ -3,7 +3,7 @@ PROG=${1-UNKNOWN}
ConfStr="$PROG"
-ConfStr="$ConfStr 4.2.8p7"
+ConfStr="$ConfStr 4.2.8p8"
case "$CSET" in
'') ;;
