Merge ntpd & friends 4.2.4p5 from vendor/ntp/dist into head. Next commit

will update usr.sbin/ntp to match this.

MFC after:	2 weeks

1 files changed, 24 insertions, 20 deletions

diff --git a/contrib/ntp/include/ntp_control.h b/contrib/ntp/include/ntp_control.h
index c75d38b..c299794 100644
--- a/contrib/ntp/include/ntp_control.h
+++ b/contrib/ntp/include/ntp_control.h
@@ -158,22 +158,25 @@ struct ntp_control {
 #define	CS_OFFSET	11
 #define	CS_DRIFT	12
 #define CS_JITTER	13
-#define	CS_CLOCK	14
-#define	CS_PROCESSOR	15
-#define	CS_SYSTEM	16
-#define CS_VERSION	17
-#define	CS_STABIL	18
-#define CS_VARLIST	19
+#define CS_ERROR	14
+#define	CS_CLOCK	15
+#define	CS_PROCESSOR	16
+#define	CS_SYSTEM	17
+#define CS_VERSION	18
+#define	CS_STABIL	19
+#define CS_VARLIST	20
 #ifdef OPENSSL
-#define CS_FLAGS	20
-#define CS_HOST		21
-#define CS_PUBLIC	22
-#define	CS_CERTIF	23
-#define	CS_REVTIME	24
-#define CS_LEAPTAB	25
-#define CS_TAI		26
-#define CS_DIGEST	27
-#define	CS_MAXCODE	CS_DIGEST
+#define CS_FLAGS	21
+#define CS_HOST		22
+#define CS_PUBLIC	23
+#define	CS_CERTIF	24
+#define	CS_REVTIME	25
+#define CS_LEAPTAB	26
+#define CS_TAI		27
+#define	CS_DIGEST	28
+#define CS_IDENT	29
+#define	CS_REVOKE	30
+#define	CS_MAXCODE	CS_REVOKE
 #else
 #define	CS_MAXCODE	CS_VARLIST
 #endif /* OPENSSL */
@@ -202,7 +205,7 @@ struct ntp_control {
 #define	CP_REC		19
 #define	CP_XMT		20
 #define	CP_REACH	21
-#define	CP_VALID	22
+#define	CP_UNREACH	22
 #define	CP_TIMER	23
 #define	CP_DELAY	24
 #define	CP_OFFSET	25
@@ -217,11 +220,11 @@ struct ntp_control {
 #define	CP_FILTERROR	34
 #define	CP_FLASH	35
 #define CP_TTL		36
-#define	CP_RANK		37
-#define CP_VARLIST	38
+#define CP_VARLIST	37
 #ifdef OPENSSL
-#define CP_FLAGS	39
-#define CP_HOST		40
+#define CP_FLAGS	38
+#define CP_HOST		39
+#define CP_VALID	40
 #define	CP_INITSEQ	41
 #define	CP_INITKEY	42
 #define	CP_INITTSP	43
@@ -266,6 +269,7 @@ struct ctl_trap {
 	u_char tr_flags;		/* trap flags */
 	u_char tr_version;		/* version number of trapper */
 };
+extern struct ctl_trap ctl_trap[];
 
 /*
  * Flag bits