From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 25 Sep 2006 05:53:46 +0000 (-0400)
Subject: autogen upgrade
X-Git-Tag: NTP_4_2_3P51~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64b9889b25fdb8d668ffa4219d85e8052de3c012;p=thirdparty%2Fntp.git

autogen upgrade

bk: 45176eeahq9ttAY79dSHdb65WPGwIQ
---

diff --git a/NEWS b/NEWS
index cf9b9a75c..8b92efda5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,12 @@
+* K&R C support is being deprecated.
 * [Bug 714] ntpq -p should conflict with -i, not -c.
 * WWV refclock improvements from Dave Mills.
 * [Bug 689] Deprecate HEATH GC-1001 II; the driver never worked.
-* [Bug 342] Deprecate broken TRAK refclock driver
-* [Bug 340] Deprecate broken MSF EES refclock driver
-* Support separate PPS devices for PARSE refclocks
-* [Bug 637, 51?] Dynamic interface scanning can now be done
-* Options processing now uses GNU AutoGen
+* [Bug 342] Deprecate broken TRAK refclock driver.
+* [Bug 340] Deprecate broken MSF EES refclock driver.
+* Support separate PPS devices for PARSE refclocks.
+* [Bug 637, 51?] Dynamic interface scanning can now be done.
+* Options processing now uses GNU AutoGen.
 
 (4.2.2p4) Released by Harlan Stenn <stenn@ntp.isc.org>
  * [Bug 710] compat getnameinfo() has off-by-one error
diff --git a/clockstuff/clktest-opts.c b/clockstuff/clktest-opts.c
index 20077cc66..6c917eefb 100644
--- a/clockstuff/clktest-opts.c
+++ b/clockstuff/clktest-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (clktest-opts.c)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 02:18:25 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:45:20 AM EDT
  *  From the definitions    clktest-opts.def
  *  and the template file   options
  */
@@ -36,7 +36,7 @@ tSCC zCopyright[] =
        "clktest copyright (c) 1970-2006 ntp.org, all rights reserved";
 tSCC zCopyrightNotice[] =
        
-/* extracted from /backroom/ntp-dev/include/copyright.def near line 8 */
+/* extracted from /deacon/backroom/ntp-dev/include/copyright.def near line 8 */
 "see html/copyright.html";
 extern tUsageProc optionUsage;
 
@@ -421,7 +421,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "CLKTEST";
 tSCC   zUsageTitle[] =
-"clktest - test the clock line discipline - Ver. 4.2.3p49\n\
+"clktest - test the clock line discipline - Ver. 4.2.3p50\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... <tty_device>\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
@@ -606,6 +606,7 @@ doOptMagic1(
     tOptions*   pOptions,
     tOptDesc*   pOptDesc )
 {
+    /* extracted from clktest-opts.def, line 102 */
     unsigned long tmp;
 
     if (!atouint(pOptDesc->pzLastArg, &tmp)) {
@@ -629,6 +630,7 @@ doOptSpeed(
     tOptions*   pOptions,
     tOptDesc*   pOptDesc )
 {
+    /* extracted from clktest-opts.def, line 125 */
     /*
      * speed table
      */
@@ -680,6 +682,7 @@ doOptCrmod(
     tOptions*   pOptions,
     tOptDesc*   pOptDesc )
 {
+    /* extracted from clktest-opts.def, line 179 */
     ttflags |= CRMOD;
 }
 
diff --git a/clockstuff/clktest-opts.h b/clockstuff/clktest-opts.h
index 4aeaeacb2..542581bd8 100644
--- a/clockstuff/clktest-opts.h
+++ b/clockstuff/clktest-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (clktest-opts.h)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 02:18:25 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:45:19 AM EDT
  *  From the definitions    clktest-opts.def
  *  and the template file   options
  */
@@ -67,8 +67,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    13
-#define CLKTEST_VERSION       "4.2.3p49"
-#define CLKTEST_FULL_VERSION  "clktest - test the clock line discipline - Ver. 4.2.3p49"
+#define CLKTEST_VERSION       "4.2.3p50"
+#define CLKTEST_FULL_VERSION  "clktest - test the clock line discipline - Ver. 4.2.3p50"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/libopts/autoopts.c b/libopts/autoopts.c
index 712be238f..c08885083 100644
--- a/libopts/autoopts.c
+++ b/libopts/autoopts.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: autoopts.c,v 4.24 2006/09/23 00:12:48 bkorb Exp $
+ *  $Id: autoopts.c,v 4.26 2006/09/24 02:10:44 bkorb Exp $
  *  Time-stamp:      "2006-09-22 18:21:53 bkorb"
  *
  *  This file contains all of the routines that must be linked into
@@ -1083,7 +1083,6 @@ optionProcess(
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/autoopts.c */
diff --git a/libopts/autoopts.h b/libopts/autoopts.h
index e6fcd90bc..b7805fe74 100644
--- a/libopts/autoopts.h
+++ b/libopts/autoopts.h
@@ -2,7 +2,7 @@
 /*
  *  Time-stamp:      "2006-09-10 14:43:25 bkorb"
  *
- *  autoopts.h  $Id: autoopts.h,v 4.28 2006/09/23 00:12:48 bkorb Exp $
+ *  autoopts.h  $Id: autoopts.h,v 4.29 2006/09/24 02:10:45 bkorb Exp $
  *  Time-stamp:      "2005-02-14 05:59:50 bkorb"
  *
  *  This file defines all the global structures and special values
@@ -331,7 +331,6 @@ extern tOptProc optionPrintVersion, optionPagedUsage, optionLoadOpt;
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/autoopts.h */
diff --git a/libopts/autoopts/options.h b/libopts/autoopts/options.h
index da129fd29..1dfc6f0d8 100644
--- a/libopts/autoopts/options.h
+++ b/libopts/autoopts/options.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (options.h)
  *  
- *  It has been AutoGen-ed  Friday September 22, 2006 at 06:21:59 PM PDT
+ *  It has been AutoGen-ed  Sunday September 24, 2006 at 03:28:25 PM PDT
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
@@ -718,7 +718,7 @@ extern void optionUnloadNested( const tOptionValue* );
 extern char const* optionVersion( void );
 
 
-/* From: ../compat/pathfind.c line 33
+/* From: ../compat/pathfind.c line 34
  *
  * pathfind - fild a file in a list of directories
  *
diff --git a/libopts/autoopts/usage-txt.h b/libopts/autoopts/usage-txt.h
index 849b8aa80..8bc08065b 100644
--- a/libopts/autoopts/usage-txt.h
+++ b/libopts/autoopts/usage-txt.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (usage-txt.h)
  *  
- *  It has been AutoGen-ed  Friday September 22, 2006 at 06:21:57 PM PDT
+ *  It has been AutoGen-ed  Sunday September 24, 2006 at 03:28:22 PM PDT
  *  From the definitions    usage-txt.def
  *  and the template file   usage-txt.tpl
  *
@@ -183,7 +183,7 @@ extern usage_text_t option_usage_text;
   static char    eng_zGnuKeyLArg[] = "=Mbr";
   static char    eng_zGnuNumArg[] = "=num";
   static char    eng_zGnuStrArg[] = "=str";
-static const char usage_txt[3202] =
+static char const usage_txt[3202] =
     "AutoOpts function called without option descriptor\n\0"
     "\tThis exceeds the compiled library version:  \0"
     "Automated Options Processing Error!\n"
diff --git a/libopts/boolean.c b/libopts/boolean.c
index ad80794a5..7549113fe 100644
--- a/libopts/boolean.c
+++ b/libopts/boolean.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: boolean.c,v 4.6 2006/03/25 19:23:28 bkorb Exp $
+ *  $Id: boolean.c,v 4.8 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:13:34 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -96,7 +96,6 @@ optionBooleanVal( tOptions* pOpts, tOptDesc* pOD )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/boolean.c */
diff --git a/libopts/compat/compat.h b/libopts/compat/compat.h
index 15ea0c6bc..38e38d583 100644
--- a/libopts/compat/compat.h
+++ b/libopts/compat/compat.h
@@ -7,7 +7,7 @@
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
  * Created:          Mon Jun 30 15:54:46 1997
  *
- * $Id: compat.h,v 4.13 2006/09/16 19:58:35 bkorb Exp $
+ * $Id: compat.h,v 4.14 2006/09/24 02:10:45 bkorb Exp $
  */
 #ifndef COMPAT_H_GUARD
 #define COMPAT_H_GUARD 1
@@ -307,7 +307,6 @@
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of compat/compat.h */
diff --git a/libopts/compat/pathfind.c b/libopts/compat/pathfind.c
index ab3d173ba..e74a8f63f 100644
--- a/libopts/compat/pathfind.c
+++ b/libopts/compat/pathfind.c
@@ -4,11 +4,12 @@
 
 /*
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
+ * Time-stamp:       "2006-09-23 19:46:16 bkorb"
  * Created:          Tue Jun 24 15:07:31 1997
- * Last Modified:    $Date: 2006/09/23 00:48:05 $
+ * Last Modified:    $Date: 2006/09/24 02:57:02 $
  *            by: bkorb
  *
- * $Id: pathfind.c,v 4.8 2006/09/23 00:48:05 bkorb Exp $
+ * $Id: pathfind.c,v 4.10 2006/09/24 02:57:02 bkorb Exp $
  */
 
 /* Code: */
@@ -333,7 +334,6 @@ extract_colon_unit( char* pzDir, char const *string, int *p_index )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of compat/pathfind.c */
diff --git a/libopts/compat/strchr.c b/libopts/compat/strchr.c
index ca8a517a8..413f999ff 100644
--- a/libopts/compat/strchr.c
+++ b/libopts/compat/strchr.c
@@ -55,7 +55,6 @@ strrchr( char const *s, int c)
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of compat/strsignal.c */
diff --git a/libopts/compat/windows-config.h b/libopts/compat/windows-config.h
index 359b17b69..02f81160d 100644
--- a/libopts/compat/windows-config.h
+++ b/libopts/compat/windows-config.h
@@ -1,3 +1,9 @@
+
+/*
+ * Time-stamp:        "2006-09-23 19:44:29 bkorb"
+ *             by: bkorb
+ * Last Committed:    $Date: 2006/09/24 02:57:02 $
+ */
 #ifndef WINDOWS_CONFIG_HACKERY
 #define WINDOWS_CONFIG_HACKERY 1
 
diff --git a/libopts/configfile.c b/libopts/configfile.c
index 64deccdd3..bdde8de80 100644
--- a/libopts/configfile.c
+++ b/libopts/configfile.c
@@ -1,6 +1,6 @@
 /*
- *  $Id: configfile.c,v 4.26 2006/09/23 00:12:48 bkorb Exp $
- *  Time-stamp:      "2006-09-22 18:01:50 bkorb"
+ *  $Id: configfile.c,v 4.28 2006/09/24 02:10:45 bkorb Exp $
+ *  Time-stamp:      "2006-09-24 15:18:51 bkorb"
  *
  *  configuration/rc/ini file handling.
  */
@@ -204,8 +204,8 @@ optionFindValue( const tOptDesc* pOptDesc,
 
     else do {
         tArgList* pAL = pOptDesc->optCookie;
-        int ct = pAL->useCt;
-        tCC** ppOV = pAL->apzArgs;
+        int    ct   = pAL->useCt;
+        void** ppOV = (void**)(pAL->apzArgs);
 
         if (ct == 0) {
             errno = ENOENT;
@@ -218,7 +218,7 @@ optionFindValue( const tOptDesc* pOptDesc,
         }
 
         while (--ct >= 0) {
-            const tOptionValue* pOV = (tOptionValue*)*(ppOV++);
+            const tOptionValue* pOV = *(ppOV++);
             const tOptionValue* pRV = optionGetValue( pOV, pzName );
 
             if (pRV == NULL)
@@ -281,8 +281,8 @@ optionFindNextValue( const tOptDesc* pOptDesc, const tOptionValue* pPrevVal,
 
     else do {
         tArgList* pAL = pOptDesc->optCookie;
-        int ct = pAL->useCt;
-        tCC** ppOV = pAL->apzArgs;
+        int    ct   = pAL->useCt;
+        void** ppOV = (void**)pAL->apzArgs;
 
         if (ct == 0) {
             errno = ENOENT;
@@ -290,7 +290,7 @@ optionFindNextValue( const tOptDesc* pOptDesc, const tOptionValue* pPrevVal,
         }
 
         while (--ct >= 0) {
-            tOptionValue* pOV = (tOptionValue*)*(ppOV++);
+            tOptionValue* pOV = *(ppOV++);
             if (foundOldVal) {
                 pRes = pOV;
                 break;
@@ -344,15 +344,15 @@ optionGetValue( const tOptionValue* pOld, char const* pzValName )
     pAL = pOld->v.nestVal;
 
     if (pAL->useCt > 0) {
-        int ct = pAL->useCt;
-        tCC** papOV = pAL->apzArgs;
+        int    ct    = pAL->useCt;
+        void** papOV = (void**)(pAL->apzArgs);
 
         if (pzValName == NULL) {
             pRes = (tOptionValue*)*papOV;
         }
 
         else do {
-            tOptionValue* pOV = (tOptionValue*)*(papOV++);
+            tOptionValue* pOV = *(papOV++);
             if (strcmp( pOV->pzName, pzValName ) == 0) {
                 pRes = pOV;
                 break;
@@ -405,11 +405,11 @@ optionNextValue( const tOptionValue* pOVList, const tOptionValue* pOldOV )
     }
     pAL = pOVList->v.nestVal;
     {
-        int   ct   = pAL->useCt;
-        tCC** papNV = pAL->apzArgs;
+        int    ct    = pAL->useCt;
+        void** papNV = (void**)(pAL->apzArgs);
 
         while (ct-- > 0) {
-            tOptionValue* pNV = (tOptionValue*)*(papNV++);
+            tOptionValue* pNV = *(papNV++);
             if (pNV == pOldOV) {
                 if (ct == 0) {
                     err = ENOENT;
@@ -461,14 +461,14 @@ filePreset(
         st.flags = OPTST_SET;
 
     do  {
-        while (isspace( *pzFileText ))  pzFileText++;
+        while (isspace( (int)*pzFileText ))  pzFileText++;
 
-        if (isalpha( *pzFileText )) {
+        if (isalpha( (int)*pzFileText )) {
             pzFileText = handleConfig( pOpts, &st, pzFileText, direction );
 
         } else switch (*pzFileText) {
         case '<':
-            if (isalpha( pzFileText[1] ))
+            if (isalpha( (int)pzFileText[1] ))
                 pzFileText = handleStructure(pOpts, &st, pzFileText, direction);
 
             else switch (pzFileText[1]) {
@@ -544,8 +544,8 @@ handleConfig(
     if (pzEnd == NULL)
         return pzText + strlen(pzText);
 
-    while (ISNAMECHAR( *pzText ))  pzText++;
-    while (isspace( *pzText )) pzText++;
+    while (ISNAMECHAR( (int)*pzText ))  pzText++;
+    while (isspace( (int)*pzText )) pzText++;
     if (pzText > pzEnd) {
     name_only:
         *pzEnd++ = NUL;
@@ -559,10 +559,10 @@ handleConfig(
      *  is an invalid format and we give up parsing the text.
      */
     if ((*pzText == '=') || (*pzText == ':')) {
-        while (isspace( *++pzText ))   ;
+        while (isspace( (int)*++pzText ))   ;
         if (pzText > pzEnd)
             goto name_only;
-    } else if (! isspace(pzText[-1]))
+    } else if (! isspace((int)pzText[-1]))
         return NULL;
 
     /*
@@ -626,7 +626,7 @@ handleDirective(
     size_t name_len;
 
     if (  (strncmp( pzText+2, zProg, title_len ) != 0)
-       || (! isspace( pzText[title_len+2] )) )  {
+       || (! isspace( (int)pzText[title_len+2] )) )  {
         pzText = strchr( pzText+2, '>' );
         if (pzText != NULL)
             pzText++;
@@ -640,8 +640,8 @@ handleDirective(
     do  {
         pzText += title_len;
 
-        if (isspace(*pzText)) {
-            while (isspace(*pzText))  pzText++;
+        if (isspace((int)*pzText)) {
+            while (isspace((int)*pzText))  pzText++;
             if (  (strneqvcmp( pzText, pOpts->pzProgName, (int)name_len) == 0)
                && (pzText[name_len] == '>'))  {
                 pzText += name_len + 1;
@@ -991,7 +991,7 @@ parseAttributes(
             break;
         }
 
-        while (isspace( *++pzText ))   ;
+        while (isspace( (int)*++pzText ))   ;
 
         if (strncmp( pzText, zLoadType, lenLoadType ) == 0) {
             pzText = parseValueType( pzText+lenLoadType, pType );
@@ -1046,7 +1046,7 @@ parseLoadMode(
         if (strncmp( pzText, zLoadCooked, len ) == 0) {
             if (  (pzText[len] == '>')
                || (pzText[len] == '/')
-               || isspace(pzText[len])) {
+               || isspace((int)pzText[len])) {
                 *pMode = OPTION_LOAD_COOKED;
                 return pzText + len;
             }
@@ -1059,7 +1059,7 @@ parseLoadMode(
         if (strncmp( pzText, zLoadUncooked, len ) == 0) {
             if (  (pzText[len] == '>')
                || (pzText[len] == '/')
-               || isspace(pzText[len])) {
+               || isspace((int)pzText[len])) {
                 *pMode = OPTION_LOAD_UNCOOKED;
                 return pzText + len;
             }
@@ -1072,7 +1072,7 @@ parseLoadMode(
         if (strncmp( pzText, zLoadKeep, len ) == 0) {
             if (  (pzText[len] == '>')
                || (pzText[len] == '/')
-               || isspace(pzText[len])) {
+               || isspace((int)pzText[len])) {
                 *pMode = OPTION_LOAD_KEEP;
                 return pzText + len;
             }
@@ -1113,7 +1113,7 @@ parseValueType(
     {
         size_t len = strlen(zLtypeString);
         if (strncmp( pzText, zLtypeString, len ) == 0) {
-            if ((pzText[len] == '>') || isspace(pzText[len])) {
+            if ((pzText[len] == '>') || isspace((int)pzText[len])) {
                 pType->valType = OPARG_TYPE_STRING;
                 return pzText + len;
             }
@@ -1124,7 +1124,7 @@ parseValueType(
     {
         size_t len = strlen(zLtypeInteger);
         if (strncmp( pzText, zLtypeInteger, len ) == 0) {
-            if ((pzText[len] == '>') || isspace(pzText[len])) {
+            if ((pzText[len] == '>') || isspace((int)pzText[len])) {
                 pType->valType = OPARG_TYPE_NUMERIC;
                 return pzText + len;
             }
@@ -1146,7 +1146,7 @@ parseValueType(
     {
         size_t len = strlen(zLtypeKeyword);
         if (strncmp( pzText, zLtypeKeyword, len ) == 0) {
-            if ((pzText[len] == '>') || isspace(pzText[len])) {
+            if ((pzText[len] == '>') || isspace((int)pzText[len])) {
                 pType->valType = OPARG_TYPE_ENUMERATION;
                 return pzText + len;
             }
@@ -1157,7 +1157,7 @@ parseValueType(
     {
         size_t len = strlen(zLtypeSetMembership);
         if (strncmp( pzText, zLtypeSetMembership, len ) == 0) {
-            if ((pzText[len] == '>') || isspace(pzText[len])) {
+            if ((pzText[len] == '>') || isspace((int)pzText[len])) {
                 pType->valType = OPARG_TYPE_MEMBERSHIP;
                 return pzText + len;
             }
@@ -1168,7 +1168,7 @@ parseValueType(
     {
         size_t len = strlen(zLtypeNest);
         if (strncmp( pzText, zLtypeNest, len ) == 0) {
-            if ((pzText[len] == '>') || isspace(pzText[len])) {
+            if ((pzText[len] == '>') || isspace((int)pzText[len])) {
                 pType->valType = OPARG_TYPE_HIERARCHY;
                 return pzText + len;
             }
@@ -1190,7 +1190,7 @@ static char*
 skipUnknown( char* pzText )
 {
     for (;; pzText++) {
-        if (isspace( *pzText ))  return pzText;
+        if (isspace( (int)*pzText ))  return pzText;
         switch (*pzText) {
         case NUL: return NULL;
         case '/':
@@ -1273,7 +1273,6 @@ validateOptionsStruct( tOptions* pOpts, char const* pzProgram )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/configfile.c */
diff --git a/libopts/cook.c b/libopts/cook.c
index 00503959a..9685d0641 100644
--- a/libopts/cook.c
+++ b/libopts/cook.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: cook.c,v 4.7 2006/09/23 00:12:48 bkorb Exp $
- *  Time-stamp:      "2006-06-24 11:29:58 bkorb"
+ *  $Id: cook.c,v 4.8 2006/09/24 02:10:45 bkorb Exp $
+ *  Time-stamp:      "2006-09-24 15:21:02 bkorb"
  *
  *  This file contains the routines that deal with processing quoted strings
  *  into an internal format.
@@ -106,7 +106,7 @@ ao_string_cook_escape_char( char const* pzIn, char* pRes, u_int nl )
     case 'v': *pRes = '\v'; break;
 
     case 'x':         /* HEX Escape       */
-        if (isxdigit( *pzIn ))  {
+        if (isxdigit( (int)*pzIn ))  {
             unsigned int  val;
             unsigned char ch = *pzIn++;
 
@@ -140,7 +140,7 @@ ao_string_cook_escape_char( char const* pzIn, char* pRes, u_int nl )
          *  IF the character copied was an octal digit,
          *  THEN set the output character to an octal value
          */
-        if (isdigit( *pRes ) && (*pRes < '8'))  {
+        if (isdigit( (int)*pRes ) && (*pRes < '8'))  {
             unsigned int  val = *pRes - '0';
             unsigned char ch  = *pzIn++;
 
@@ -239,7 +239,7 @@ ao_string_cook( char* pzScan, int* pLineCt )
             pzS++;
 
         scan_for_quote:
-            while (isspace(*pzS))
+            while (isspace((int)*pzS))
                 if (*(pzS++) == '\n')
                     (*pLineCt)++;
 
@@ -349,7 +349,6 @@ ao_string_cook( char* pzScan, int* pLineCt )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/cook.c */
diff --git a/libopts/enumeration.c b/libopts/enumeration.c
index 29f624fa2..4586967c7 100644
--- a/libopts/enumeration.c
+++ b/libopts/enumeration.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: enumeration.c,v 4.12 2006/09/23 00:12:48 bkorb Exp $
+ *  $Id: enumeration.c,v 4.14 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:00:53 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -479,7 +479,6 @@ optionSetMembers(
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/enumeration.c */
diff --git a/libopts/environment.c b/libopts/environment.c
index aacb253b0..1ac3fe8eb 100644
--- a/libopts/environment.c
+++ b/libopts/environment.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: environment.c,v 4.11 2006/09/23 00:12:48 bkorb Exp $
+ *  $Id: environment.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2005-10-29 13:23:59 bkorb"
  *
  *  This file contains all of the routines that must be linked into
@@ -255,7 +255,6 @@ doEnvPresets( tOptions* pOpts, teEnvPresetType type )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/environment.c */
diff --git a/libopts/genshell.c b/libopts/genshell.c
index f7549c881..7c5e12f74 100644
--- a/libopts/genshell.c
+++ b/libopts/genshell.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.c)
  *  
- *  It has been AutoGen-ed  Friday September 22, 2006 at 06:22:00 PM PDT
+ *  It has been AutoGen-ed  Sunday September 24, 2006 at 03:28:26 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  */
diff --git a/libopts/genshell.h b/libopts/genshell.h
index bbb8ec3c5..44760b784 100644
--- a/libopts/genshell.h
+++ b/libopts/genshell.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.h)
  *  
- *  It has been AutoGen-ed  Friday September 22, 2006 at 06:21:59 PM PDT
+ *  It has been AutoGen-ed  Sunday September 24, 2006 at 03:28:26 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  */
diff --git a/libopts/load.c b/libopts/load.c
index 18ea27f4d..46ac97dc2 100644
--- a/libopts/load.c
+++ b/libopts/load.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: load.c,v 4.24 2006/09/23 00:12:48 bkorb Exp $
- *  Time-stamp:      "2006-07-01 12:43:03 bkorb"
+ *  $Id: load.c,v 4.25 2006/09/24 02:10:45 bkorb Exp $
+ *  Time-stamp:      "2006-09-24 15:23:01 bkorb"
  *
  *  This file contains the routines that deal with processing text strings
  *  for options, either from a NUL-terminated string passed in or from an
@@ -258,10 +258,10 @@ insertEnvVal(
     char* pzDir = pzBuf;
 
     for (;;) {
-        char ch = *++pzName;
+        int ch = (int)*++pzName;
         if (! ISNAMECHAR( ch ))
             break;
-        *(pzDir++) = ch;
+        *(pzDir++) = (char)ch;
     }
 
     if (pzDir == pzBuf)
@@ -293,16 +293,16 @@ mungeString( char* pzTxt, tOptionLoadMode mode )
     if (mode == OPTION_LOAD_KEEP)
         return;
 
-    if (isspace( *pzTxt )) {
+    if (isspace( (int)*pzTxt )) {
         char* pzS = pzTxt;
         char* pzD = pzTxt;
-        while (isspace( *++pzS ))  ;
+        while (isspace( (int)*++pzS ))  ;
         while ((*(pzD++) = *(pzS++)) != NUL)   ;
         pzE = pzD-1;
     } else
         pzE = pzTxt + strlen( pzTxt );
 
-    while ((pzE > pzTxt) && isspace( pzE[-1] ))  pzE--;
+    while ((pzE > pzTxt) && isspace( (int)pzE[-1] ))  pzE--;
     *pzE = NUL;
 
     if (mode == OPTION_LOAD_UNCOOKED)
@@ -352,9 +352,9 @@ assembleArgValue( char* pzTxt, tOptionLoadMode mode )
      *  because we'll have to skip over an immediately following ':' or '='
      *  (and the white space following *that*).
      */
-    space_break = isspace(*pzEnd);
+    space_break = isspace((int)*pzEnd);
     *(pzEnd++) = NUL;
-    while (isspace(*pzEnd))  pzEnd++;
+    while (isspace((int)*pzEnd))  pzEnd++;
     if (space_break && ((*pzEnd == ':') || (*pzEnd == '=')))
         pzEnd++;
 
@@ -377,7 +377,7 @@ loadOptionLine(
     tDirection  direction,
     tOptionLoadMode   load_mode )
 {
-    while (isspace( *pzLine ))  pzLine++;
+    while (isspace( (int)*pzLine ))  pzLine++;
 
     {
         char* pzArg = assembleArgValue( pzLine, load_mode );
@@ -514,7 +514,6 @@ optionLoadLine(
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/load.c */
diff --git a/libopts/m4/libopts.m4 b/libopts/m4/libopts.m4
index 3c9c214b7..6fea8bfd7 100644
--- a/libopts/m4/libopts.m4
+++ b/libopts/m4/libopts.m4
@@ -2,7 +2,7 @@ dnl  -*- buffer-read-only: t -*- vi: set ro:
 dnl 
 dnl DO NOT EDIT THIS FILE   (libopts.m4)
 dnl 
-dnl It has been AutoGen-ed  Friday September 22, 2006 at 06:22:01 PM PDT
+dnl It has been AutoGen-ed  Sunday September 24, 2006 at 03:28:29 PM PDT
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -400,6 +400,9 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
 
 dnl @synopsis  LIBOPTS_CHECK
 dnl
+dnl Time-stamp:        "2006-09-23 19:36:24 bkorb"
+dnl Last Committed:    $Date: 2006/09/24 02:57:02 $
+dnl
 dnl If autoopts-config works, add the linking information to LIBS.
 dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
 dnl the config tests that the library needs.  Invoke the
diff --git a/libopts/m4/liboptschk.m4 b/libopts/m4/liboptschk.m4
index 26f9c241e..2c473a08a 100644
--- a/libopts/m4/liboptschk.m4
+++ b/libopts/m4/liboptschk.m4
@@ -3,7 +3,10 @@ dnl Copyright (C) 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
-dnl
+
+dnl Time-stamp:        "2006-09-23 19:42:31 bkorb"
+dnl Last Committed:    $Date: 2006/09/24 02:57:02 $
+
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
diff --git a/libopts/makeshell.c b/libopts/makeshell.c
index 36d3201d6..4051a27b5 100644
--- a/libopts/makeshell.c
+++ b/libopts/makeshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: makeshell.c,v 4.15 2006/09/23 00:12:48 bkorb Exp $
+ *  $Id: makeshell.c,v 4.17 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:19:24 bkorb"
  *
  *  This module will interpret the options set in the tOptions
@@ -1104,7 +1104,6 @@ genshelloptUsage( tOptions*  pOpts, int exitCode )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/makeshell.c */
diff --git a/libopts/nested.c b/libopts/nested.c
index f4e665068..013b742c3 100644
--- a/libopts/nested.c
+++ b/libopts/nested.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: nested.c,v 4.11 2006/09/23 00:12:48 bkorb Exp $
- *  Time-stamp:      "2006-09-22 18:14:12 bkorb"
+ *  $Id: nested.c,v 4.13 2006/09/24 02:10:45 bkorb Exp $
+ *  Time-stamp:      "2006-09-24 15:27:32 bkorb"
  *
  *   Automated Options Nested Values module.
  */
@@ -197,12 +197,12 @@ addBoolValue( void** pp, char const* pzName, size_t nameLen,
     pNV = AGALOC( sz, "option name/bool value pair" );
     if (pNV == NULL)
         return NULL;
-    while (isspace( *pzValue ) && (dataLen > 0)) {
+    while (isspace( (int)*pzValue ) && (dataLen > 0)) {
         dataLen--; pzValue++;
     }
     if (dataLen == 0)
         pNV->v.boolVal = 0;
-    else if (isdigit( *pzValue ))
+    else if (isdigit( (int)*pzValue ))
         pNV->v.boolVal = atoi( pzValue );
     else switch (*pzValue) {
     case 'f':
@@ -237,7 +237,7 @@ addNumberValue( void** pp, char const* pzName, size_t nameLen,
     pNV = AGALOC( sz, "option name/bool value pair" );
     if (pNV == NULL)
         return NULL;
-    while (isspace( *pzValue ) && (dataLen > 0)) {
+    while (isspace( (int)*pzValue ) && (dataLen > 0)) {
         dataLen--; pzValue++;
     }
     if (dataLen == 0)
@@ -300,9 +300,9 @@ scanNameEntry( char const* pzName, tOptionValue* pRes, tOptionLoadMode mode )
     size_t nameLen = 1;
     size_t dataLen = 0;
 
-    while (ISNAMECHAR( *pzScan ))  { pzScan++; nameLen++; }
+    while (ISNAMECHAR( (int)*pzScan ))  { pzScan++; nameLen++; }
 
-    while (isspace( *pzScan )) {
+    while (isspace( (int)*pzScan )) {
         char ch = *(pzScan++);
         if ((ch == '\n') || (ch == ',')) {
             addStringValue( &(pRes->v.nestVal), pzName, nameLen, NULL, 0 );
@@ -313,7 +313,7 @@ scanNameEntry( char const* pzName, tOptionValue* pRes, tOptionLoadMode mode )
     switch (*pzScan) {
     case '=':
     case ':':
-        while (isspace( *++pzScan ))  ;
+        while (isspace( (int)*++pzScan ))  ;
         switch (*pzScan) {
         case ',':  goto comma_char;
         case '"':
@@ -390,7 +390,7 @@ scanXmlEntry( char const* pzName, tOptionValue* pRes, tOptionLoadMode mode )
     tOptionValue  valu;
     tOptionValue* pNewVal;
 
-    if (! isalpha(*pzName)) {
+    if (! isalpha((int)*pzName)) {
         switch (*pzName) {
         default:
             pzName = NULL;
@@ -411,7 +411,7 @@ scanXmlEntry( char const* pzName, tOptionValue* pRes, tOptionLoadMode mode )
         return pzName;
     }
 
-    while (isalpha( *++pzScan ))  nameLen++;
+    while (isalpha( (int)*++pzScan ))  nameLen++;
     if (nameLen > 64)
         return NULL;
     valu.valType = OPARG_TYPE_STRING;
@@ -461,7 +461,7 @@ scanXmlEntry( char const* pzName, tOptionValue* pRes, tOptionLoadMode mode )
             return NULL;
         valLen = (pzScan - pzVal);
         pzScan += nameLen + 3;
-        while (isspace( *pzScan ))  pzScan++;
+        while (isspace(  (int)*pzScan ))  pzScan++;
     }
 
     switch (valu.valType) {
@@ -514,7 +514,7 @@ unloadNestedArglist( tArgList* pAL )
     tCC** ppNV = pAL->apzArgs;
 
     while (ct-- > 0) {
-        tOptionValue* pNV = (tOptionValue*)*(ppNV++);
+        tOptionValue* pNV = (tOptionValue*)(void*)*(ppNV++);
         if (pNV->valType == OPARG_TYPE_HIERARCHY)
             unloadNestedArglist( pNV->v.nestVal );
         free( pNV );
@@ -566,8 +566,8 @@ sortNestedList( tArgList* pAL )
      */
     for (ix = 0; ++ix < lm;) {
         int iy = ix-1;
-        tOptionValue* pNewNV = (tOptionValue*)pAL->apzArgs[ix];
-        tOptionValue* pOldNV = (tOptionValue*)pAL->apzArgs[iy];
+        tOptionValue* pNewNV = (tOptionValue*)(void*)(pAL->apzArgs[ix]);
+        tOptionValue* pOldNV = (tOptionValue*)(void*)(pAL->apzArgs[iy]);
 
         /*
          *  For as long as the new entry precedes the "old" entry,
@@ -576,7 +576,7 @@ sortNestedList( tArgList* pAL )
          */
         while (strcmp( pOldNV->pzName, pNewNV->pzName ) > 0) {
             pAL->apzArgs[iy+1] = (void*)pOldNV;
-            pOldNV = (tOptionValue*)pAL->apzArgs[--iy];
+            pOldNV = (tOptionValue*)(void*)(pAL->apzArgs[--iy]);
             if (iy < 0)
                 break;
         }
@@ -621,7 +621,7 @@ optionLoadNested( char const* pzTxt, char const* pzName, size_t nameLen,
         errno = EINVAL;
         return NULL;
     }
-    while (isspace( *pzTxt ))  pzTxt++;
+    while (isspace( (int)*pzTxt ))  pzTxt++;
     if (*pzTxt == NUL) {
         errno = ENOENT;
         return NULL;
@@ -649,8 +649,8 @@ optionLoadNested( char const* pzTxt, char const* pzName, size_t nameLen,
      *  Scan until we hit a NUL.
      */
     do  {
-        while (isspace( *pzTxt ))  pzTxt++;
-        if (isalpha( *pzTxt )) {
+        while (isspace( (int)*pzTxt ))  pzTxt++;
+        if (isalpha( (int)*pzTxt )) {
             pzTxt = scanNameEntry( pzTxt, pRes, mode );
         }
         else switch (*pzTxt) {
@@ -699,7 +699,6 @@ optionNestedVal( tOptions* pOpts, tOptDesc* pOD )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/nested.c */
diff --git a/libopts/numeric.c b/libopts/numeric.c
index d21c927e1..486981fb5 100644
--- a/libopts/numeric.c
+++ b/libopts/numeric.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: numeric.c,v 4.7 2006/03/25 19:23:28 bkorb Exp $
+ *  $Id: numeric.c,v 4.9 2006/09/24 02:10:45 bkorb Exp $
  *  Time-stamp:      "2006-09-22 18:14:38 bkorb"
  */
 
@@ -83,7 +83,6 @@ optionNumericVal( tOptions* pOpts, tOptDesc* pOD )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/numeric.c */
diff --git a/libopts/pgusage.c b/libopts/pgusage.c
index 61684555d..85b558c0d 100644
--- a/libopts/pgusage.c
+++ b/libopts/pgusage.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: pgusage.c,v 4.12 2006/07/16 15:27:50 bkorb Exp $
+ *  $Id: pgusage.c,v 4.13 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-07-16 08:13:26 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -152,7 +152,6 @@ optionPagedUsage( tOptions* pOptions, tOptDesc* pOD )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/pgusage.c */
diff --git a/libopts/proto.h b/libopts/proto.h
index 55bf229b5..80f1d06e3 100644
--- a/libopts/proto.h
+++ b/libopts/proto.h
@@ -1,7 +1,7 @@
 /* -*- buffer-read-only: t -*- vi: set ro:
  *
  * Prototypes for autoopts
- * Generated Fri Sep 22 18:22:00 PDT 2006
+ * Generated Sun Sep 24 15:28:27 PDT 2006
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
diff --git a/libopts/putshell.c b/libopts/putshell.c
index b5b4d80ea..fda77eea7 100644
--- a/libopts/putshell.c
+++ b/libopts/putshell.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: putshell.c,v 4.12 2006/07/16 15:27:50 bkorb Exp $
- * Time-stamp:      "2006-09-22 18:08:30 bkorb"
+ *  $Id: putshell.c,v 4.14 2006/09/24 02:10:45 bkorb Exp $
+ * Time-stamp:      "2006-09-24 15:28:15 bkorb"
  *
  *  This module will interpret the options set in the tOptions
  *  structure and print them to standard out in a fashion that
@@ -192,7 +192,7 @@ optionPutShell( tOptions* pOpts )
                 printf( "typeset -x -i %s_", pOD->pz_NAME );
                 pz += strspn( pz, " +\t\n\f" );
                 for (;;) {
-                    char ch = *(pz++);
+                    int ch = *(pz++);
                          if (islower( ch ))  fputc( toupper( ch ), stdout );
                     else if (isalnum( ch ))  fputc( ch, stdout );
                     else if (isspace( ch )
@@ -327,7 +327,6 @@ optionPutShell( tOptions* pOpts )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/putshell.c */
diff --git a/libopts/restore.c b/libopts/restore.c
index ce788b330..0bd7e1f07 100644
--- a/libopts/restore.c
+++ b/libopts/restore.c
@@ -1,6 +1,6 @@
 
 /*
- *  restore.c  $Id: restore.c,v 4.7 2006/03/25 19:23:28 bkorb Exp $
+ *  restore.c  $Id: restore.c,v 4.8 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2005-02-23 15:10:20 bkorb"
  *
  *  This module's routines will save the current option state to memory
@@ -201,7 +201,6 @@ optionFree( tOptions* pOpts )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/restore.c */
diff --git a/libopts/save.c b/libopts/save.c
index 6aeb3b877..6c5666e0c 100644
--- a/libopts/save.c
+++ b/libopts/save.c
@@ -1,6 +1,6 @@
 
 /*
- *  save.c  $Id: save.c,v 4.17 2006/09/23 00:09:48 bkorb Exp $
+ *  save.c  $Id: save.c,v 4.19 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:11:20 bkorb"
  *
  *  This module's routines will take the currently set options and
@@ -495,7 +495,6 @@ optionSaveFile( tOptions* pOpts )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/save.c */
diff --git a/libopts/sort.c b/libopts/sort.c
index de0bd5634..3b5eafd42 100644
--- a/libopts/sort.c
+++ b/libopts/sort.c
@@ -1,6 +1,6 @@
 
 /*
- *  sort.c  $Id: sort.c,v 4.10 2006/06/24 23:34:51 bkorb Exp $
+ *  sort.c  $Id: sort.c,v 4.11 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-06-24 10:53:35 bkorb"
  *
  *  This module implements argument sorting.
@@ -363,7 +363,6 @@ optionSort( tOptions* pOpts )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/sort.c */
diff --git a/libopts/stack.c b/libopts/stack.c
index a5eb00407..fb78898e1 100644
--- a/libopts/stack.c
+++ b/libopts/stack.c
@@ -1,7 +1,7 @@
 
 /*
  *  stack.c
- *  $Id: stack.c,v 4.10 2006/07/14 04:20:17 bkorb Exp $
+ *  $Id: stack.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
  *  Time-stamp:      "2006-09-22 18:13:19 bkorb"
  *
  *  This is a special option processing routine that will save the
@@ -259,7 +259,6 @@ optionStackArg(
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/stack.c */
diff --git a/libopts/streqvcmp.c b/libopts/streqvcmp.c
index e16debd15..257ce8840 100644
--- a/libopts/streqvcmp.c
+++ b/libopts/streqvcmp.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: streqvcmp.c,v 4.11 2006/09/23 00:09:48 bkorb Exp $
+ *  $Id: streqvcmp.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-07-26 18:25:53 bkorb"
  *
  *  String Equivalence Comparison
@@ -284,7 +284,6 @@ strtransform( char* d, char const* s )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/streqvcmp.c */
diff --git a/libopts/text_mmap.c b/libopts/text_mmap.c
index 3455fd5ec..ef70a9c11 100644
--- a/libopts/text_mmap.c
+++ b/libopts/text_mmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: text_mmap.c,v 4.15 2006/09/23 00:09:48 bkorb Exp $
+ * $Id: text_mmap.c,v 4.16 2006/09/24 02:10:45 bkorb Exp $
  *
  * Time-stamp:      "2006-09-10 14:50:04 bkorb"
  */
@@ -357,7 +357,6 @@ text_munmap( tmap_info_t* pMI )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/text_mmap.c */
diff --git a/libopts/tokenize.c b/libopts/tokenize.c
index c1b4c9ba1..0e576ce26 100644
--- a/libopts/tokenize.c
+++ b/libopts/tokenize.c
@@ -316,7 +316,6 @@ main( int argc, char** argv )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/tokenize.c */
diff --git a/libopts/usage.c b/libopts/usage.c
index 4f0531823..f4798af17 100644
--- a/libopts/usage.c
+++ b/libopts/usage.c
@@ -1,6 +1,6 @@
 
 /*
- *  usage.c  $Id: usage.c,v 4.16 2006/09/23 00:09:48 bkorb Exp $
+ *  usage.c  $Id: usage.c,v 4.17 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-07-01 12:41:02 bkorb"
  *
  *  This module implements the default usage procedure for
@@ -726,7 +726,6 @@ setStdOptFmts( tOptions* pOpts, tCC** ppT )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/usage.c */
diff --git a/libopts/version.c b/libopts/version.c
index 6b1e6917f..f528699d3 100644
--- a/libopts/version.c
+++ b/libopts/version.c
@@ -1,5 +1,5 @@
 
-/*  $Id: version.c,v 4.10 2006/09/23 00:09:48 bkorb Exp $
+/*  $Id: version.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:15:00 bkorb"
  *
  *  This module implements the default usage procedure for
@@ -171,7 +171,6 @@ optionVersionStderr( tOptions*  pOpts, tOptDesc*  pOD )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/version.c */
diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index d22dd6f9d..40aa143cd 100644
--- a/ntpd/ntpd-opts.c
+++ b/ntpd/ntpd-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpd-opts.c)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 05:20:44 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:45:23 AM EDT
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  */
@@ -36,7 +36,7 @@ tSCC zCopyright[] =
        "ntpd copyright (c) 1970-2006 ntp.org, all rights reserved";
 tSCC zCopyrightNotice[] =
        
-/* extracted from ../include/copyright.def near line 8 */
+/* extracted from /deacon/backroom/ntp-dev/include/copyright.def near line 8 */
 "see html/copyright.html";
 extern tUsageProc optionUsage;
 
@@ -941,6 +941,7 @@ doOptSet_Debug_Level(
     tOptions*   pOptions,
     tOptDesc*   pOptDesc )
 {
+    /* extracted from /deacon/backroom/ntp-dev/include/debug-opt.def, line 29 */
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
 #endif /* defined DEBUG */
diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index c34e82483..3ab7116f0 100644
--- a/ntpd/ntpd-opts.h
+++ b/ntpd/ntpd-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpd-opts.h)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 05:20:43 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:45:22 AM EDT
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  */
diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index 83c23d6e7..ac8aee1bf 100644
--- a/ntpd/ntpd-opts.texi
+++ b/ntpd/ntpd-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpd-opts.texi)
 # 
-# It has been AutoGen-ed  Sunday September 24, 2006 at 05:20:47 AM EDT
+# It has been AutoGen-ed  Monday September 25, 2006 at 12:42:00 AM EDT
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -116,9 +116,9 @@ or by a single hyphen and the flag character.
 
 The following option preset mechanisms are supported:
  - reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/snaps/ntp-dev/ntpd/.ntprc
+ - reading file /deacon/backroom/ntp-dev/ntpd/.ntprc
  - reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/snaps/ntp-dev/ntpd/.ntprc
+ - reading file /deacon/backroom/ntp-dev/ntpd/.ntprc
  - examining environment variables named NTPD_*
 
 
diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index d7ae7c4d5..d9994d1c0 100644
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2006-09-24 "( 4.2.3p50)" "Programmer's Manual"
+.TH NTPD 1 2006-09-25 "( 4.2.3p50)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  Sunday September 24, 2006 at 05:20:45 AM EDT
+.\"  It has been AutoGen-ed  Monday September 25, 2006 at 12:41:59 AM EDT
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpd/ntpdsim-opts.c b/ntpd/ntpdsim-opts.c
index f97b4c0c9..d5e2f58d2 100644
--- a/ntpd/ntpdsim-opts.c
+++ b/ntpd/ntpdsim-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdsim-opts.c)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 05:20:49 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:45:25 AM EDT
  *  From the definitions    ntpdsim-opts.def
  *  and the template file   options
  */
@@ -36,7 +36,7 @@ tSCC zCopyright[] =
        "ntpdsim copyright (c) 1970-2006 ntp.org, all rights reserved";
 tSCC zCopyrightNotice[] =
        
-/* extracted from ../include/copyright.def near line 8 */
+/* extracted from /deacon/backroom/ntp-dev/include/copyright.def near line 8 */
 "see html/copyright.html";
 extern tUsageProc optionUsage;
 
@@ -1139,6 +1139,7 @@ doOptSet_Debug_Level(
     tOptions*   pOptions,
     tOptDesc*   pOptDesc )
 {
+    /* extracted from /deacon/backroom/ntp-dev/include/debug-opt.def, line 29 */
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
 #endif /* defined DEBUG */
diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h
index 8feb30576..d54293416 100644
--- a/ntpd/ntpdsim-opts.h
+++ b/ntpd/ntpdsim-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdsim-opts.h)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 05:20:48 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:45:24 AM EDT
  *  From the definitions    ntpdsim-opts.def
  *  and the template file   options
  */
diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi
index eabddf4ee..9d20a5fd0 100644
--- a/ntpd/ntpdsim-opts.texi
+++ b/ntpd/ntpdsim-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpdsim-opts.texi)
 # 
-# It has been AutoGen-ed  Sunday September 24, 2006 at 05:20:52 AM EDT
+# It has been AutoGen-ed  Monday September 25, 2006 at 12:42:12 AM EDT
 # From the definitions    ntpdsim-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -134,9 +134,9 @@ or by a single hyphen and the flag character.
 
 The following option preset mechanisms are supported:
  - reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/snaps/ntp-dev/ntpd/.ntprc
+ - reading file /deacon/backroom/ntp-dev/ntpd/.ntprc
  - reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/snaps/ntp-dev/ntpd/.ntprc
+ - reading file /deacon/backroom/ntp-dev/ntpd/.ntprc
  - examining environment variables named NTPDSIM_*
 
 
diff --git a/ntpd/ntpdsim.1 b/ntpd/ntpdsim.1
index 0db142d2f..b2d6ad256 100644
--- a/ntpd/ntpdsim.1
+++ b/ntpd/ntpdsim.1
@@ -1,7 +1,7 @@
-.TH NTPDSIM 1 2006-09-24 "( 4.2.3p50)" "Programmer's Manual"
+.TH NTPDSIM 1 2006-09-25 "( 4.2.3p50)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpdsim.1)
 .\"  
-.\"  It has been AutoGen-ed  Sunday September 24, 2006 at 05:20:51 AM EDT
+.\"  It has been AutoGen-ed  Monday September 25, 2006 at 12:42:08 AM EDT
 .\"  From the definitions    ntpdsim-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index c3fb186e6..63a0ec5ac 100644
--- a/ntpdc/ntpdc-opts.c
+++ b/ntpdc/ntpdc-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 05:27:21 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:45:28 AM EDT
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  */
@@ -36,7 +36,7 @@ tSCC zCopyright[] =
        "ntpdc copyright (c) 1970-2006 ntp.org, all rights reserved";
 tSCC zCopyrightNotice[] =
        
-/* extracted from ../include/copyright.def near line 8 */
+/* extracted from /deacon/backroom/ntp-dev/include/copyright.def near line 8 */
 "see html/copyright.html";
 extern tUsageProc optionUsage;
 
@@ -543,6 +543,7 @@ doOptSet_Debug_Level(
     tOptions*   pOptions,
     tOptDesc*   pOptDesc )
 {
+    /* extracted from /deacon/backroom/ntp-dev/include/debug-opt.def, line 29 */
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
 #endif /* defined DEBUG */
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index d6bca712a..ed65d7868 100644
--- a/ntpdc/ntpdc-opts.h
+++ b/ntpdc/ntpdc-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 05:27:20 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:45:27 AM EDT
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  */
diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index 8ffd01961..6865e746c 100644
--- a/ntpdc/ntpdc-opts.texi
+++ b/ntpdc/ntpdc-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpdc-opts.texi)
 # 
-# It has been AutoGen-ed  Sunday September 24, 2006 at 05:27:23 AM EDT
+# It has been AutoGen-ed  Monday September 25, 2006 at 12:57:05 AM EDT
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -100,7 +100,7 @@ or by a single hyphen and the flag character.
 
 The following option preset mechanisms are supported:
  - reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/snaps/ntp-dev/ntpdc/.ntprc
+ - reading file /deacon/backroom/ntp-dev/ntpdc/.ntprc
  - examining environment variables named NTPDC_*
 
 The
diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1
index 1c91d7ac4..7db38a2ea 100644
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2006-09-24 "( 4.2.3p50)" "Programmer's Manual"
+.TH NTPDC 1 2006-09-25 "( 4.2.3p50)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  Sunday September 24, 2006 at 05:27:22 AM EDT
+.\"  It has been AutoGen-ed  Monday September 25, 2006 at 12:57:05 AM EDT
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 00786f14a..34f4659b0 100644
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 05:27:51 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:45:30 AM EDT
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  */
@@ -36,7 +36,7 @@ tSCC zCopyright[] =
        "ntpq copyright (c) 1970-2006 ntp.org, all rights reserved";
 tSCC zCopyrightNotice[] =
        
-/* extracted from ../include/copyright.def near line 8 */
+/* extracted from /deacon/backroom/ntp-dev/include/copyright.def near line 8 */
 "see html/copyright.html";
 extern tUsageProc optionUsage;
 
@@ -483,6 +483,7 @@ doOptSet_Debug_Level(
     tOptions*   pOptions,
     tOptDesc*   pOptDesc )
 {
+    /* extracted from /deacon/backroom/ntp-dev/include/debug-opt.def, line 29 */
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
 #endif /* defined DEBUG */
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 081b0ab04..9dad3f7b8 100644
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 05:27:50 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:45:29 AM EDT
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  */
diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 33f6a0fc2..bd4258f71 100644
--- a/ntpq/ntpq-opts.texi
+++ b/ntpq/ntpq-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpq-opts.texi)
 # 
-# It has been AutoGen-ed  Sunday September 24, 2006 at 05:27:53 AM EDT
+# It has been AutoGen-ed  Monday September 25, 2006 at 12:57:36 AM EDT
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -80,9 +80,9 @@ or by a single hyphen and the flag character.
 
 The following option preset mechanisms are supported:
  - reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/snaps/ntp-dev/ntpq/.ntprc
+ - reading file /deacon/backroom/ntp-dev/ntpq/.ntprc
  - reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/snaps/ntp-dev/ntpq/.ntprc
+ - reading file /deacon/backroom/ntp-dev/ntpq/.ntprc
  - examining environment variables named NTPQ_*
 
 The
diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index dc4dd7003..ac01fa3fa 100644
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2006-09-24 "( 4.2.3p50)" "Programmer's Manual"
+.TH NTPQ 1 2006-09-25 "( 4.2.3p50)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  Sunday September 24, 2006 at 05:27:52 AM EDT
+.\"  It has been AutoGen-ed  Monday September 25, 2006 at 12:57:35 AM EDT
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/sntp/libopts/autoopts.c b/sntp/libopts/autoopts.c
index 712be238f..c08885083 100644
--- a/sntp/libopts/autoopts.c
+++ b/sntp/libopts/autoopts.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: autoopts.c,v 4.24 2006/09/23 00:12:48 bkorb Exp $
+ *  $Id: autoopts.c,v 4.26 2006/09/24 02:10:44 bkorb Exp $
  *  Time-stamp:      "2006-09-22 18:21:53 bkorb"
  *
  *  This file contains all of the routines that must be linked into
@@ -1083,7 +1083,6 @@ optionProcess(
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/autoopts.c */
diff --git a/sntp/libopts/autoopts.h b/sntp/libopts/autoopts.h
index e6fcd90bc..b7805fe74 100644
--- a/sntp/libopts/autoopts.h
+++ b/sntp/libopts/autoopts.h
@@ -2,7 +2,7 @@
 /*
  *  Time-stamp:      "2006-09-10 14:43:25 bkorb"
  *
- *  autoopts.h  $Id: autoopts.h,v 4.28 2006/09/23 00:12:48 bkorb Exp $
+ *  autoopts.h  $Id: autoopts.h,v 4.29 2006/09/24 02:10:45 bkorb Exp $
  *  Time-stamp:      "2005-02-14 05:59:50 bkorb"
  *
  *  This file defines all the global structures and special values
@@ -331,7 +331,6 @@ extern tOptProc optionPrintVersion, optionPagedUsage, optionLoadOpt;
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/autoopts.h */
diff --git a/sntp/libopts/autoopts/options.h b/sntp/libopts/autoopts/options.h
index da129fd29..1dfc6f0d8 100644
--- a/sntp/libopts/autoopts/options.h
+++ b/sntp/libopts/autoopts/options.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (options.h)
  *  
- *  It has been AutoGen-ed  Friday September 22, 2006 at 06:21:59 PM PDT
+ *  It has been AutoGen-ed  Sunday September 24, 2006 at 03:28:25 PM PDT
  *  From the definitions    funcs.def
  *  and the template file   options_h
  *
@@ -718,7 +718,7 @@ extern void optionUnloadNested( const tOptionValue* );
 extern char const* optionVersion( void );
 
 
-/* From: ../compat/pathfind.c line 33
+/* From: ../compat/pathfind.c line 34
  *
  * pathfind - fild a file in a list of directories
  *
diff --git a/sntp/libopts/autoopts/usage-txt.h b/sntp/libopts/autoopts/usage-txt.h
index 849b8aa80..8bc08065b 100644
--- a/sntp/libopts/autoopts/usage-txt.h
+++ b/sntp/libopts/autoopts/usage-txt.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (usage-txt.h)
  *  
- *  It has been AutoGen-ed  Friday September 22, 2006 at 06:21:57 PM PDT
+ *  It has been AutoGen-ed  Sunday September 24, 2006 at 03:28:22 PM PDT
  *  From the definitions    usage-txt.def
  *  and the template file   usage-txt.tpl
  *
@@ -183,7 +183,7 @@ extern usage_text_t option_usage_text;
   static char    eng_zGnuKeyLArg[] = "=Mbr";
   static char    eng_zGnuNumArg[] = "=num";
   static char    eng_zGnuStrArg[] = "=str";
-static const char usage_txt[3202] =
+static char const usage_txt[3202] =
     "AutoOpts function called without option descriptor\n\0"
     "\tThis exceeds the compiled library version:  \0"
     "Automated Options Processing Error!\n"
diff --git a/sntp/libopts/boolean.c b/sntp/libopts/boolean.c
index ad80794a5..7549113fe 100644
--- a/sntp/libopts/boolean.c
+++ b/sntp/libopts/boolean.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: boolean.c,v 4.6 2006/03/25 19:23:28 bkorb Exp $
+ *  $Id: boolean.c,v 4.8 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:13:34 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -96,7 +96,6 @@ optionBooleanVal( tOptions* pOpts, tOptDesc* pOD )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/boolean.c */
diff --git a/sntp/libopts/compat/compat.h b/sntp/libopts/compat/compat.h
index 15ea0c6bc..38e38d583 100644
--- a/sntp/libopts/compat/compat.h
+++ b/sntp/libopts/compat/compat.h
@@ -7,7 +7,7 @@
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
  * Created:          Mon Jun 30 15:54:46 1997
  *
- * $Id: compat.h,v 4.13 2006/09/16 19:58:35 bkorb Exp $
+ * $Id: compat.h,v 4.14 2006/09/24 02:10:45 bkorb Exp $
  */
 #ifndef COMPAT_H_GUARD
 #define COMPAT_H_GUARD 1
@@ -307,7 +307,6 @@
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of compat/compat.h */
diff --git a/sntp/libopts/compat/pathfind.c b/sntp/libopts/compat/pathfind.c
index ab3d173ba..e74a8f63f 100644
--- a/sntp/libopts/compat/pathfind.c
+++ b/sntp/libopts/compat/pathfind.c
@@ -4,11 +4,12 @@
 
 /*
  * Author:           Gary V Vaughan <gvaughan@oranda.demon.co.uk>
+ * Time-stamp:       "2006-09-23 19:46:16 bkorb"
  * Created:          Tue Jun 24 15:07:31 1997
- * Last Modified:    $Date: 2006/09/23 00:48:05 $
+ * Last Modified:    $Date: 2006/09/24 02:57:02 $
  *            by: bkorb
  *
- * $Id: pathfind.c,v 4.8 2006/09/23 00:48:05 bkorb Exp $
+ * $Id: pathfind.c,v 4.10 2006/09/24 02:57:02 bkorb Exp $
  */
 
 /* Code: */
@@ -333,7 +334,6 @@ extract_colon_unit( char* pzDir, char const *string, int *p_index )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of compat/pathfind.c */
diff --git a/sntp/libopts/compat/strchr.c b/sntp/libopts/compat/strchr.c
index ca8a517a8..413f999ff 100644
--- a/sntp/libopts/compat/strchr.c
+++ b/sntp/libopts/compat/strchr.c
@@ -55,7 +55,6 @@ strrchr( char const *s, int c)
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of compat/strsignal.c */
diff --git a/sntp/libopts/compat/windows-config.h b/sntp/libopts/compat/windows-config.h
index ebacf0419..02f81160d 100644
--- a/sntp/libopts/compat/windows-config.h
+++ b/sntp/libopts/compat/windows-config.h
@@ -1,3 +1,9 @@
+
+/*
+ * Time-stamp:        "2006-09-23 19:44:29 bkorb"
+ *             by: bkorb
+ * Last Committed:    $Date: 2006/09/24 02:57:02 $
+ */
 #ifndef WINDOWS_CONFIG_HACKERY
 #define WINDOWS_CONFIG_HACKERY 1
 
@@ -36,7 +42,7 @@
  * # define HAVE_VSPRINTF
  * # define HAVE_SNPRINTF
  * # define HAVE_VSNPRINTF
- * # define HAVE_PROTOTYPES		/* from ntpq.mak * /
+ * # define HAVE_PROTOTYPES             /* from ntpq.mak * /
  * # define HAVE_MEMMOVE
  * # define HAVE_TERMIOS_H
  * # define HAVE_ERRNO_H
@@ -48,7 +54,7 @@
  * # define ISC_PLATFORM_NEEDNTOP
  * # define ISC_PLATFORM_NEEDPTON
  * # define NEED_S_CHAR_TYPEDEF
- * # define USE_PROTOTYPES 		/* for ntp_types.h * /
+ * # define USE_PROTOTYPES              /* for ntp_types.h * /
  *
  * #define ULONG_CONST(a) a ## UL
  */
@@ -71,7 +77,7 @@
 
 /* Prevent inclusion of winsock.h in windows.h */
 #ifndef _WINSOCKAPI_
-#define _WINSOCKAPI_  
+#define _WINSOCKAPI_
 #endif
 
 #ifndef __RPCASYNC_H__
@@ -83,7 +89,7 @@
 #include <winsock2.h>
 
 /*
- * Compatibility declarations for Windows, assuming SYS_WINNT 
+ * Compatibility declarations for Windows, assuming SYS_WINNT
  * has been defined.
  */
 #define strdup  _strdup
@@ -94,7 +100,7 @@
 
 #include <io.h>
 #define open    _open
-#define close   _close 
+#define close   _close
 #define read    _read
 #define write   _write
 #define lseek   _lseek
@@ -102,17 +108,17 @@
 #define dup2    _dup2
 
 #define O_RDWR     _O_RDWR
-#define O_RDONLY   _O_RDONLY 
+#define O_RDONLY   _O_RDONLY
 #define O_EXCL     _O_EXCL
 
-#ifndef	S_ISREG
+#ifndef S_ISREG
 #  define S_IFREG _S_IFREG
-#  define	S_ISREG(mode)	(((mode) & S_IFREG) == S_IFREG)
+#  define       S_ISREG(mode)   (((mode) & S_IFREG) == S_IFREG)
 #endif
 
-#ifndef	S_ISDIR
+#ifndef S_ISDIR
 #  define S_IFDIR _S_IFDIR
-#  define	S_ISDIR(mode)	(((mode) & S_IFDIR) == S_IFDIR)
+#  define       S_ISDIR(mode)   (((mode) & S_IFDIR) == S_IFDIR)
 #endif
 
 #endif /* WINDOWS_CONFIG_HACKERY */
diff --git a/sntp/libopts/configfile.c b/sntp/libopts/configfile.c
index 64deccdd3..bdde8de80 100644
--- a/sntp/libopts/configfile.c
+++ b/sntp/libopts/configfile.c
@@ -1,6 +1,6 @@
 /*
- *  $Id: configfile.c,v 4.26 2006/09/23 00:12:48 bkorb Exp $
- *  Time-stamp:      "2006-09-22 18:01:50 bkorb"
+ *  $Id: configfile.c,v 4.28 2006/09/24 02:10:45 bkorb Exp $
+ *  Time-stamp:      "2006-09-24 15:18:51 bkorb"
  *
  *  configuration/rc/ini file handling.
  */
@@ -204,8 +204,8 @@ optionFindValue( const tOptDesc* pOptDesc,
 
     else do {
         tArgList* pAL = pOptDesc->optCookie;
-        int ct = pAL->useCt;
-        tCC** ppOV = pAL->apzArgs;
+        int    ct   = pAL->useCt;
+        void** ppOV = (void**)(pAL->apzArgs);
 
         if (ct == 0) {
             errno = ENOENT;
@@ -218,7 +218,7 @@ optionFindValue( const tOptDesc* pOptDesc,
         }
 
         while (--ct >= 0) {
-            const tOptionValue* pOV = (tOptionValue*)*(ppOV++);
+            const tOptionValue* pOV = *(ppOV++);
             const tOptionValue* pRV = optionGetValue( pOV, pzName );
 
             if (pRV == NULL)
@@ -281,8 +281,8 @@ optionFindNextValue( const tOptDesc* pOptDesc, const tOptionValue* pPrevVal,
 
     else do {
         tArgList* pAL = pOptDesc->optCookie;
-        int ct = pAL->useCt;
-        tCC** ppOV = pAL->apzArgs;
+        int    ct   = pAL->useCt;
+        void** ppOV = (void**)pAL->apzArgs;
 
         if (ct == 0) {
             errno = ENOENT;
@@ -290,7 +290,7 @@ optionFindNextValue( const tOptDesc* pOptDesc, const tOptionValue* pPrevVal,
         }
 
         while (--ct >= 0) {
-            tOptionValue* pOV = (tOptionValue*)*(ppOV++);
+            tOptionValue* pOV = *(ppOV++);
             if (foundOldVal) {
                 pRes = pOV;
                 break;
@@ -344,15 +344,15 @@ optionGetValue( const tOptionValue* pOld, char const* pzValName )
     pAL = pOld->v.nestVal;
 
     if (pAL->useCt > 0) {
-        int ct = pAL->useCt;
-        tCC** papOV = pAL->apzArgs;
+        int    ct    = pAL->useCt;
+        void** papOV = (void**)(pAL->apzArgs);
 
         if (pzValName == NULL) {
             pRes = (tOptionValue*)*papOV;
         }
 
         else do {
-            tOptionValue* pOV = (tOptionValue*)*(papOV++);
+            tOptionValue* pOV = *(papOV++);
             if (strcmp( pOV->pzName, pzValName ) == 0) {
                 pRes = pOV;
                 break;
@@ -405,11 +405,11 @@ optionNextValue( const tOptionValue* pOVList, const tOptionValue* pOldOV )
     }
     pAL = pOVList->v.nestVal;
     {
-        int   ct   = pAL->useCt;
-        tCC** papNV = pAL->apzArgs;
+        int    ct    = pAL->useCt;
+        void** papNV = (void**)(pAL->apzArgs);
 
         while (ct-- > 0) {
-            tOptionValue* pNV = (tOptionValue*)*(papNV++);
+            tOptionValue* pNV = *(papNV++);
             if (pNV == pOldOV) {
                 if (ct == 0) {
                     err = ENOENT;
@@ -461,14 +461,14 @@ filePreset(
         st.flags = OPTST_SET;
 
     do  {
-        while (isspace( *pzFileText ))  pzFileText++;
+        while (isspace( (int)*pzFileText ))  pzFileText++;
 
-        if (isalpha( *pzFileText )) {
+        if (isalpha( (int)*pzFileText )) {
             pzFileText = handleConfig( pOpts, &st, pzFileText, direction );
 
         } else switch (*pzFileText) {
         case '<':
-            if (isalpha( pzFileText[1] ))
+            if (isalpha( (int)pzFileText[1] ))
                 pzFileText = handleStructure(pOpts, &st, pzFileText, direction);
 
             else switch (pzFileText[1]) {
@@ -544,8 +544,8 @@ handleConfig(
     if (pzEnd == NULL)
         return pzText + strlen(pzText);
 
-    while (ISNAMECHAR( *pzText ))  pzText++;
-    while (isspace( *pzText )) pzText++;
+    while (ISNAMECHAR( (int)*pzText ))  pzText++;
+    while (isspace( (int)*pzText )) pzText++;
     if (pzText > pzEnd) {
     name_only:
         *pzEnd++ = NUL;
@@ -559,10 +559,10 @@ handleConfig(
      *  is an invalid format and we give up parsing the text.
      */
     if ((*pzText == '=') || (*pzText == ':')) {
-        while (isspace( *++pzText ))   ;
+        while (isspace( (int)*++pzText ))   ;
         if (pzText > pzEnd)
             goto name_only;
-    } else if (! isspace(pzText[-1]))
+    } else if (! isspace((int)pzText[-1]))
         return NULL;
 
     /*
@@ -626,7 +626,7 @@ handleDirective(
     size_t name_len;
 
     if (  (strncmp( pzText+2, zProg, title_len ) != 0)
-       || (! isspace( pzText[title_len+2] )) )  {
+       || (! isspace( (int)pzText[title_len+2] )) )  {
         pzText = strchr( pzText+2, '>' );
         if (pzText != NULL)
             pzText++;
@@ -640,8 +640,8 @@ handleDirective(
     do  {
         pzText += title_len;
 
-        if (isspace(*pzText)) {
-            while (isspace(*pzText))  pzText++;
+        if (isspace((int)*pzText)) {
+            while (isspace((int)*pzText))  pzText++;
             if (  (strneqvcmp( pzText, pOpts->pzProgName, (int)name_len) == 0)
                && (pzText[name_len] == '>'))  {
                 pzText += name_len + 1;
@@ -991,7 +991,7 @@ parseAttributes(
             break;
         }
 
-        while (isspace( *++pzText ))   ;
+        while (isspace( (int)*++pzText ))   ;
 
         if (strncmp( pzText, zLoadType, lenLoadType ) == 0) {
             pzText = parseValueType( pzText+lenLoadType, pType );
@@ -1046,7 +1046,7 @@ parseLoadMode(
         if (strncmp( pzText, zLoadCooked, len ) == 0) {
             if (  (pzText[len] == '>')
                || (pzText[len] == '/')
-               || isspace(pzText[len])) {
+               || isspace((int)pzText[len])) {
                 *pMode = OPTION_LOAD_COOKED;
                 return pzText + len;
             }
@@ -1059,7 +1059,7 @@ parseLoadMode(
         if (strncmp( pzText, zLoadUncooked, len ) == 0) {
             if (  (pzText[len] == '>')
                || (pzText[len] == '/')
-               || isspace(pzText[len])) {
+               || isspace((int)pzText[len])) {
                 *pMode = OPTION_LOAD_UNCOOKED;
                 return pzText + len;
             }
@@ -1072,7 +1072,7 @@ parseLoadMode(
         if (strncmp( pzText, zLoadKeep, len ) == 0) {
             if (  (pzText[len] == '>')
                || (pzText[len] == '/')
-               || isspace(pzText[len])) {
+               || isspace((int)pzText[len])) {
                 *pMode = OPTION_LOAD_KEEP;
                 return pzText + len;
             }
@@ -1113,7 +1113,7 @@ parseValueType(
     {
         size_t len = strlen(zLtypeString);
         if (strncmp( pzText, zLtypeString, len ) == 0) {
-            if ((pzText[len] == '>') || isspace(pzText[len])) {
+            if ((pzText[len] == '>') || isspace((int)pzText[len])) {
                 pType->valType = OPARG_TYPE_STRING;
                 return pzText + len;
             }
@@ -1124,7 +1124,7 @@ parseValueType(
     {
         size_t len = strlen(zLtypeInteger);
         if (strncmp( pzText, zLtypeInteger, len ) == 0) {
-            if ((pzText[len] == '>') || isspace(pzText[len])) {
+            if ((pzText[len] == '>') || isspace((int)pzText[len])) {
                 pType->valType = OPARG_TYPE_NUMERIC;
                 return pzText + len;
             }
@@ -1146,7 +1146,7 @@ parseValueType(
     {
         size_t len = strlen(zLtypeKeyword);
         if (strncmp( pzText, zLtypeKeyword, len ) == 0) {
-            if ((pzText[len] == '>') || isspace(pzText[len])) {
+            if ((pzText[len] == '>') || isspace((int)pzText[len])) {
                 pType->valType = OPARG_TYPE_ENUMERATION;
                 return pzText + len;
             }
@@ -1157,7 +1157,7 @@ parseValueType(
     {
         size_t len = strlen(zLtypeSetMembership);
         if (strncmp( pzText, zLtypeSetMembership, len ) == 0) {
-            if ((pzText[len] == '>') || isspace(pzText[len])) {
+            if ((pzText[len] == '>') || isspace((int)pzText[len])) {
                 pType->valType = OPARG_TYPE_MEMBERSHIP;
                 return pzText + len;
             }
@@ -1168,7 +1168,7 @@ parseValueType(
     {
         size_t len = strlen(zLtypeNest);
         if (strncmp( pzText, zLtypeNest, len ) == 0) {
-            if ((pzText[len] == '>') || isspace(pzText[len])) {
+            if ((pzText[len] == '>') || isspace((int)pzText[len])) {
                 pType->valType = OPARG_TYPE_HIERARCHY;
                 return pzText + len;
             }
@@ -1190,7 +1190,7 @@ static char*
 skipUnknown( char* pzText )
 {
     for (;; pzText++) {
-        if (isspace( *pzText ))  return pzText;
+        if (isspace( (int)*pzText ))  return pzText;
         switch (*pzText) {
         case NUL: return NULL;
         case '/':
@@ -1273,7 +1273,6 @@ validateOptionsStruct( tOptions* pOpts, char const* pzProgram )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/configfile.c */
diff --git a/sntp/libopts/cook.c b/sntp/libopts/cook.c
index 00503959a..9685d0641 100644
--- a/sntp/libopts/cook.c
+++ b/sntp/libopts/cook.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: cook.c,v 4.7 2006/09/23 00:12:48 bkorb Exp $
- *  Time-stamp:      "2006-06-24 11:29:58 bkorb"
+ *  $Id: cook.c,v 4.8 2006/09/24 02:10:45 bkorb Exp $
+ *  Time-stamp:      "2006-09-24 15:21:02 bkorb"
  *
  *  This file contains the routines that deal with processing quoted strings
  *  into an internal format.
@@ -106,7 +106,7 @@ ao_string_cook_escape_char( char const* pzIn, char* pRes, u_int nl )
     case 'v': *pRes = '\v'; break;
 
     case 'x':         /* HEX Escape       */
-        if (isxdigit( *pzIn ))  {
+        if (isxdigit( (int)*pzIn ))  {
             unsigned int  val;
             unsigned char ch = *pzIn++;
 
@@ -140,7 +140,7 @@ ao_string_cook_escape_char( char const* pzIn, char* pRes, u_int nl )
          *  IF the character copied was an octal digit,
          *  THEN set the output character to an octal value
          */
-        if (isdigit( *pRes ) && (*pRes < '8'))  {
+        if (isdigit( (int)*pRes ) && (*pRes < '8'))  {
             unsigned int  val = *pRes - '0';
             unsigned char ch  = *pzIn++;
 
@@ -239,7 +239,7 @@ ao_string_cook( char* pzScan, int* pLineCt )
             pzS++;
 
         scan_for_quote:
-            while (isspace(*pzS))
+            while (isspace((int)*pzS))
                 if (*(pzS++) == '\n')
                     (*pLineCt)++;
 
@@ -349,7 +349,6 @@ ao_string_cook( char* pzScan, int* pLineCt )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/cook.c */
diff --git a/sntp/libopts/enumeration.c b/sntp/libopts/enumeration.c
index 29f624fa2..4586967c7 100644
--- a/sntp/libopts/enumeration.c
+++ b/sntp/libopts/enumeration.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: enumeration.c,v 4.12 2006/09/23 00:12:48 bkorb Exp $
+ *  $Id: enumeration.c,v 4.14 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:00:53 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -479,7 +479,6 @@ optionSetMembers(
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/enumeration.c */
diff --git a/sntp/libopts/environment.c b/sntp/libopts/environment.c
index aacb253b0..1ac3fe8eb 100644
--- a/sntp/libopts/environment.c
+++ b/sntp/libopts/environment.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: environment.c,v 4.11 2006/09/23 00:12:48 bkorb Exp $
+ *  $Id: environment.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2005-10-29 13:23:59 bkorb"
  *
  *  This file contains all of the routines that must be linked into
@@ -255,7 +255,6 @@ doEnvPresets( tOptions* pOpts, teEnvPresetType type )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/environment.c */
diff --git a/sntp/libopts/genshell.c b/sntp/libopts/genshell.c
index f7549c881..7c5e12f74 100644
--- a/sntp/libopts/genshell.c
+++ b/sntp/libopts/genshell.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.c)
  *  
- *  It has been AutoGen-ed  Friday September 22, 2006 at 06:22:00 PM PDT
+ *  It has been AutoGen-ed  Sunday September 24, 2006 at 03:28:26 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  */
diff --git a/sntp/libopts/genshell.h b/sntp/libopts/genshell.h
index bbb8ec3c5..44760b784 100644
--- a/sntp/libopts/genshell.h
+++ b/sntp/libopts/genshell.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (genshell.h)
  *  
- *  It has been AutoGen-ed  Friday September 22, 2006 at 06:21:59 PM PDT
+ *  It has been AutoGen-ed  Sunday September 24, 2006 at 03:28:26 PM PDT
  *  From the definitions    genshell.def
  *  and the template file   options
  */
diff --git a/sntp/libopts/load.c b/sntp/libopts/load.c
index 18ea27f4d..46ac97dc2 100644
--- a/sntp/libopts/load.c
+++ b/sntp/libopts/load.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: load.c,v 4.24 2006/09/23 00:12:48 bkorb Exp $
- *  Time-stamp:      "2006-07-01 12:43:03 bkorb"
+ *  $Id: load.c,v 4.25 2006/09/24 02:10:45 bkorb Exp $
+ *  Time-stamp:      "2006-09-24 15:23:01 bkorb"
  *
  *  This file contains the routines that deal with processing text strings
  *  for options, either from a NUL-terminated string passed in or from an
@@ -258,10 +258,10 @@ insertEnvVal(
     char* pzDir = pzBuf;
 
     for (;;) {
-        char ch = *++pzName;
+        int ch = (int)*++pzName;
         if (! ISNAMECHAR( ch ))
             break;
-        *(pzDir++) = ch;
+        *(pzDir++) = (char)ch;
     }
 
     if (pzDir == pzBuf)
@@ -293,16 +293,16 @@ mungeString( char* pzTxt, tOptionLoadMode mode )
     if (mode == OPTION_LOAD_KEEP)
         return;
 
-    if (isspace( *pzTxt )) {
+    if (isspace( (int)*pzTxt )) {
         char* pzS = pzTxt;
         char* pzD = pzTxt;
-        while (isspace( *++pzS ))  ;
+        while (isspace( (int)*++pzS ))  ;
         while ((*(pzD++) = *(pzS++)) != NUL)   ;
         pzE = pzD-1;
     } else
         pzE = pzTxt + strlen( pzTxt );
 
-    while ((pzE > pzTxt) && isspace( pzE[-1] ))  pzE--;
+    while ((pzE > pzTxt) && isspace( (int)pzE[-1] ))  pzE--;
     *pzE = NUL;
 
     if (mode == OPTION_LOAD_UNCOOKED)
@@ -352,9 +352,9 @@ assembleArgValue( char* pzTxt, tOptionLoadMode mode )
      *  because we'll have to skip over an immediately following ':' or '='
      *  (and the white space following *that*).
      */
-    space_break = isspace(*pzEnd);
+    space_break = isspace((int)*pzEnd);
     *(pzEnd++) = NUL;
-    while (isspace(*pzEnd))  pzEnd++;
+    while (isspace((int)*pzEnd))  pzEnd++;
     if (space_break && ((*pzEnd == ':') || (*pzEnd == '=')))
         pzEnd++;
 
@@ -377,7 +377,7 @@ loadOptionLine(
     tDirection  direction,
     tOptionLoadMode   load_mode )
 {
-    while (isspace( *pzLine ))  pzLine++;
+    while (isspace( (int)*pzLine ))  pzLine++;
 
     {
         char* pzArg = assembleArgValue( pzLine, load_mode );
@@ -514,7 +514,6 @@ optionLoadLine(
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/load.c */
diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4
index 3c9c214b7..6fea8bfd7 100644
--- a/sntp/libopts/m4/libopts.m4
+++ b/sntp/libopts/m4/libopts.m4
@@ -2,7 +2,7 @@ dnl  -*- buffer-read-only: t -*- vi: set ro:
 dnl 
 dnl DO NOT EDIT THIS FILE   (libopts.m4)
 dnl 
-dnl It has been AutoGen-ed  Friday September 22, 2006 at 06:22:01 PM PDT
+dnl It has been AutoGen-ed  Sunday September 24, 2006 at 03:28:29 PM PDT
 dnl From the definitions    libopts.def
 dnl and the template file   conftest.tpl
 dnl
@@ -400,6 +400,9 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS],[
 
 dnl @synopsis  LIBOPTS_CHECK
 dnl
+dnl Time-stamp:        "2006-09-23 19:36:24 bkorb"
+dnl Last Committed:    $Date: 2006/09/24 02:57:02 $
+dnl
 dnl If autoopts-config works, add the linking information to LIBS.
 dnl Otherwise, add ``libopts-${ao_rev}'' to SUBDIRS and run all
 dnl the config tests that the library needs.  Invoke the
diff --git a/sntp/libopts/m4/liboptschk.m4 b/sntp/libopts/m4/liboptschk.m4
index 26f9c241e..2c473a08a 100644
--- a/sntp/libopts/m4/liboptschk.m4
+++ b/sntp/libopts/m4/liboptschk.m4
@@ -3,7 +3,10 @@ dnl Copyright (C) 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
-dnl
+
+dnl Time-stamp:        "2006-09-23 19:42:31 bkorb"
+dnl Last Committed:    $Date: 2006/09/24 02:57:02 $
+
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
diff --git a/sntp/libopts/makeshell.c b/sntp/libopts/makeshell.c
index 36d3201d6..4051a27b5 100644
--- a/sntp/libopts/makeshell.c
+++ b/sntp/libopts/makeshell.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: makeshell.c,v 4.15 2006/09/23 00:12:48 bkorb Exp $
+ *  $Id: makeshell.c,v 4.17 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:19:24 bkorb"
  *
  *  This module will interpret the options set in the tOptions
@@ -1104,7 +1104,6 @@ genshelloptUsage( tOptions*  pOpts, int exitCode )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/makeshell.c */
diff --git a/sntp/libopts/nested.c b/sntp/libopts/nested.c
index f4e665068..013b742c3 100644
--- a/sntp/libopts/nested.c
+++ b/sntp/libopts/nested.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: nested.c,v 4.11 2006/09/23 00:12:48 bkorb Exp $
- *  Time-stamp:      "2006-09-22 18:14:12 bkorb"
+ *  $Id: nested.c,v 4.13 2006/09/24 02:10:45 bkorb Exp $
+ *  Time-stamp:      "2006-09-24 15:27:32 bkorb"
  *
  *   Automated Options Nested Values module.
  */
@@ -197,12 +197,12 @@ addBoolValue( void** pp, char const* pzName, size_t nameLen,
     pNV = AGALOC( sz, "option name/bool value pair" );
     if (pNV == NULL)
         return NULL;
-    while (isspace( *pzValue ) && (dataLen > 0)) {
+    while (isspace( (int)*pzValue ) && (dataLen > 0)) {
         dataLen--; pzValue++;
     }
     if (dataLen == 0)
         pNV->v.boolVal = 0;
-    else if (isdigit( *pzValue ))
+    else if (isdigit( (int)*pzValue ))
         pNV->v.boolVal = atoi( pzValue );
     else switch (*pzValue) {
     case 'f':
@@ -237,7 +237,7 @@ addNumberValue( void** pp, char const* pzName, size_t nameLen,
     pNV = AGALOC( sz, "option name/bool value pair" );
     if (pNV == NULL)
         return NULL;
-    while (isspace( *pzValue ) && (dataLen > 0)) {
+    while (isspace( (int)*pzValue ) && (dataLen > 0)) {
         dataLen--; pzValue++;
     }
     if (dataLen == 0)
@@ -300,9 +300,9 @@ scanNameEntry( char const* pzName, tOptionValue* pRes, tOptionLoadMode mode )
     size_t nameLen = 1;
     size_t dataLen = 0;
 
-    while (ISNAMECHAR( *pzScan ))  { pzScan++; nameLen++; }
+    while (ISNAMECHAR( (int)*pzScan ))  { pzScan++; nameLen++; }
 
-    while (isspace( *pzScan )) {
+    while (isspace( (int)*pzScan )) {
         char ch = *(pzScan++);
         if ((ch == '\n') || (ch == ',')) {
             addStringValue( &(pRes->v.nestVal), pzName, nameLen, NULL, 0 );
@@ -313,7 +313,7 @@ scanNameEntry( char const* pzName, tOptionValue* pRes, tOptionLoadMode mode )
     switch (*pzScan) {
     case '=':
     case ':':
-        while (isspace( *++pzScan ))  ;
+        while (isspace( (int)*++pzScan ))  ;
         switch (*pzScan) {
         case ',':  goto comma_char;
         case '"':
@@ -390,7 +390,7 @@ scanXmlEntry( char const* pzName, tOptionValue* pRes, tOptionLoadMode mode )
     tOptionValue  valu;
     tOptionValue* pNewVal;
 
-    if (! isalpha(*pzName)) {
+    if (! isalpha((int)*pzName)) {
         switch (*pzName) {
         default:
             pzName = NULL;
@@ -411,7 +411,7 @@ scanXmlEntry( char const* pzName, tOptionValue* pRes, tOptionLoadMode mode )
         return pzName;
     }
 
-    while (isalpha( *++pzScan ))  nameLen++;
+    while (isalpha( (int)*++pzScan ))  nameLen++;
     if (nameLen > 64)
         return NULL;
     valu.valType = OPARG_TYPE_STRING;
@@ -461,7 +461,7 @@ scanXmlEntry( char const* pzName, tOptionValue* pRes, tOptionLoadMode mode )
             return NULL;
         valLen = (pzScan - pzVal);
         pzScan += nameLen + 3;
-        while (isspace( *pzScan ))  pzScan++;
+        while (isspace(  (int)*pzScan ))  pzScan++;
     }
 
     switch (valu.valType) {
@@ -514,7 +514,7 @@ unloadNestedArglist( tArgList* pAL )
     tCC** ppNV = pAL->apzArgs;
 
     while (ct-- > 0) {
-        tOptionValue* pNV = (tOptionValue*)*(ppNV++);
+        tOptionValue* pNV = (tOptionValue*)(void*)*(ppNV++);
         if (pNV->valType == OPARG_TYPE_HIERARCHY)
             unloadNestedArglist( pNV->v.nestVal );
         free( pNV );
@@ -566,8 +566,8 @@ sortNestedList( tArgList* pAL )
      */
     for (ix = 0; ++ix < lm;) {
         int iy = ix-1;
-        tOptionValue* pNewNV = (tOptionValue*)pAL->apzArgs[ix];
-        tOptionValue* pOldNV = (tOptionValue*)pAL->apzArgs[iy];
+        tOptionValue* pNewNV = (tOptionValue*)(void*)(pAL->apzArgs[ix]);
+        tOptionValue* pOldNV = (tOptionValue*)(void*)(pAL->apzArgs[iy]);
 
         /*
          *  For as long as the new entry precedes the "old" entry,
@@ -576,7 +576,7 @@ sortNestedList( tArgList* pAL )
          */
         while (strcmp( pOldNV->pzName, pNewNV->pzName ) > 0) {
             pAL->apzArgs[iy+1] = (void*)pOldNV;
-            pOldNV = (tOptionValue*)pAL->apzArgs[--iy];
+            pOldNV = (tOptionValue*)(void*)(pAL->apzArgs[--iy]);
             if (iy < 0)
                 break;
         }
@@ -621,7 +621,7 @@ optionLoadNested( char const* pzTxt, char const* pzName, size_t nameLen,
         errno = EINVAL;
         return NULL;
     }
-    while (isspace( *pzTxt ))  pzTxt++;
+    while (isspace( (int)*pzTxt ))  pzTxt++;
     if (*pzTxt == NUL) {
         errno = ENOENT;
         return NULL;
@@ -649,8 +649,8 @@ optionLoadNested( char const* pzTxt, char const* pzName, size_t nameLen,
      *  Scan until we hit a NUL.
      */
     do  {
-        while (isspace( *pzTxt ))  pzTxt++;
-        if (isalpha( *pzTxt )) {
+        while (isspace( (int)*pzTxt ))  pzTxt++;
+        if (isalpha( (int)*pzTxt )) {
             pzTxt = scanNameEntry( pzTxt, pRes, mode );
         }
         else switch (*pzTxt) {
@@ -699,7 +699,6 @@ optionNestedVal( tOptions* pOpts, tOptDesc* pOD )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/nested.c */
diff --git a/sntp/libopts/numeric.c b/sntp/libopts/numeric.c
index d21c927e1..486981fb5 100644
--- a/sntp/libopts/numeric.c
+++ b/sntp/libopts/numeric.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: numeric.c,v 4.7 2006/03/25 19:23:28 bkorb Exp $
+ *  $Id: numeric.c,v 4.9 2006/09/24 02:10:45 bkorb Exp $
  *  Time-stamp:      "2006-09-22 18:14:38 bkorb"
  */
 
@@ -83,7 +83,6 @@ optionNumericVal( tOptions* pOpts, tOptDesc* pOD )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/numeric.c */
diff --git a/sntp/libopts/pgusage.c b/sntp/libopts/pgusage.c
index 61684555d..85b558c0d 100644
--- a/sntp/libopts/pgusage.c
+++ b/sntp/libopts/pgusage.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: pgusage.c,v 4.12 2006/07/16 15:27:50 bkorb Exp $
+ *  $Id: pgusage.c,v 4.13 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-07-16 08:13:26 bkorb"
  *
  *   Automated Options Paged Usage module.
@@ -152,7 +152,6 @@ optionPagedUsage( tOptions* pOptions, tOptDesc* pOD )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/pgusage.c */
diff --git a/sntp/libopts/proto.h b/sntp/libopts/proto.h
index 55bf229b5..80f1d06e3 100644
--- a/sntp/libopts/proto.h
+++ b/sntp/libopts/proto.h
@@ -1,7 +1,7 @@
 /* -*- buffer-read-only: t -*- vi: set ro:
  *
  * Prototypes for autoopts
- * Generated Fri Sep 22 18:22:00 PDT 2006
+ * Generated Sun Sep 24 15:28:27 PDT 2006
  */
 #ifndef AUTOOPTS_PROTO_H_GUARD
 #define AUTOOPTS_PROTO_H_GUARD 1
diff --git a/sntp/libopts/putshell.c b/sntp/libopts/putshell.c
index b5b4d80ea..fda77eea7 100644
--- a/sntp/libopts/putshell.c
+++ b/sntp/libopts/putshell.c
@@ -1,7 +1,7 @@
 
 /*
- *  $Id: putshell.c,v 4.12 2006/07/16 15:27:50 bkorb Exp $
- * Time-stamp:      "2006-09-22 18:08:30 bkorb"
+ *  $Id: putshell.c,v 4.14 2006/09/24 02:10:45 bkorb Exp $
+ * Time-stamp:      "2006-09-24 15:28:15 bkorb"
  *
  *  This module will interpret the options set in the tOptions
  *  structure and print them to standard out in a fashion that
@@ -192,7 +192,7 @@ optionPutShell( tOptions* pOpts )
                 printf( "typeset -x -i %s_", pOD->pz_NAME );
                 pz += strspn( pz, " +\t\n\f" );
                 for (;;) {
-                    char ch = *(pz++);
+                    int ch = *(pz++);
                          if (islower( ch ))  fputc( toupper( ch ), stdout );
                     else if (isalnum( ch ))  fputc( ch, stdout );
                     else if (isspace( ch )
@@ -327,7 +327,6 @@ optionPutShell( tOptions* pOpts )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/putshell.c */
diff --git a/sntp/libopts/restore.c b/sntp/libopts/restore.c
index ce788b330..0bd7e1f07 100644
--- a/sntp/libopts/restore.c
+++ b/sntp/libopts/restore.c
@@ -1,6 +1,6 @@
 
 /*
- *  restore.c  $Id: restore.c,v 4.7 2006/03/25 19:23:28 bkorb Exp $
+ *  restore.c  $Id: restore.c,v 4.8 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2005-02-23 15:10:20 bkorb"
  *
  *  This module's routines will save the current option state to memory
@@ -201,7 +201,6 @@ optionFree( tOptions* pOpts )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/restore.c */
diff --git a/sntp/libopts/save.c b/sntp/libopts/save.c
index 6aeb3b877..6c5666e0c 100644
--- a/sntp/libopts/save.c
+++ b/sntp/libopts/save.c
@@ -1,6 +1,6 @@
 
 /*
- *  save.c  $Id: save.c,v 4.17 2006/09/23 00:09:48 bkorb Exp $
+ *  save.c  $Id: save.c,v 4.19 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:11:20 bkorb"
  *
  *  This module's routines will take the currently set options and
@@ -495,7 +495,6 @@ optionSaveFile( tOptions* pOpts )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/save.c */
diff --git a/sntp/libopts/sort.c b/sntp/libopts/sort.c
index de0bd5634..3b5eafd42 100644
--- a/sntp/libopts/sort.c
+++ b/sntp/libopts/sort.c
@@ -1,6 +1,6 @@
 
 /*
- *  sort.c  $Id: sort.c,v 4.10 2006/06/24 23:34:51 bkorb Exp $
+ *  sort.c  $Id: sort.c,v 4.11 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-06-24 10:53:35 bkorb"
  *
  *  This module implements argument sorting.
@@ -363,7 +363,6 @@ optionSort( tOptions* pOpts )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/sort.c */
diff --git a/sntp/libopts/stack.c b/sntp/libopts/stack.c
index a5eb00407..fb78898e1 100644
--- a/sntp/libopts/stack.c
+++ b/sntp/libopts/stack.c
@@ -1,7 +1,7 @@
 
 /*
  *  stack.c
- *  $Id: stack.c,v 4.10 2006/07/14 04:20:17 bkorb Exp $
+ *  $Id: stack.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
  *  Time-stamp:      "2006-09-22 18:13:19 bkorb"
  *
  *  This is a special option processing routine that will save the
@@ -259,7 +259,6 @@ optionStackArg(
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/stack.c */
diff --git a/sntp/libopts/streqvcmp.c b/sntp/libopts/streqvcmp.c
index e16debd15..257ce8840 100644
--- a/sntp/libopts/streqvcmp.c
+++ b/sntp/libopts/streqvcmp.c
@@ -1,6 +1,6 @@
 
 /*
- *  $Id: streqvcmp.c,v 4.11 2006/09/23 00:09:48 bkorb Exp $
+ *  $Id: streqvcmp.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-07-26 18:25:53 bkorb"
  *
  *  String Equivalence Comparison
@@ -284,7 +284,6 @@ strtransform( char* d, char const* s )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/streqvcmp.c */
diff --git a/sntp/libopts/text_mmap.c b/sntp/libopts/text_mmap.c
index 3455fd5ec..ef70a9c11 100644
--- a/sntp/libopts/text_mmap.c
+++ b/sntp/libopts/text_mmap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: text_mmap.c,v 4.15 2006/09/23 00:09:48 bkorb Exp $
+ * $Id: text_mmap.c,v 4.16 2006/09/24 02:10:45 bkorb Exp $
  *
  * Time-stamp:      "2006-09-10 14:50:04 bkorb"
  */
@@ -357,7 +357,6 @@ text_munmap( tmap_info_t* pMI )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/text_mmap.c */
diff --git a/sntp/libopts/tokenize.c b/sntp/libopts/tokenize.c
index c1b4c9ba1..0e576ce26 100644
--- a/sntp/libopts/tokenize.c
+++ b/sntp/libopts/tokenize.c
@@ -316,7 +316,6 @@ main( int argc, char** argv )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/tokenize.c */
diff --git a/sntp/libopts/usage.c b/sntp/libopts/usage.c
index 4f0531823..f4798af17 100644
--- a/sntp/libopts/usage.c
+++ b/sntp/libopts/usage.c
@@ -1,6 +1,6 @@
 
 /*
- *  usage.c  $Id: usage.c,v 4.16 2006/09/23 00:09:48 bkorb Exp $
+ *  usage.c  $Id: usage.c,v 4.17 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-07-01 12:41:02 bkorb"
  *
  *  This module implements the default usage procedure for
@@ -726,7 +726,6 @@ setStdOptFmts( tOptions* pOpts, tCC** ppT )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/usage.c */
diff --git a/sntp/libopts/version.c b/sntp/libopts/version.c
index 6b1e6917f..f528699d3 100644
--- a/sntp/libopts/version.c
+++ b/sntp/libopts/version.c
@@ -1,5 +1,5 @@
 
-/*  $Id: version.c,v 4.10 2006/09/23 00:09:48 bkorb Exp $
+/*  $Id: version.c,v 4.12 2006/09/24 02:10:45 bkorb Exp $
  * Time-stamp:      "2006-09-22 18:15:00 bkorb"
  *
  *  This module implements the default usage procedure for
@@ -171,7 +171,6 @@ optionVersionStderr( tOptions*  pOpts, tOptDesc*  pOD )
  * Local Variables:
  * mode: C
  * c-file-style: "stroustrup"
- * tab-width: 4
  * indent-tabs-mode: nil
  * End:
  * end of autoopts/version.c */
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index df7a1c2d3..288e4760d 100644
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 05:28:21 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:58:04 AM EDT
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  */
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index f9d727252..2476db6f5 100644
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 05:28:20 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:58:03 AM EDT
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  */
diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 22effe58e..bf8f59a89 100644
--- a/sntp/sntp-opts.texi
+++ b/sntp/sntp-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  Sunday September 24, 2006 at 05:28:23 AM EDT
+# It has been AutoGen-ed  Monday September 25, 2006 at 12:58:06 AM EDT
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index adfe831c3..d4716a903 100644
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 05:29:37 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:45:35 AM EDT
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  */
@@ -36,7 +36,7 @@ tSCC zCopyright[] =
        "ntp-keygen copyright (c) 1970-2006 ntp.org, all rights reserved";
 tSCC zCopyrightNotice[] =
        
-/* extracted from ../include/copyright.def near line 8 */
+/* extracted from /deacon/backroom/ntp-dev/include/copyright.def near line 8 */
 "see html/copyright.html";
 extern tUsageProc optionUsage;
 
@@ -867,6 +867,7 @@ doOptSet_Debug_Level(
     tOptions*   pOptions,
     tOptDesc*   pOptDesc )
 {
+    /* extracted from /deacon/backroom/ntp-dev/include/debug-opt.def, line 29 */
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
 #endif /* defined DEBUG */
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index d3e0444a1..284f58473 100644
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  Sunday September 24, 2006 at 05:29:37 AM EDT
+ *  It has been AutoGen-ed  Monday September 25, 2006 at 12:45:34 AM EDT
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  */
diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index 3370841cc..f3f5ea731 100644
--- a/util/ntp-keygen-opts.texi
+++ b/util/ntp-keygen-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  Sunday September 24, 2006 at 05:29:39 AM EDT
+# It has been AutoGen-ed  Monday September 25, 2006 at 12:59:10 AM EDT
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -91,7 +91,7 @@ or by a single hyphen and the flag character.
 
 The following option preset mechanisms are supported:
  - reading file /users/stenn/.ntprc
- - reading file /deacon/backroom/snaps/ntp-dev/util/.ntprc
+ - reading file /deacon/backroom/ntp-dev/util/.ntprc
  - examining environment variables named NTP_KEYGEN_*
 
 If there is no new host key, look for an existing one.
diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index c1f3ef5b8..b640b9a6e 100644
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2006-09-24 "(ntp 4.2.3p50)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2006-09-25 "(ntp 4.2.3p50)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  Sunday September 24, 2006 at 05:29:38 AM EDT
+.\"  It has been AutoGen-ed  Monday September 25, 2006 at 12:59:09 AM EDT
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"