diff options
| author | Ollivier Robert <roberto@FreeBSD.org> | 2008-08-18 14:26:05 +0000 |
|---|---|---|
| committer | Ollivier Robert <roberto@FreeBSD.org> | 2008-08-18 14:26:05 +0000 |
| commit | ff717da2cf625e3d07537a93a4c240692fa55bd6 (patch) | |
| tree | 9dcf618e4446ac2b5fca7d0afe7767382664f0d6 /include/ntp_config.h | |
| parent | cce65f439697627afbccf5a67035a957bb4d784a (diff) | |
| download | src-ff717da2cf625e3d07537a93a4c240692fa55bd6.tar.gz src-ff717da2cf625e3d07537a93a4c240692fa55bd6.zip | |
Import ntp 4.2.4p5 in the vendor code area. Far too many changes to list here,vendor/ntp/4.2.4p5
please see CommitLog for detailed changes.
XXX html/build/hints/solaris.xtra.4095849 is not being imported as it conflicts
with the detect-merge-conflict.sh script in our repo.
Notes
Notes:
svn path=/vendor/ntp/dist/; revision=181834
svn path=/vendor/ntp/4.2.4p5/; revision=181835; tag=vendor/ntp/4.2.4p5
Diffstat (limited to 'include/ntp_config.h')
| -rw-r--r-- | include/ntp_config.h | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/include/ntp_config.h b/include/ntp_config.h index 01478d2b6b07..66d4f9f9027c 100644 --- a/include/ntp_config.h +++ b/include/ntp_config.h @@ -28,7 +28,7 @@ #define CONFIG_AUTHENTICATE 7 #define CONFIG_KEYS 8 #define CONFIG_REVOKE 9 -#define CONFIG_PPS 10 +#define CONFIG_CDELAY 10 #define CONFIG_RESTRICT 11 #define CONFIG_BDELAY 12 #define CONFIG_TRUSTEDKEY 13 @@ -56,7 +56,7 @@ #define CONFIG_TTL 35 #define CONFIG_INCLUDEFILE 36 #define CONFIG_KEYSDIR 37 -#define CONFIG_CDELAY 38 +#define CONFIG_END 38 #ifdef OPENSSL #define CONFIG_CRYPTO 39 #endif /* OPENSSL */ @@ -75,6 +75,9 @@ #define CONF_MOD_TTL 9 #define CONF_MOD_MODE 10 #define CONF_MOD_NOSELECT 11 +#define CONF_MOD_TRUE 12 +#define CONF_MOD_PREEMPT 13 +#define CONF_MOD_DYNAMIC 14 /* * "restrict" modifier keywords @@ -122,13 +125,6 @@ #define CONF_FGEN_FLAG_DISABLE 6 /* - * "pps" modifier keywords - */ -#define CONF_PPS_ASSERT 1 -#define CONF_PPS_CLEAR 2 -#define CONF_PPS_HARDPPS 3 - -/* * "discard" modifier keywords */ #define CONF_DISCARD_AVERAGE 1 @@ -150,10 +146,16 @@ * "tos" modifier keywords */ #define CONF_TOS_MINCLOCK 1 -#define CONF_TOS_MINSANE 2 -#define CONF_TOS_FLOOR 3 -#define CONF_TOS_CEILING 4 -#define CONF_TOS_COHORT 5 +#define CONF_TOS_MAXCLOCK 2 +#define CONF_TOS_MINSANE 3 +#define CONF_TOS_FLOOR 4 +#define CONF_TOS_CEILING 5 +#define CONF_TOS_COHORT 6 +#define CONF_TOS_MINDISP 7 +#define CONF_TOS_MAXDIST 8 +#define CONF_TOS_MAXHOP 9 +#define CONF_TOS_BEACON 10 +#define CONF_TOS_ORPHAN 11 #ifdef OPENSSL /* @@ -165,10 +167,11 @@ #define CONF_CRYPTO_CERT 4 #define CONF_CRYPTO_RAND 5 #define CONF_CRYPTO_KEYS 6 -#define CONF_CRYPTO_IFFPAR 7 -#define CONF_CRYPTO_GQPAR 8 -#define CONF_CRYPTO_MVPAR 9 -#define CONF_CRYPTO_PW 10 +#define CONF_CRYPTO_IDENT 7 +#define CONF_CRYPTO_IFFPAR 8 +#define CONF_CRYPTO_GQPAR 9 +#define CONF_CRYPTO_MVPAR 10 +#define CONF_CRYPTO_PW 11 #endif /* OPENSSL */ /* |