Remove obsolete simulator command-line options

bk: 474549bbfoHVjT9KmvOAAtBf803BxA

diff --git a/ChangeLog b/ChangeLog
index 61f62af06ad05ccbd1b3a25d3ed44f8453e63658..04804c63038ee31739e767f37214cd37ef2eecc7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Remove obsolete simulator command-line options.
 * ntp_request.c: [CID 36] zero sin_zero.
 * [Bug 963] get_systime() is too noisy.
 * [Bug 960] spurious syslog:crypto_setup:spurious crypto command

diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index 18529faa63a9bfb380a6460e83a71aa6726e8fde..39f0a6b05f4afc70bb95a605c0dff1ee2a382a2f 100644 (file)
--- a/ntpd/ntpd-opts.c
+++ b/ntpd/ntpd-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.c)
  *  
- *  It has been AutoGen-ed  Wednesday November 21, 2007 at 06:40:24 AM EST
+ *  It has been AutoGen-ed  Thursday November 22, 2007 at 04:16:21 AM EST
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -112,25 +112,6 @@ tSCC    zBcastsync_NAME[]          = "BCASTSYNC";
 tSCC    zBcastsync_Name[]          = "bcastsync";
 #define BCASTSYNC_FLAGS       (OPTST_DISABLED)
 
-/*
- *  Simbroadcastdelay option description:
- */
-#ifdef SIM
-tSCC    zSimbroadcastdelayText[] =
-        "Simulator broadcast delay";
-tSCC    zSimbroadcastdelay_NAME[]  = "SIMBROADCASTDELAY";
-tSCC    zSimbroadcastdelay_Name[]  = "simbroadcastdelay";
-#define SIMBROADCASTDELAY_FLAGS       (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
-#else   /* disable Simbroadcastdelay */
-#define VALUE_OPT_SIMBROADCASTDELAY NO_EQUIVALENT
-#define SIMBROADCASTDELAY_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zSimbroadcastdelayText       NULL
-#define zSimbroadcastdelay_NAME      NULL
-#define zSimbroadcastdelay_Name      NULL
-#endif  /* SIM */
-
 /*
  *  Configfile option description:
  */
@@ -141,25 +122,6 @@ tSCC    zConfigfile_Name[]         = "configfile";
 #define CONFIGFILE_FLAGS       (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-/*
- *  Phasenoise option description:
- */
-#ifdef SIM
-tSCC    zPhasenoiseText[] =
-        "Phase noise level";
-tSCC    zPhasenoise_NAME[]         = "PHASENOISE";
-tSCC    zPhasenoise_Name[]         = "phasenoise";
-#define PHASENOISE_FLAGS       (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
-#else   /* disable Phasenoise */
-#define VALUE_OPT_PHASENOISE NO_EQUIVALENT
-#define PHASENOISE_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zPhasenoiseText       NULL
-#define zPhasenoise_NAME      NULL
-#define zPhasenoise_Name      NULL
-#endif  /* SIM */
-
 /*
  *  Debug_Level option description:
  */
@@ -216,25 +178,6 @@ tSCC    zPanicgate_NAME[]          = "PANICGATE";
 tSCC    zPanicgate_Name[]          = "panicgate";
 #define PANICGATE_FLAGS       (OPTST_DISABLED)
 
-/*
- *  Simslew option description:
- */
-#ifdef SIM
-tSCC    zSimslewText[] =
-        "Simuator slew";
-tSCC    zSimslew_NAME[]            = "SIMSLEW";
-tSCC    zSimslew_Name[]            = "simslew";
-#define SIMSLEW_FLAGS       (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
-#else   /* disable Simslew */
-#define VALUE_OPT_SIMSLEW NO_EQUIVALENT
-#define SIMSLEW_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zSimslewText       NULL
-#define zSimslew_NAME      NULL
-#define zSimslew_Name      NULL
-#endif  /* SIM */
-
 /*
  *  Jaildir option description:
  */
@@ -329,25 +272,6 @@ tSCC    zNice_NAME[]               = "NICE";
 tSCC    zNice_Name[]               = "nice";
 #define NICE_FLAGS       (OPTST_DISABLED)
 
-/*
- *  Servertime option description:
- */
-#ifdef SIM
-tSCC    zServertimeText[] =
-        "Server time";
-tSCC    zServertime_NAME[]         = "SERVERTIME";
-tSCC    zServertime_Name[]         = "servertime";
-#define SERVERTIME_FLAGS       (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
-#else   /* disable Servertime */
-#define VALUE_OPT_SERVERTIME NO_EQUIVALENT
-#define SERVERTIME_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zServertimeText       NULL
-#define zServertime_NAME      NULL
-#define zServertime_Name      NULL
-#endif  /* SIM */
-
 /*
  *  Pidfile option description:
  */
@@ -397,25 +321,6 @@ tSCC    zStatsdir_Name[]           = "statsdir";
 #define STATSDIR_FLAGS       (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-/*
- *  Endsimtime option description:
- */
-#ifdef SIM
-tSCC    zEndsimtimeText[] =
-        "Simulation end time";
-tSCC    zEndsimtime_NAME[]         = "ENDSIMTIME";
-tSCC    zEndsimtime_Name[]         = "endsimtime";
-#define ENDSIMTIME_FLAGS       (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
-#else   /* disable Endsimtime */
-#define VALUE_OPT_ENDSIMTIME NO_EQUIVALENT
-#define ENDSIMTIME_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zEndsimtimeText       NULL
-#define zEndsimtime_NAME      NULL
-#define zEndsimtime_Name      NULL
-#endif  /* SIM */
-
 /*
  *  Trustedkey option description:
  */
@@ -426,25 +331,6 @@ tSCC    zTrustedkey_Name[]         = "trustedkey";
 #define TRUSTEDKEY_FLAGS       (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-/*
- *  Freqerr option description:
- */
-#ifdef SIM
-tSCC    zFreqerrText[] =
-        "Simulation frequency error";
-tSCC    zFreqerr_NAME[]            = "FREQERR";
-tSCC    zFreqerr_Name[]            = "freqerr";
-#define FREQERR_FLAGS       (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
-#else   /* disable Freqerr */
-#define VALUE_OPT_FREQERR NO_EQUIVALENT
-#define FREQERR_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zFreqerrText       NULL
-#define zFreqerr_NAME      NULL
-#define zFreqerr_Name      NULL
-#endif  /* SIM */
-
 /*
  *  User option description:
  */
@@ -494,25 +380,6 @@ tSCC    zDvar_Name[]               = "dvar";
 #define DVAR_FLAGS       (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-/*
- *  Walknoise option description:
- */
-#ifdef SIM
-tSCC    zWalknoiseText[] =
-        "Simulation random walk noise";
-tSCC    zWalknoise_NAME[]          = "WALKNOISE";
-tSCC    zWalknoise_Name[]          = "walknoise";
-#define WALKNOISE_FLAGS       (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
-#else   /* disable Walknoise */
-#define VALUE_OPT_WALKNOISE NO_EQUIVALENT
-#define WALKNOISE_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zWalknoiseText       NULL
-#define zWalknoise_NAME      NULL
-#define zWalknoise_Name      NULL
-#endif  /* SIM */
-
 /*
  *  Slew option description:
  */
@@ -522,44 +389,6 @@ tSCC    zSlew_NAME[]               = "SLEW";
 tSCC    zSlew_Name[]               = "slew";
 #define SLEW_FLAGS       (OPTST_DISABLED)
 
-/*
- *  Ndelay option description:
- */
-#ifdef SIM
-tSCC    zNdelayText[] =
-        "Simulation network delay";
-tSCC    zNdelay_NAME[]             = "NDELAY";
-tSCC    zNdelay_Name[]             = "ndelay";
-#define NDELAY_FLAGS       (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
-#else   /* disable Ndelay */
-#define VALUE_OPT_NDELAY NO_EQUIVALENT
-#define NDELAY_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zNdelayText       NULL
-#define zNdelay_NAME      NULL
-#define zNdelay_Name      NULL
-#endif  /* SIM */
-
-/*
- *  Pdelay option description:
- */
-#ifdef SIM
-tSCC    zPdelayText[] =
-        "Simulation processing delay";
-tSCC    zPdelay_NAME[]             = "PDELAY";
-tSCC    zPdelay_Name[]             = "pdelay";
-#define PDELAY_FLAGS       (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
-
-#else   /* disable Pdelay */
-#define VALUE_OPT_PDELAY NO_EQUIVALENT
-#define PDELAY_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zPdelayText       NULL
-#define zPdelay_NAME      NULL
-#define zPdelay_Name      NULL
-#endif  /* SIM */
-
 /*
  *  Help/More_Help/Version option descriptions:
  */
@@ -683,20 +512,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zBcastsyncText, zBcastsync_NAME, zBcastsync_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 5, VALUE_OPT_SIMBROADCASTDELAY,
-     /* equiv idx, value */ 5, VALUE_OPT_SIMBROADCASTDELAY,
-     /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ SIMBROADCASTDELAY_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
-     /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
-     /* desc, NAME, name */ zSimbroadcastdelayText, zSimbroadcastdelay_NAME, zSimbroadcastdelay_Name,
-     /* disablement strs */ NULL, NULL },
-
-  {  /* entry idx, value */ 6, VALUE_OPT_CONFIGFILE,
-     /* equiv idx, value */ 6, VALUE_OPT_CONFIGFILE,
+  {  /* entry idx, value */ 5, VALUE_OPT_CONFIGFILE,
+     /* equiv idx, value */ 5, VALUE_OPT_CONFIGFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ CONFIGFILE_FLAGS, 0,
@@ -707,20 +524,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zConfigfileText, zConfigfile_NAME, zConfigfile_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 7, VALUE_OPT_PHASENOISE,
-     /* equiv idx, value */ 7, VALUE_OPT_PHASENOISE,
-     /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ PHASENOISE_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
-     /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
-     /* desc, NAME, name */ zPhasenoiseText, zPhasenoise_NAME, zPhasenoise_Name,
-     /* disablement strs */ NULL, NULL },
-
-  {  /* entry idx, value */ 8, VALUE_OPT_DEBUG_LEVEL,
-     /* equiv idx, value */ 8, VALUE_OPT_DEBUG_LEVEL,
+  {  /* entry idx, value */ 6, VALUE_OPT_DEBUG_LEVEL,
+     /* equiv idx, value */ 6, VALUE_OPT_DEBUG_LEVEL,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ DEBUG_LEVEL_FLAGS, 0,
@@ -731,8 +536,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zDebug_LevelText, zDebug_Level_NAME, zDebug_Level_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 9, VALUE_OPT_SET_DEBUG_LEVEL,
-     /* equiv idx, value */ 9, VALUE_OPT_SET_DEBUG_LEVEL,
+  {  /* entry idx, value */ 7, VALUE_OPT_SET_DEBUG_LEVEL,
+     /* equiv idx, value */ 7, VALUE_OPT_SET_DEBUG_LEVEL,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ SET_DEBUG_LEVEL_FLAGS, 0,
@@ -743,8 +548,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zSet_Debug_LevelText, zSet_Debug_Level_NAME, zSet_Debug_Level_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 10, VALUE_OPT_DRIFTFILE,
-     /* equiv idx, value */ 10, VALUE_OPT_DRIFTFILE,
+  {  /* entry idx, value */ 8, VALUE_OPT_DRIFTFILE,
+     /* equiv idx, value */ 8, VALUE_OPT_DRIFTFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ DRIFTFILE_FLAGS, 0,
@@ -755,8 +560,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zDriftfileText, zDriftfile_NAME, zDriftfile_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 11, VALUE_OPT_PANICGATE,
-     /* equiv idx, value */ 11, VALUE_OPT_PANICGATE,
+  {  /* entry idx, value */ 9, VALUE_OPT_PANICGATE,
+     /* equiv idx, value */ 9, VALUE_OPT_PANICGATE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PANICGATE_FLAGS, 0,
@@ -767,20 +572,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zPanicgateText, zPanicgate_NAME, zPanicgate_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 12, VALUE_OPT_SIMSLEW,
-     /* equiv idx, value */ 12, VALUE_OPT_SIMSLEW,
-     /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ SIMSLEW_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
-     /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
-     /* desc, NAME, name */ zSimslewText, zSimslew_NAME, zSimslew_Name,
-     /* disablement strs */ NULL, NULL },
-
-  {  /* entry idx, value */ 13, VALUE_OPT_JAILDIR,
-     /* equiv idx, value */ 13, VALUE_OPT_JAILDIR,
+  {  /* entry idx, value */ 10, VALUE_OPT_JAILDIR,
+     /* equiv idx, value */ 10, VALUE_OPT_JAILDIR,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ JAILDIR_FLAGS, 0,
@@ -791,8 +584,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zJaildirText, zJaildir_NAME, zJaildir_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 14, VALUE_OPT_INTERFACE,
-     /* equiv idx, value */ 14, VALUE_OPT_INTERFACE,
+  {  /* entry idx, value */ 11, VALUE_OPT_INTERFACE,
+     /* equiv idx, value */ 11, VALUE_OPT_INTERFACE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ INTERFACE_FLAGS, 0,
@@ -803,8 +596,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zInterfaceText, zInterface_NAME, zInterface_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 15, VALUE_OPT_KEYFILE,
-     /* equiv idx, value */ 15, VALUE_OPT_KEYFILE,
+  {  /* entry idx, value */ 12, VALUE_OPT_KEYFILE,
+     /* equiv idx, value */ 12, VALUE_OPT_KEYFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ KEYFILE_FLAGS, 0,
@@ -815,8 +608,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zKeyfileText, zKeyfile_NAME, zKeyfile_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 16, VALUE_OPT_LOGFILE,
-     /* equiv idx, value */ 16, VALUE_OPT_LOGFILE,
+  {  /* entry idx, value */ 13, VALUE_OPT_LOGFILE,
+     /* equiv idx, value */ 13, VALUE_OPT_LOGFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ LOGFILE_FLAGS, 0,
@@ -827,8 +620,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zLogfileText, zLogfile_NAME, zLogfile_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 17, VALUE_OPT_NOVIRTUALIPS,
-     /* equiv idx, value */ 17, VALUE_OPT_NOVIRTUALIPS,
+  {  /* entry idx, value */ 14, VALUE_OPT_NOVIRTUALIPS,
+     /* equiv idx, value */ 14, VALUE_OPT_NOVIRTUALIPS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ NOVIRTUALIPS_FLAGS, 0,
@@ -839,8 +632,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zNovirtualipsText, zNovirtualips_NAME, zNovirtualips_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 18, VALUE_OPT_MODIFYMMTIMER,
-     /* equiv idx, value */ 18, VALUE_OPT_MODIFYMMTIMER,
+  {  /* entry idx, value */ 15, VALUE_OPT_MODIFYMMTIMER,
+     /* equiv idx, value */ 15, VALUE_OPT_MODIFYMMTIMER,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ MODIFYMMTIMER_FLAGS, 0,
@@ -851,8 +644,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zModifymmtimerText, zModifymmtimer_NAME, zModifymmtimer_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 19, VALUE_OPT_NOFORK,
-     /* equiv idx, value */ 19, VALUE_OPT_NOFORK,
+  {  /* entry idx, value */ 16, VALUE_OPT_NOFORK,
+     /* equiv idx, value */ 16, VALUE_OPT_NOFORK,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ NOFORK_FLAGS, 0,
@@ -863,8 +656,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zNoforkText, zNofork_NAME, zNofork_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 20, VALUE_OPT_NICE,
-     /* equiv idx, value */ 20, VALUE_OPT_NICE,
+  {  /* entry idx, value */ 17, VALUE_OPT_NICE,
+     /* equiv idx, value */ 17, VALUE_OPT_NICE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ NICE_FLAGS, 0,
@@ -875,20 +668,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zNiceText, zNice_NAME, zNice_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 21, VALUE_OPT_SERVERTIME,
-     /* equiv idx, value */ 21, VALUE_OPT_SERVERTIME,
-     /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ SERVERTIME_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
-     /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
-     /* desc, NAME, name */ zServertimeText, zServertime_NAME, zServertime_Name,
-     /* disablement strs */ NULL, NULL },
-
-  {  /* entry idx, value */ 22, VALUE_OPT_PIDFILE,
-     /* equiv idx, value */ 22, VALUE_OPT_PIDFILE,
+  {  /* entry idx, value */ 18, VALUE_OPT_PIDFILE,
+     /* equiv idx, value */ 18, VALUE_OPT_PIDFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PIDFILE_FLAGS, 0,
@@ -899,8 +680,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zPidfileText, zPidfile_NAME, zPidfile_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 23, VALUE_OPT_PRIORITY,
-     /* equiv idx, value */ 23, VALUE_OPT_PRIORITY,
+  {  /* entry idx, value */ 19, VALUE_OPT_PRIORITY,
+     /* equiv idx, value */ 19, VALUE_OPT_PRIORITY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PRIORITY_FLAGS, 0,
@@ -911,8 +692,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zPriorityText, zPriority_NAME, zPriority_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 24, VALUE_OPT_QUIT,
-     /* equiv idx, value */ 24, VALUE_OPT_QUIT,
+  {  /* entry idx, value */ 20, VALUE_OPT_QUIT,
+     /* equiv idx, value */ 20, VALUE_OPT_QUIT,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ QUIT_FLAGS, 0,
@@ -923,8 +704,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zQuitText, zQuit_NAME, zQuit_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 25, VALUE_OPT_PROPAGATIONDELAY,
-     /* equiv idx, value */ 25, VALUE_OPT_PROPAGATIONDELAY,
+  {  /* entry idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY,
+     /* equiv idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PROPAGATIONDELAY_FLAGS, 0,
@@ -935,8 +716,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zPropagationdelayText, zPropagationdelay_NAME, zPropagationdelay_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 26, VALUE_OPT_STATSDIR,
-     /* equiv idx, value */ 26, VALUE_OPT_STATSDIR,
+  {  /* entry idx, value */ 22, VALUE_OPT_STATSDIR,
+     /* equiv idx, value */ 22, VALUE_OPT_STATSDIR,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ STATSDIR_FLAGS, 0,
@@ -947,20 +728,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zStatsdirText, zStatsdir_NAME, zStatsdir_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 27, VALUE_OPT_ENDSIMTIME,
-     /* equiv idx, value */ 27, VALUE_OPT_ENDSIMTIME,
-     /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ ENDSIMTIME_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
-     /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
-     /* desc, NAME, name */ zEndsimtimeText, zEndsimtime_NAME, zEndsimtime_Name,
-     /* disablement strs */ NULL, NULL },
-
-  {  /* entry idx, value */ 28, VALUE_OPT_TRUSTEDKEY,
-     /* equiv idx, value */ 28, VALUE_OPT_TRUSTEDKEY,
+  {  /* entry idx, value */ 23, VALUE_OPT_TRUSTEDKEY,
+     /* equiv idx, value */ 23, VALUE_OPT_TRUSTEDKEY,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ TRUSTEDKEY_FLAGS, 0,
@@ -971,20 +740,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zTrustedkeyText, zTrustedkey_NAME, zTrustedkey_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 29, VALUE_OPT_FREQERR,
-     /* equiv idx, value */ 29, VALUE_OPT_FREQERR,
-     /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ FREQERR_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
-     /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
-     /* desc, NAME, name */ zFreqerrText, zFreqerr_NAME, zFreqerr_Name,
-     /* disablement strs */ NULL, NULL },
-
-  {  /* entry idx, value */ 30, VALUE_OPT_USER,
-     /* equiv idx, value */ 30, VALUE_OPT_USER,
+  {  /* entry idx, value */ 24, VALUE_OPT_USER,
+     /* equiv idx, value */ 24, VALUE_OPT_USER,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ USER_FLAGS, 0,
@@ -995,8 +752,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zUserText, zUser_NAME, zUser_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 31, VALUE_OPT_UPDATEINTERVAL,
-     /* equiv idx, value */ 31, VALUE_OPT_UPDATEINTERVAL,
+  {  /* entry idx, value */ 25, VALUE_OPT_UPDATEINTERVAL,
+     /* equiv idx, value */ 25, VALUE_OPT_UPDATEINTERVAL,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ UPDATEINTERVAL_FLAGS, 0,
@@ -1007,8 +764,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zUpdateintervalText, zUpdateinterval_NAME, zUpdateinterval_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 32, VALUE_OPT_VAR,
-     /* equiv idx, value */ 32, VALUE_OPT_VAR,
+  {  /* entry idx, value */ 26, VALUE_OPT_VAR,
+     /* equiv idx, value */ 26, VALUE_OPT_VAR,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ VAR_FLAGS, 0,
@@ -1019,8 +776,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zVarText, zVar_NAME, zVar_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 33, VALUE_OPT_DVAR,
-     /* equiv idx, value */ 33, VALUE_OPT_DVAR,
+  {  /* entry idx, value */ 27, VALUE_OPT_DVAR,
+     /* equiv idx, value */ 27, VALUE_OPT_DVAR,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ DVAR_FLAGS, 0,
@@ -1031,20 +788,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zDvarText, zDvar_NAME, zDvar_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 34, VALUE_OPT_WALKNOISE,
-     /* equiv idx, value */ 34, VALUE_OPT_WALKNOISE,
-     /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ WALKNOISE_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
-     /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
-     /* desc, NAME, name */ zWalknoiseText, zWalknoise_NAME, zWalknoise_Name,
-     /* disablement strs */ NULL, NULL },
-
-  {  /* entry idx, value */ 35, VALUE_OPT_SLEW,
-     /* equiv idx, value */ 35, VALUE_OPT_SLEW,
+  {  /* entry idx, value */ 28, VALUE_OPT_SLEW,
+     /* equiv idx, value */ 28, VALUE_OPT_SLEW,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ SLEW_FLAGS, 0,
@@ -1055,30 +800,6 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zSlewText, zSlew_NAME, zSlew_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 36, VALUE_OPT_NDELAY,
-     /* equiv idx, value */ 36, VALUE_OPT_NDELAY,
-     /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ NDELAY_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
-     /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
-     /* desc, NAME, name */ zNdelayText, zNdelay_NAME, zNdelay_Name,
-     /* disablement strs */ NULL, NULL },
-
-  {  /* entry idx, value */ 37, VALUE_OPT_PDELAY,
-     /* equiv idx, value */ 37, VALUE_OPT_PDELAY,
-     /* equivalenced to  */ NO_EQUIVALENT,
-     /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ PDELAY_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
-     /* arg list/cookie  */ NULL,
-     /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
-     /* desc, NAME, name */ zPdelayText, zPdelay_NAME, zPdelay_Name,
-     /* disablement strs */ NULL, NULL },
-
 #ifdef NO_OPTIONAL_OPT_ARGS
 #  define VERSION_OPT_FLAGS     OPTST_IMM | OPTST_NO_INIT
 #else
@@ -1178,7 +899,7 @@ tOptions ntpdOptions = {
       NO_EQUIVALENT /* index of '-#' option */,
       NO_EQUIVALENT /* index of default opt */
     },
-    41 /* full option count */, 38 /* user option count */
+    32 /* full option count */, 29 /* user option count */
 };
 
 /*

diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index b62815a3b7f32a4cb2e70e2646a3677c4894f949..ca4ec4d575261c05113710d1fb3edbc7dc56dfc7 100644 (file)
--- a/ntpd/ntpd-opts.h
+++ b/ntpd/ntpd-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.h)
  *  
- *  It has been AutoGen-ed  Wednesday November 21, 2007 at 06:40:23 AM EST
+ *  It has been AutoGen-ed  Thursday November 22, 2007 at 04:16:20 AM EST
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -57,45 +57,36 @@ typedef enum {
         INDEX_OPT_AUTHREQ          =  2,
         INDEX_OPT_AUTHNOREQ        =  3,
         INDEX_OPT_BCASTSYNC        =  4,
-        INDEX_OPT_SIMBROADCASTDELAY =  5,
-        INDEX_OPT_CONFIGFILE       =  6,
-        INDEX_OPT_PHASENOISE       =  7,
-        INDEX_OPT_DEBUG_LEVEL      =  8,
-        INDEX_OPT_SET_DEBUG_LEVEL  =  9,
-        INDEX_OPT_DRIFTFILE        = 10,
-        INDEX_OPT_PANICGATE        = 11,
-        INDEX_OPT_SIMSLEW          = 12,
-        INDEX_OPT_JAILDIR          = 13,
-        INDEX_OPT_INTERFACE        = 14,
-        INDEX_OPT_KEYFILE          = 15,
-        INDEX_OPT_LOGFILE          = 16,
-        INDEX_OPT_NOVIRTUALIPS     = 17,
-        INDEX_OPT_MODIFYMMTIMER    = 18,
-        INDEX_OPT_NOFORK           = 19,
-        INDEX_OPT_NICE             = 20,
-        INDEX_OPT_SERVERTIME       = 21,
-        INDEX_OPT_PIDFILE          = 22,
-        INDEX_OPT_PRIORITY         = 23,
-        INDEX_OPT_QUIT             = 24,
-        INDEX_OPT_PROPAGATIONDELAY = 25,
-        INDEX_OPT_STATSDIR         = 26,
-        INDEX_OPT_ENDSIMTIME       = 27,
-        INDEX_OPT_TRUSTEDKEY       = 28,
-        INDEX_OPT_FREQERR          = 29,
-        INDEX_OPT_USER             = 30,
-        INDEX_OPT_UPDATEINTERVAL   = 31,
-        INDEX_OPT_VAR              = 32,
-        INDEX_OPT_DVAR             = 33,
-        INDEX_OPT_WALKNOISE        = 34,
-        INDEX_OPT_SLEW             = 35,
-        INDEX_OPT_NDELAY           = 36,
-        INDEX_OPT_PDELAY           = 37,
-        INDEX_OPT_VERSION          = 38,
-        INDEX_OPT_HELP             = 39,
-        INDEX_OPT_MORE_HELP        = 40
+        INDEX_OPT_CONFIGFILE       =  5,
+        INDEX_OPT_DEBUG_LEVEL      =  6,
+        INDEX_OPT_SET_DEBUG_LEVEL  =  7,
+        INDEX_OPT_DRIFTFILE        =  8,
+        INDEX_OPT_PANICGATE        =  9,
+        INDEX_OPT_JAILDIR          = 10,
+        INDEX_OPT_INTERFACE        = 11,
+        INDEX_OPT_KEYFILE          = 12,
+        INDEX_OPT_LOGFILE          = 13,
+        INDEX_OPT_NOVIRTUALIPS     = 14,
+        INDEX_OPT_MODIFYMMTIMER    = 15,
+        INDEX_OPT_NOFORK           = 16,
+        INDEX_OPT_NICE             = 17,
+        INDEX_OPT_PIDFILE          = 18,
+        INDEX_OPT_PRIORITY         = 19,
+        INDEX_OPT_QUIT             = 20,
+        INDEX_OPT_PROPAGATIONDELAY = 21,
+        INDEX_OPT_STATSDIR         = 22,
+        INDEX_OPT_TRUSTEDKEY       = 23,
+        INDEX_OPT_USER             = 24,
+        INDEX_OPT_UPDATEINTERVAL   = 25,
+        INDEX_OPT_VAR              = 26,
+        INDEX_OPT_DVAR             = 27,
+        INDEX_OPT_SLEW             = 28,
+        INDEX_OPT_VERSION          = 29,
+        INDEX_OPT_HELP             = 30,
+        INDEX_OPT_MORE_HELP        = 31
 } teOptIndex;
 
-#define OPTION_CT    41
+#define OPTION_CT    32
 #define NTPD_VERSION       "4.2.5p99"
 #define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.5p99"
 
@@ -144,18 +135,10 @@ typedef enum {
 #  warning undefining BCASTSYNC due to option name conflict
 #  undef   BCASTSYNC
 # endif
-# ifdef    SIMBROADCASTDELAY
-#  warning undefining SIMBROADCASTDELAY due to option name conflict
-#  undef   SIMBROADCASTDELAY
-# endif
 # ifdef    CONFIGFILE
 #  warning undefining CONFIGFILE due to option name conflict
 #  undef   CONFIGFILE
 # endif
-# ifdef    PHASENOISE
-#  warning undefining PHASENOISE due to option name conflict
-#  undef   PHASENOISE
-# endif
 # ifdef    DEBUG_LEVEL
 #  warning undefining DEBUG_LEVEL due to option name conflict
 #  undef   DEBUG_LEVEL
@@ -172,10 +155,6 @@ typedef enum {
 #  warning undefining PANICGATE due to option name conflict
 #  undef   PANICGATE
 # endif
-# ifdef    SIMSLEW
-#  warning undefining SIMSLEW due to option name conflict
-#  undef   SIMSLEW
-# endif
 # ifdef    JAILDIR
 #  warning undefining JAILDIR due to option name conflict
 #  undef   JAILDIR
@@ -208,10 +187,6 @@ typedef enum {
 #  warning undefining NICE due to option name conflict
 #  undef   NICE
 # endif
-# ifdef    SERVERTIME
-#  warning undefining SERVERTIME due to option name conflict
-#  undef   SERVERTIME
-# endif
 # ifdef    PIDFILE
 #  warning undefining PIDFILE due to option name conflict
 #  undef   PIDFILE
@@ -232,18 +207,10 @@ typedef enum {
 #  warning undefining STATSDIR due to option name conflict
 #  undef   STATSDIR
 # endif
-# ifdef    ENDSIMTIME
-#  warning undefining ENDSIMTIME due to option name conflict
-#  undef   ENDSIMTIME
-# endif
 # ifdef    TRUSTEDKEY
 #  warning undefining TRUSTEDKEY due to option name conflict
 #  undef   TRUSTEDKEY
 # endif
-# ifdef    FREQERR
-#  warning undefining FREQERR due to option name conflict
-#  undef   FREQERR
-# endif
 # ifdef    USER
 #  warning undefining USER due to option name conflict
 #  undef   USER
@@ -260,36 +227,21 @@ typedef enum {
 #  warning undefining DVAR due to option name conflict
 #  undef   DVAR
 # endif
-# ifdef    WALKNOISE
-#  warning undefining WALKNOISE due to option name conflict
-#  undef   WALKNOISE
-# endif
 # ifdef    SLEW
 #  warning undefining SLEW due to option name conflict
 #  undef   SLEW
 # endif
-# ifdef    NDELAY
-#  warning undefining NDELAY due to option name conflict
-#  undef   NDELAY
-# endif
-# ifdef    PDELAY
-#  warning undefining PDELAY due to option name conflict
-#  undef   PDELAY
-# endif
 #else  /* NO_OPTION_NAME_WARNINGS */
 # undef IPV4
 # undef IPV6
 # undef AUTHREQ
 # undef AUTHNOREQ
 # undef BCASTSYNC
-# undef SIMBROADCASTDELAY
 # undef CONFIGFILE
-# undef PHASENOISE
 # undef DEBUG_LEVEL
 # undef SET_DEBUG_LEVEL
 # undef DRIFTFILE
 # undef PANICGATE
-# undef SIMSLEW
 # undef JAILDIR
 # undef INTERFACE
 # undef KEYFILE
@@ -298,23 +250,17 @@ typedef enum {
 # undef MODIFYMMTIMER
 # undef NOFORK
 # undef NICE
-# undef SERVERTIME
 # undef PIDFILE
 # undef PRIORITY
 # undef QUIT
 # undef PROPAGATIONDELAY
 # undef STATSDIR
-# undef ENDSIMTIME
 # undef TRUSTEDKEY
-# undef FREQERR
 # undef USER
 # undef UPDATEINTERVAL
 # undef VAR
 # undef DVAR
-# undef WALKNOISE
 # undef SLEW
-# undef NDELAY
-# undef PDELAY
 #endif  /*  NO_OPTION_NAME_WARNINGS */
 
 /*
@@ -327,13 +273,7 @@ typedef enum {
 #define VALUE_OPT_AUTHREQ        'a'
 #define VALUE_OPT_AUTHNOREQ      'A'
 #define VALUE_OPT_BCASTSYNC      'b'
-#ifdef SIM
-#define VALUE_OPT_SIMBROADCASTDELAY 'B'
-#endif /* SIM */
 #define VALUE_OPT_CONFIGFILE     'c'
-#ifdef SIM
-#define VALUE_OPT_PHASENOISE     'C'
-#endif /* SIM */
 #ifdef DEBUG
 #define VALUE_OPT_DEBUG_LEVEL    'd'
 #endif /* DEBUG */
@@ -342,9 +282,6 @@ typedef enum {
 #endif /* DEBUG */
 #define VALUE_OPT_DRIFTFILE      'f'
 #define VALUE_OPT_PANICGATE      'g'
-#ifdef SIM
-#define VALUE_OPT_SIMSLEW        'H'
-#endif /* SIM */
 #ifdef HAVE_DROPROOT
 #define VALUE_OPT_JAILDIR        'i'
 #endif /* HAVE_DROPROOT */
@@ -357,39 +294,21 @@ typedef enum {
 #endif /* SYS_WINNT */
 #define VALUE_OPT_NOFORK         'n'
 #define VALUE_OPT_NICE           'N'
-#ifdef SIM
-#define VALUE_OPT_SERVERTIME     'O'
-#endif /* SIM */
 #define VALUE_OPT_PIDFILE        'p'
 #define VALUE_OPT_PRIORITY       'P'
 #define OPT_VALUE_PRIORITY       (DESC(PRIORITY).optArg.argInt)
 #define VALUE_OPT_QUIT           'q'
 #define VALUE_OPT_PROPAGATIONDELAY 'r'
 #define VALUE_OPT_STATSDIR       's'
-#ifdef SIM
-#define VALUE_OPT_ENDSIMTIME     'S'
-#endif /* SIM */
 #define VALUE_OPT_TRUSTEDKEY     't'
-#ifdef SIM
-#define VALUE_OPT_FREQERR        'T'
-#endif /* SIM */
 #ifdef HAVE_DROPROOT
 #define VALUE_OPT_USER           'u'
 #endif /* HAVE_DROPROOT */
 #define VALUE_OPT_UPDATEINTERVAL 'U'
 #define OPT_VALUE_UPDATEINTERVAL (DESC(UPDATEINTERVAL).optArg.argInt)
-#define VALUE_OPT_VAR            32
-#define VALUE_OPT_DVAR           129
-#ifdef SIM
-#define VALUE_OPT_WALKNOISE      'W'
-#endif /* SIM */
+#define VALUE_OPT_VAR            26
+#define VALUE_OPT_DVAR           27
 #define VALUE_OPT_SLEW           'x'
-#ifdef SIM
-#define VALUE_OPT_NDELAY         'Y'
-#endif /* SIM */
-#ifdef SIM
-#define VALUE_OPT_PDELAY         'Z'
-#endif /* SIM */
 
 #define VALUE_OPT_VERSION       INDEX_OPT_VERSION
 #define VALUE_OPT_HELP          '?'

diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index 3029175186d0a3a71c2214bbd04833ffc3ee7579..69b55f1400a6a38aba70ba4968fba73e64880306 100644 (file)
--- a/ntpd/ntpd-opts.texi
+++ b/ntpd/ntpd-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpd-opts.texi)
 # 
-# It has been AutoGen-ed  Wednesday November 21, 2007 at 06:40:27 AM EST
+# It has been AutoGen-ed  Thursday November 22, 2007 at 04:16:24 AM EST
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -28,8 +28,6 @@ This software is released under a specialized copyright license.
 * ntpd debug-level::            debug-level option (-d)
 * ntpd driftfile::              driftfile option (-f)
 * ntpd dvar::                   dvar option
-* ntpd endsimtime::             endsimtime option (-S)
-* ntpd freqerr::                freqerr option (-T)
 * ntpd interface::              interface option (-I)
 * ntpd ipv4::                   ipv4 option (-4)
 * ntpd ipv6::                   ipv6 option (-6)
@@ -37,28 +35,21 @@ This software is released under a specialized copyright license.
 * ntpd keyfile::                keyfile option (-k)
 * ntpd logfile::                logfile option (-l)
 * ntpd modifymmtimer::          modifymmtimer option (-M)
-* ntpd ndelay::                 ndelay option (-Y)
 * ntpd nice::                   nice option (-N)
 * ntpd nofork::                 nofork option (-n)
 * ntpd novirtualips::           novirtualips option (-L)
 * ntpd panicgate::              panicgate option (-g)
-* ntpd pdelay::                 pdelay option (-Z)
-* ntpd phasenoise::             phasenoise option (-C)
 * ntpd pidfile::                pidfile option (-p)
 * ntpd priority::               priority option (-P)
 * ntpd propagationdelay::       propagationdelay option (-r)
 * ntpd quit::                   quit option (-q)
-* ntpd servertime::             servertime option (-O)
 * ntpd set-debug-level::        set-debug-level option (-D)
-* ntpd simbroadcastdelay::      simbroadcastdelay option (-B)
-* ntpd simslew::                simslew option (-H)
 * ntpd slew::                   slew option (-x)
 * ntpd statsdir::               statsdir option (-s)
 * ntpd trustedkey::             trustedkey option (-t)
 * ntpd updateinterval::         updateinterval option (-U)
 * ntpd user::                   user option (-u)
 * ntpd var::                    var option
-* ntpd walknoise::              walknoise option (-W)
 @end menu
 
 @node ntpd usage
@@ -196,20 +187,6 @@ This is almost never a good idea.
 This is the ``allow us to sync to broadcast servers'' option.
 
 
-@node ntpd simbroadcastdelay
-@subsection simbroadcastdelay option (-B)
-@cindex ntpd-simbroadcastdelay
-
-This is the ``simulator broadcast delay'' option.
-
-This option has some usage constraints.  It:
-@itemize @bullet
-@item
-must be compiled in by defining @code{SIM} during the compilation.
-@end itemize
-
-
-
 @node ntpd configfile
 @subsection configfile option (-c)
 @cindex ntpd-configfile
@@ -219,20 +196,6 @@ The name and path of the configuration file,
 /etc/ntp.conf
 by default.
 
-@node ntpd phasenoise
-@subsection phasenoise option (-C)
-@cindex ntpd-phasenoise
-
-This is the ``phase noise level'' option.
-
-This option has some usage constraints.  It:
-@itemize @bullet
-@item
-must be compiled in by defining @code{SIM} during the compilation.
-@end itemize
-
-
-
 @node ntpd debug-level
 @subsection debug-level option (-d)
 @cindex ntpd-debug-level
@@ -298,20 +261,6 @@ See the
 tinker
 configuration file directive for other options.
 
-@node ntpd simslew
-@subsection simslew option (-H)
-@cindex ntpd-simslew
-
-This is the ``simuator slew'' option.
-
-This option has some usage constraints.  It:
-@itemize @bullet
-@item
-must be compiled in by defining @code{SIM} during the compilation.
-@end itemize
-
-
-
 @node ntpd jaildir
 @subsection jaildir option (-i)
 @cindex ntpd-jaildir
@@ -406,20 +355,6 @@ To the extent permitted by the operating system, run
 ntpd
 at the highest priority.
 
-@node ntpd servertime
-@subsection servertime option (-O)
-@cindex ntpd-servertime
-
-This is the ``server time'' option.
-
-This option has some usage constraints.  It:
-@itemize @bullet
-@item
-must be compiled in by defining @code{SIM} during the compilation.
-@end itemize
-
-
-
 @node ntpd pidfile
 @subsection pidfile option (-p)
 @cindex ntpd-pidfile
@@ -476,20 +411,6 @@ This is the same operation as the
 statsdir statsdir
 configuration file directive.
 
-@node ntpd endsimtime
-@subsection endsimtime option (-S)
-@cindex ntpd-endsimtime
-
-This is the ``simulation end time'' option.
-
-This option has some usage constraints.  It:
-@itemize @bullet
-@item
-must be compiled in by defining @code{SIM} during the compilation.
-@end itemize
-
-
-
 @node ntpd trustedkey
 @subsection trustedkey option (-t)
 @cindex ntpd-trustedkey
@@ -504,20 +425,6 @@ may appear an unlimited number of times.
 
 Add a key number to the trusted key list.
 
-@node ntpd freqerr
-@subsection freqerr option (-T)
-@cindex ntpd-freqerr
-
-This is the ``simulation frequency error'' option.
-
-This option has some usage constraints.  It:
-@itemize @bullet
-@item
-must be compiled in by defining @code{SIM} during the compilation.
-@end itemize
-
-
-
 @node ntpd user
 @subsection user option (-u)
 @cindex ntpd-user
@@ -576,20 +483,6 @@ may appear an unlimited number of times.
 
 
 
-@node ntpd walknoise
-@subsection walknoise option (-W)
-@cindex ntpd-walknoise
-
-This is the ``simulation random walk noise'' option.
-
-This option has some usage constraints.  It:
-@itemize @bullet
-@item
-must be compiled in by defining @code{SIM} during the compilation.
-@end itemize
-
-
-
 @node ntpd slew
 @subsection slew option (-x)
 @cindex ntpd-slew
@@ -608,31 +501,3 @@ See the
 tinker
 configuration file directive for other options.
 Note: The kernel time discipline is disabled with this option.
-
-@node ntpd ndelay
-@subsection ndelay option (-Y)
-@cindex ntpd-ndelay
-
-This is the ``simulation network delay'' option.
-
-This option has some usage constraints.  It:
-@itemize @bullet
-@item
-must be compiled in by defining @code{SIM} during the compilation.
-@end itemize
-
-
-
-@node ntpd pdelay
-@subsection pdelay option (-Z)
-@cindex ntpd-pdelay
-
-This is the ``simulation processing delay'' option.
-
-This option has some usage constraints.  It:
-@itemize @bullet
-@item
-must be compiled in by defining @code{SIM} during the compilation.
-@end itemize
-
-

diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index 52913d0c0240b46c73288108e4a4772656f2bba7..4605ec620a62e9751cb1e9213eb9c1b133e7b6aa 100644 (file)
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2007-11-21 "( 4.2.5p99)" "Programmer's Manual"
+.TH NTPD 1 2007-11-22 "( 4.2.5p99)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  Wednesday November 21, 2007 at 06:40:26 AM EST
+.\"  It has been AutoGen-ed  Thursday November 22, 2007 at 04:16:22 AM EST
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"
@@ -54,11 +54,6 @@ This is almost never a good idea.
 Allow us to sync to broadcast servers.
 .sp
 
-.TP
-.BR \-B " \fIstring\fP, " \--simbroadcastdelay "=" \fIstring\fP
-Simulator broadcast delay.
-.sp
-
 .TP
 .BR \-c " \fIstring\fP, " \--configfile "=" \fIstring\fP
 configuration file name.
@@ -66,11 +61,6 @@ configuration file name.
 The name and path of the configuration file,
 /etc/ntp.conf
 by default.
-.TP
-.BR \-C " \fIstring\fP, " \--phasenoise "=" \fIstring\fP
-Phase noise level.
-.sp
-
 .TP
 .BR \-d ", " \--debug-level
 Increase output debug message level.
@@ -112,11 +102,6 @@ options.
 See the
 tinker
 configuration file directive for other options.
-.TP
-.BR \-H " \fIstring\fP, " \--simslew "=" \fIstring\fP
-Simuator slew.
-.sp
-
 .TP
 .BR \-i " \fIstring\fP, " \--jaildir "=" \fIstring\fP
 Jail directory.
@@ -175,11 +160,6 @@ Run at high priority.
 To the extent permitted by the operating system, run
 ntpd
 at the highest priority.
-.TP
-.BR \-O " \fIstring\fP, " \--servertime "=" \fIstring\fP
-Server time.
-.sp
-
 .TP
 .BR \-p " \fIstring\fP, " \--pidfile "=" \fIstring\fP
 path to the PID file.
@@ -227,22 +207,12 @@ Specify the directory path for files created by the statistics facility.
 This is the same operation as the
 statsdir statsdir
 configuration file directive.
-.TP
-.BR \-S " \fIstring\fP, " \--endsimtime "=" \fIstring\fP
-Simulation end time.
-.sp
-
 .TP
 .BR \-t " \fItkey\fP, " \--trustedkey "=" \fItkey\fP
 Trusted key number.
 This option may appear an unlimited number of times.
 .sp
 Add a key number to the trusted key list.
-.TP
-.BR \-T " \fIstring\fP, " \--freqerr "=" \fIstring\fP
-Simulation frequency error.
-.sp
-
 .TP
 .BR \-u " \fIstring\fP, " \--user "=" \fIstring\fP
 Run as userid (or userid:groupid).
@@ -275,11 +245,6 @@ make ARG an ntp variable (RW|DEF).
 This option may appear an unlimited number of times.
 .sp
 
-.TP
-.BR \-W " \fIstring\fP, " \--walknoise "=" \fIstring\fP
-Simulation random walk noise.
-.sp
-
 .TP
 .BR \-x ", " \--slew
 Slew up to 600 seconds.
@@ -297,16 +262,6 @@ See the
 tinker
 configuration file directive for other options.
 Note: The kernel time discipline is disabled with this option.
-.TP
-.BR \-Y " \fIstring\fP, " \--ndelay "=" \fIstring\fP
-Simulation network delay.
-.sp
-
-.TP
-.BR \-Z " \fIstring\fP, " \--pdelay "=" \fIstring\fP
-Simulation processing delay.
-.sp
-
 .TP
 .BR \-? , " \--help"
 Display usage information and exit.

diff --git a/ntpd/ntpdbase-opts.def b/ntpd/ntpdbase-opts.def
index 5110177f96590b53a721b002a4f849a1dae9d54c..b7073b0a502288d624cacaa1e1c2d841cbbbe120 100644 (file)
--- a/ntpd/ntpdbase-opts.def
+++ b/ntpd/ntpdbase-opts.def
@@ -56,16 +56,6 @@ flag = {
        _EndOfDoc_;
 };
 
-flag = {
-    ifdef     = SIM;
-    name      = simbroadcastdelay;
-    value     = B;
-    arg-type  = string;
-    descrip   = "Simulator broadcast delay";
-    doc = <<-  _EndOfDoc_
-       _EndOfDoc_;
-};
-
 flag = {
     name      = configfile;
     value     = c;
@@ -78,16 +68,6 @@ flag = {
        _EndOfDoc_;
 };
 
-flag = {
-    ifdef     = SIM;
-    name      = phasenoise;
-    value     = C;
-    arg-type  = string;
-    descrip   = "Phase noise level";
-    doc = <<-  _EndOfDoc_
-       _EndOfDoc_;
-};
-
 #include debug-opt.def
 
 flag = {
@@ -127,16 +107,6 @@ flag = {
        _EndOfDoc_;
 };
 
-flag = {
-    ifdef     = SIM;
-    name      = simslew;
-    value     = H;
-    arg-type  = string;
-    descrip   = "Simuator slew";
-    doc = <<-  _EndOfDoc_
-       _EndOfDoc_;
-};
-
 flag = {
     ifdef     = HAVE_DROPROOT;
     name      = jaildir;
@@ -233,16 +203,6 @@ flag = {
        _EndOfDoc_;
 };
 
-flag = {
-    ifdef     = SIM;
-    name      = servertime;
-    value     = O;
-    arg-type  = string;
-    descrip   = "Server time";
-    doc = <<-  _EndOfDoc_
-       _EndOfDoc_;
-};
-
 flag = {
     name      = pidfile;
     value     = p;
@@ -313,16 +273,6 @@ flag = {
        _EndOfDoc_;
 };
 
-flag = {
-    ifdef     = SIM;
-    name      = endsimtime;
-    value     = S;
-    arg-type  = string;
-    descrip   = "Simulation end time";
-    doc = <<-  _EndOfDoc_
-       _EndOfDoc_;
-};
-
 flag = {
     name      = trustedkey;
     value     = t;
@@ -336,16 +286,6 @@ flag = {
        _EndOfDoc_;
 };
 
-flag = {
-    ifdef     = SIM;
-    name      = freqerr;
-    value     = T;
-    arg-type  = string;
-    descrip   = "Simulation frequency error";
-    doc = <<-  _EndOfDoc_
-       _EndOfDoc_;
-};
-
 flag = {
     ifdef     = HAVE_DROPROOT;
     name      = user;
@@ -400,16 +340,6 @@ flag = {
        _EndOfDoc_;
 };
 
-flag = {
-    ifdef     = SIM;
-    name      = walknoise;
-    value     = W;
-    arg-type  = string;
-    descrip   = "Simulation random walk noise";
-    doc = <<-  _EndOfDoc_
-       _EndOfDoc_;
-};
-
 flag = {
     name      = slew;
     value     = x;
@@ -430,23 +360,3 @@ flag = {
        Note: The kernel time discipline is disabled with this option.
        _EndOfDoc_;
 };
-
-flag = {
-    ifdef     = SIM;
-    name      = ndelay;
-    value     = Y;
-    arg-type  = string;
-    descrip   = "Simulation network delay";
-    doc = <<-  _EndOfDoc_
-       _EndOfDoc_;
-};
-
-flag = {
-    ifdef     = SIM;
-    name      = pdelay;
-    value     = Z;
-    arg-type  = string;
-    descrip   = "Simulation processing delay";
-    doc = <<-  _EndOfDoc_
-       _EndOfDoc_;
-};