autogen'ed files update

3 files changed, 182 insertions, 603 deletions

diff --git a/doc/invoke-srptool.texi b/doc/invoke-srptool.texi
index 4e2f5c60f5..bedbf65a28 100644
--- a/doc/invoke-srptool.texi
+++ b/doc/invoke-srptool.texi
@@ -3,10 +3,10 @@
 @pindex srptool
 @ignore
 #  -*- buffer-read-only: t -*- vi: set ro:
-#
+# 
 # DO NOT EDIT THIS FILE   (invoke-srptool.texi)
-#
-# It has been AutoGen-ed  May  5, 2013 at 03:51:57 PM by AutoGen 5.17.3
+# 
+# It has been AutoGen-ed  October  4, 2013 at 07:16:06 PM by AutoGen 5.17
 # From the definitions    ../src/srptool-args.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -41,26 +41,28 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-srptool - GnuTLS SRP tool
-Usage:  srptool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
+srptool - GnuTLS SRP tool - Ver. @@VERSION@@
+USAGE:  srptool [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
 
    -d, --debug=num            Enable debugging.
                                 - it must be in the range:
                                   0 to 9999
-   -i, --index                specify the index of the group parameters in tpasswd.conf to use.
+   -i, --index=num            specify the index of the group parameters in tpasswd.conf to use.
    -u, --username=str         specify a username
    -p, --passwd=str           specify a password file.
    -s, --salt=num             specify salt size.
        --verify               just verify the password.
    -v, --passwd-conf=str      specify a password conf file.
        --create-conf=str      Generate a password configuration file.
-   -v, --version[=arg]        output version information and exit
-   -h, --help                 display extended usage information and exit
-   -!, --more-help            extended usage information passed thru pager
+   -v, --version[=arg]        Output version information and exit
+   -h, --help                 Display extended usage information and exit
+   -!, --more-help            Extended usage information passed thru pager
 
 Options are specified by doubled hyphens and their name or by a single
 hyphen and the flag character.
 
+
+
 Simple program that emulates the programs in the Stanford SRP (Secure
 Remote Password) libraries using GnuTLS.  It is intended for use in places
 where you don't expect SRP authentication to be the used for system users.
@@ -110,6 +112,7 @@ The operation failed or the command syntax was not valid.
 @anchor{srptool See Also}
 @subsubheading srptool See Also
     gnutls-cli-debug (1), gnutls-serv (1), srptool (1), psktool (1), certtool (1)
+
 @anchor{srptool Examples}
 @subsubheading srptool Examples
 To create @file{tpasswd.conf} which holds the g and n values for SRP protocol
@@ -131,3 +134,4 @@ the one in @file{/etc/tpasswd} you will get an ok.
 @example
 $ srptool --passwd /etc/tpasswd --passwd\-conf /etc/tpasswd.conf --verify -u test
 @end example
+
diff --git a/src/srptool-args.c b/src/srptool-args.c
index 43f4d26228..7b3454787b 100644
--- a/src/srptool-args.c
+++ b/src/srptool-args.c
@@ -1,12 +1,12 @@
 /*   -*- buffer-read-only: t -*- vi: set ro:
- *
+ *  
  *  DO NOT EDIT THIS FILE   (srptool-args.c)
- *
- *  It has been AutoGen-ed  May  5, 2013 at 12:48:28 PM by AutoGen 5.17.3
+ *  
+ *  It has been AutoGen-ed  October  4, 2013 at 07:15:59 PM by AutoGen 5.17
  *  From the definitions    srptool-args.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 37:0:12 templates.
  *
  *  AutoOpts is a copyrighted work.  This source file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,19 +21,20 @@
  *
  *  Copyright (C) 2000-2012 Free Software Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
- *  redistribution under the terms of the GNU General Public License,
- *  version 3 or later <http://gnu.org/licenses/gpl.html>
+ *  redistribution under the terms of the
+ *  GNU General Public License, version 3 or later
+ *      <http://gnu.org/licenses/gpl.html>
  *
  *  srptool is free software: you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
  *  Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
- *
+ *  
  *  srptool is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *  See the GNU General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU General Public License along
  *  with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -52,24 +53,28 @@
 extern "C" {
 #endif
 extern FILE * option_usage_fp;
+
+/* TRANSLATORS: choose the translation for option names wisely because you
+                cannot ever change your mind. */
 #define zCopyright      (srptool_opt_strs+0)
-#define zLicenseDescrip (srptool_opt_strs+274)
+#define zLicenseDescrip (srptool_opt_strs+278)
 
 
 #ifndef NULL
 #  define NULL 0
 #endif
 
-/**
- *  static const strings for srptool options
+/*
+ *  srptool option static const strings
  */
-static char const srptool_opt_strs[2026] =
+static char const srptool_opt_strs[2049] =
 /*     0 */ "srptool @VERSION@\n"
             "Copyright (C) 2000-2012 Free Software Foundation, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
-            "redistribution under the terms of the GNU General Public License,\n"
-            "version 3 or later <http://gnu.org/licenses/gpl.html>\n\0"
-/*   274 */ "srptool is free software: you can redistribute it and/or modify it under\n"
+            "redistribution under the terms of the\n"
+            "GNU General Public License, version 3 or later\n"
+            "    <http://gnu.org/licenses/gpl.html>\n\0"
+/*   278 */ "srptool is free software: you can redistribute it and/or modify it under\n"
             "the terms of the GNU General Public License as published by the Free\n"
             "Software Foundation, either version 3 of the License, or (at your option)\n"
             "any later version.\n\n"
@@ -79,161 +84,132 @@ static char const srptool_opt_strs[2026] =
             "details.\n\n"
             "You should have received a copy of the GNU General Public License along\n"
             "with this program.  If not, see <http://www.gnu.org/licenses/>.\n\0"
-/*   877 */ "Enable debugging.\0"
-/*   895 */ "DEBUG\0"
-/*   901 */ "debug\0"
-/*   907 */ "specify the index of the group parameters in tpasswd.conf to use.\0"
-/*   973 */ "INDEX\0"
-/*   979 */ "index\0"
-/*   985 */ "specify a username\0"
-/*  1004 */ "USERNAME\0"
-/*  1013 */ "username\0"
-/*  1022 */ "specify a password file.\0"
-/*  1047 */ "PASSWD\0"
-/*  1054 */ "passwd\0"
-/*  1061 */ "specify salt size.\0"
-/*  1080 */ "SALT\0"
-/*  1085 */ "salt\0"
-/*  1090 */ "just verify the password.\0"
-/*  1116 */ "VERIFY\0"
-/*  1123 */ "verify\0"
-/*  1130 */ "specify a password conf file.\0"
-/*  1160 */ "PASSWD_CONF\0"
-/*  1172 */ "passwd-conf\0"
-/*  1184 */ "Generate a password configuration file.\0"
-/*  1224 */ "CREATE_CONF\0"
-/*  1236 */ "create-conf\0"
-/*  1248 */ "display extended usage information and exit\0"
-/*  1292 */ "help\0"
-/*  1297 */ "extended usage information passed thru pager\0"
-/*  1342 */ "more-help\0"
-/*  1352 */ "output version information and exit\0"
-/*  1388 */ "version\0"
-/*  1396 */ "SRPTOOL\0"
-/*  1404 */ "srptool - GnuTLS SRP tool\n"
-            "Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
-/*  1488 */ "bug-gnutls@gnu.org\0"
-/*  1507 */ "\n\0"
-/*  1509 */ "Simple program that emulates the programs in the Stanford SRP (Secure\n"
+/*   881 */ "Enable debugging.\0"
+/*   899 */ "DEBUG\0"
+/*   905 */ "debug\0"
+/*   911 */ "specify the index of the group parameters in tpasswd.conf to use.\0"
+/*   977 */ "INDEX\0"
+/*   983 */ "index\0"
+/*   989 */ "specify a username\0"
+/*  1008 */ "USERNAME\0"
+/*  1017 */ "username\0"
+/*  1026 */ "specify a password file.\0"
+/*  1051 */ "PASSWD\0"
+/*  1058 */ "passwd\0"
+/*  1065 */ "specify salt size.\0"
+/*  1084 */ "SALT\0"
+/*  1089 */ "salt\0"
+/*  1094 */ "just verify the password.\0"
+/*  1120 */ "VERIFY\0"
+/*  1127 */ "verify\0"
+/*  1134 */ "specify a password conf file.\0"
+/*  1164 */ "PASSWD_CONF\0"
+/*  1176 */ "passwd-conf\0"
+/*  1188 */ "Generate a password configuration file.\0"
+/*  1228 */ "CREATE_CONF\0"
+/*  1240 */ "create-conf\0"
+/*  1252 */ "Display extended usage information and exit\0"
+/*  1296 */ "help\0"
+/*  1301 */ "Extended usage information passed thru pager\0"
+/*  1346 */ "more-help\0"
+/*  1356 */ "Output version information and exit\0"
+/*  1392 */ "version\0"
+/*  1400 */ "SRPTOOL\0"
+/*  1408 */ "srptool - GnuTLS SRP tool - Ver. @VERSION@\n"
+            "USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
+/*  1509 */ "bug-gnutls@gnu.org\0"
+/*  1528 */ "\n\n\0"
+/*  1531 */ "\n"
+            "Simple program that emulates the programs in the Stanford SRP (Secure\n"
             "Remote Password) libraries using GnuTLS.  It is intended for use in places\n"
             "where you don't expect SRP authentication to be the used for system users.\n\n"
             "In brief, to use SRP you need to create two files.  These are the password\n"
             "file that holds the users and the verifiers associated with them and the\n"
             "configuration file to hold the group parameters (called tpasswd.conf).\n\0"
-/*  1950 */ "srptool @VERSION@\0"
-/*  1968 */ "srptool [options]\n"
+/*  1973 */ "srptool @VERSION@\0"
+/*  1991 */ "srptool [options]\n"
             "srptool --help for usage instructions.\n";
 
-/**
+/*
  *  debug option description:
  */
-/** Descriptive text for the debug option */
-#define DEBUG_DESC      (srptool_opt_strs+877)
-/** Upper-cased name for the debug option */
-#define DEBUG_NAME      (srptool_opt_strs+895)
-/** Name string for the debug option */
-#define DEBUG_name      (srptool_opt_strs+901)
-/** Compiled in flag settings for the debug option */
+#define DEBUG_DESC      (srptool_opt_strs+881)
+#define DEBUG_NAME      (srptool_opt_strs+899)
+#define DEBUG_name      (srptool_opt_strs+905)
 #define DEBUG_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
-/**
+/*
  *  index option description:
  */
-/** Descriptive text for the index option */
-#define INDEX_DESC      (srptool_opt_strs+907)
-/** Upper-cased name for the index option */
-#define INDEX_NAME      (srptool_opt_strs+973)
-/** Name string for the index option */
-#define INDEX_name      (srptool_opt_strs+979)
-/** Compiled in flag settings for the index option */
-#define INDEX_FLAGS     (OPTST_DISABLED)
+#define INDEX_DESC      (srptool_opt_strs+911)
+#define INDEX_NAME      (srptool_opt_strs+977)
+#define INDEX_name      (srptool_opt_strs+983)
+#define INDEX_DFT_ARG   ((char const*)1)
+#define INDEX_FLAGS     (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
-/**
+/*
  *  username option description:
  */
-/** Descriptive text for the username option */
-#define USERNAME_DESC      (srptool_opt_strs+985)
-/** Upper-cased name for the username option */
-#define USERNAME_NAME      (srptool_opt_strs+1004)
-/** Name string for the username option */
-#define USERNAME_name      (srptool_opt_strs+1013)
-/** Compiled in flag settings for the username option */
+#define USERNAME_DESC      (srptool_opt_strs+989)
+#define USERNAME_NAME      (srptool_opt_strs+1008)
+#define USERNAME_name      (srptool_opt_strs+1017)
 #define USERNAME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-/**
+/*
  *  passwd option description:
  */
-/** Descriptive text for the passwd option */
-#define PASSWD_DESC      (srptool_opt_strs+1022)
-/** Upper-cased name for the passwd option */
-#define PASSWD_NAME      (srptool_opt_strs+1047)
-/** Name string for the passwd option */
-#define PASSWD_name      (srptool_opt_strs+1054)
-/** Compiled in flag settings for the passwd option */
+#define PASSWD_DESC      (srptool_opt_strs+1026)
+#define PASSWD_NAME      (srptool_opt_strs+1051)
+#define PASSWD_name      (srptool_opt_strs+1058)
 #define PASSWD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-/**
+/*
  *  salt option description:
  */
-/** Descriptive text for the salt option */
-#define SALT_DESC      (srptool_opt_strs+1061)
-/** Upper-cased name for the salt option */
-#define SALT_NAME      (srptool_opt_strs+1080)
-/** Name string for the salt option */
-#define SALT_name      (srptool_opt_strs+1085)
-/** Compiled in flag settings for the salt option */
+#define SALT_DESC      (srptool_opt_strs+1065)
+#define SALT_NAME      (srptool_opt_strs+1084)
+#define SALT_name      (srptool_opt_strs+1089)
 #define SALT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
-/**
+/*
  *  verify option description:
  */
-/** Descriptive text for the verify option */
-#define VERIFY_DESC      (srptool_opt_strs+1090)
-/** Upper-cased name for the verify option */
-#define VERIFY_NAME      (srptool_opt_strs+1116)
-/** Name string for the verify option */
-#define VERIFY_name      (srptool_opt_strs+1123)
-/** Compiled in flag settings for the verify option */
+#define VERIFY_DESC      (srptool_opt_strs+1094)
+#define VERIFY_NAME      (srptool_opt_strs+1120)
+#define VERIFY_name      (srptool_opt_strs+1127)
 #define VERIFY_FLAGS     (OPTST_DISABLED)
 
-/**
+/*
  *  passwd-conf option description:
  */
-/** Descriptive text for the passwd-conf option */
-#define PASSWD_CONF_DESC      (srptool_opt_strs+1130)
-/** Upper-cased name for the passwd-conf option */
-#define PASSWD_CONF_NAME      (srptool_opt_strs+1160)
-/** Name string for the passwd-conf option */
-#define PASSWD_CONF_name      (srptool_opt_strs+1172)
-/** Compiled in flag settings for the passwd-conf option */
+#define PASSWD_CONF_DESC      (srptool_opt_strs+1134)
+#define PASSWD_CONF_NAME      (srptool_opt_strs+1164)
+#define PASSWD_CONF_name      (srptool_opt_strs+1176)
 #define PASSWD_CONF_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-/**
+/*
  *  create-conf option description:
  */
-/** Descriptive text for the create-conf option */
-#define CREATE_CONF_DESC      (srptool_opt_strs+1184)
-/** Upper-cased name for the create-conf option */
-#define CREATE_CONF_NAME      (srptool_opt_strs+1224)
-/** Name string for the create-conf option */
-#define CREATE_CONF_name      (srptool_opt_strs+1236)
-/** Compiled in flag settings for the create-conf option */
+#define CREATE_CONF_DESC      (srptool_opt_strs+1188)
+#define CREATE_CONF_NAME      (srptool_opt_strs+1228)
+#define CREATE_CONF_name      (srptool_opt_strs+1240)
 #define CREATE_CONF_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (srptool_opt_strs+1248)
-#define HELP_name       (srptool_opt_strs+1292)
+#define HELP_DESC       (srptool_opt_strs+1252)
+#define HELP_name       (srptool_opt_strs+1296)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (srptool_opt_strs+1297)
-#define MORE_HELP_name  (srptool_opt_strs+1342)
+#define MORE_HELP_DESC  (srptool_opt_strs+1301)
+#define MORE_HELP_name  (srptool_opt_strs+1346)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  NULL
@@ -246,9 +222,9 @@ static char const srptool_opt_strs[2026] =
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#define VER_DESC        (srptool_opt_strs+1352)
-#define VER_name        (srptool_opt_strs+1388)
-/**
+#define VER_DESC        (srptool_opt_strs+1356)
+#define VER_name        (srptool_opt_strs+1392)
+/*
  *  Declare option callback procedures
  */
 extern tOptProc
@@ -284,10 +260,10 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ INDEX_FLAGS, 0,
-     /* last opt argumnt */ { NULL }, /* --index */
+     /* last opt argumnt */ { INDEX_DFT_ARG },
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
+     /* option proc      */ optionNumericVal,
      /* desc, NAME, name */ INDEX_DESC, INDEX_NAME, INDEX_name,
      /* disablement strs */ NULL, NULL },
 
@@ -367,7 +343,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equiv idx value  */ NO_EQUIVALENT, VALUE_OPT_VERSION,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ VER_FLAGS, AOUSE_VERSION,
+     /* opt state flags  */ VER_FLAGS, 0,
      /* last opt argumnt */ { NULL },
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
@@ -381,7 +357,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equiv idx value  */ NO_EQUIVALENT, VALUE_OPT_HELP,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ OPTST_IMM | OPTST_NO_INIT, AOUSE_HELP,
+     /* opt state flags  */ OPTST_IMM | OPTST_NO_INIT, 0,
      /* last opt argumnt */ { NULL },
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
@@ -393,7 +369,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equiv idx value  */ NO_EQUIVALENT, VALUE_OPT_MORE_HELP,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
-     /* opt state flags  */ MORE_HELP_FLAGS, AOUSE_MORE_HELP,
+     /* opt state flags  */ MORE_HELP_FLAGS, 0,
      /* last opt argumnt */ { NULL },
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL,  NULL,
@@ -403,24 +379,19 @@ static tOptDesc optDesc[OPTION_CT] = {
 };
 
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/** Reference to the upper cased version of srptool. */
-#define zPROGNAME       (srptool_opt_strs+1396)
-/** Reference to the title line for srptool usage. */
-#define zUsageTitle     (srptool_opt_strs+1404)
-/** There is no srptool configuration file. */
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Define the srptool Option Environment
+ */
+#define zPROGNAME       (srptool_opt_strs+1400)
+#define zUsageTitle     (srptool_opt_strs+1408)
 #define zRcName         NULL
-/** There are no directories to search for srptool config files. */
 #define apzHomeList     NULL
-/** The srptool program bug email address. */
-#define zBugsAddr       (srptool_opt_strs+1488)
-/** Clarification/explanation of what srptool does. */
-#define zExplain        (srptool_opt_strs+1507)
-/** Extra detail explaining what srptool does. */
-#define zDetail         (srptool_opt_strs+1509)
-/** The full version string for srptool. */
-#define zFullVersion    (srptool_opt_strs+1950)
-/* extracted from optcode.tlib near line 371 */
+#define zBugsAddr       (srptool_opt_strs+1509)
+#define zExplain        (srptool_opt_strs+1528)
+#define zDetail         (srptool_opt_strs+1531)
+#define zFullVersion    (srptool_opt_strs+1973)
+/* extracted from optcode.tlib near line 353 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT
@@ -430,8 +401,10 @@ static tOptDesc optDesc[OPTION_CT] = {
 # define translate_option_strings NULL
 #endif /* ENABLE_NLS */
 
+
 #define srptool_full_usage (NULL)
-#define srptool_short_usage (srptool_opt_strs+1968)
+
+#define srptool_short_usage (srptool_opt_strs+1991)
 
 #endif /* not defined __doxygen__ */
 
@@ -441,8 +414,8 @@ static tOptDesc optDesc[OPTION_CT] = {
 /**
  * The callout function that invokes the optionUsage function.
  *
- * @param[in] pOptions the AutoOpts option description structure
- * @param[in] pOptDesc the descriptor for the "help" (usage) option.
+ * @param pOptions the AutoOpts option description structure
+ * @param pOptDesc the descriptor for the "help" (usage) option.
  * @noreturn
  */
 static void
@@ -457,9 +430,9 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
  * Code to handle the debug option.
- * Specifies the debug level.
- * @param[in] pOptions the srptool options data structure
- * @param[in,out] pOptDesc the option descriptor for this option.
+ *
+ * @param pOptions the srptool options data structure
+ * @param pOptDesc the option descriptor for this option.
  */
 static void
 doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -488,7 +461,7 @@ doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
  emit_ranges:
     optionShowRange(pOptions, pOptDesc, (void *)rng, 1);
 }
-/* extracted from optmain.tlib near line 1254 */
+/* extracted from optmain.tlib near line 1188 */
 
 /**
  * The directory containing the data associated with srptool.
@@ -504,7 +477,6 @@ doOptDebug(tOptions* pOptions, tOptDesc* pOptDesc)
 #ifndef  WITH_PACKAGER
 # define srptool_packager_info NULL
 #else
-/** Packager information for srptool. */
 static char const srptool_packager_info[] =
     "Packaged by " WITH_PACKAGER
 
@@ -559,11 +531,6 @@ tOptions srptoolOptions = {
 };
 
 #if ENABLE_NLS
-/**
- * This code is designed to translate translatable option text for the
- * srptool program.  These translations happen upon entry
- * to optionProcess().
- */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -642,8 +609,9 @@ translate_option_strings(void)
          *  Do the translations.  The first pointer follows the field count
          *  field.  The field count field is the size of a pointer.
          */
-        char ** ppz = (char**)(void*)&(option_xlateable_txt);
-        int     ix  = option_xlateable_txt.field_ct;
+        tOptDesc * od = opts->pOptDesc;
+        char **    ppz = (char**)(void*)&(option_xlateable_txt);
+        int        ix  = option_xlateable_txt.field_ct;
 
         do {
             ppz++; /* skip over field_ct */
@@ -658,403 +626,28 @@ translate_option_strings(void)
         coerce_it((void*)&(opts->pzUsageTitle));
         coerce_it((void*)&(opts->pzExplain));
         coerce_it((void*)&(opts->pzDetail));
-        {
-            tOptDesc * od = opts->pOptDesc;
-            for (ix = opts->optCt; ix > 0; ix--, od++)
-                coerce_it((void*)&(od->pzText));
-        }
-    }
-}
-#endif /* ENABLE_NLS */
-
-#ifdef DO_NOT_COMPILE_THIS_CODE_IT_IS_FOR_GETTEXT
-/** I18N function strictly for xgettext.  Do not compile. */
-static void bogus_function(void) {
-  /* TRANSLATORS:
-
-     The following dummy function was crated solely so that xgettext can extract
-     the correct strings.  These strings are actually referenced by a field name
-     in the srptoolOptions structure noted in the comments below.  The
-     literal text is defined in srptool_opt_strs.
-   
-     NOTE: the strings below are segmented with respect to the source string
-     srptool_opt_strs.  The strings above are handed off for translation
-     at run time a paragraph at a time.  Consequently, they are presented here
-     for translation a paragraph at a time.
-   
-     ALSO: often the description for an option will reference another option
-     by name.  These are set off with apostrophe quotes (I hope).  Do not
-     translate option names.
-   */
-  /* referenced via srptoolOptions.pzCopyright */
-  puts(_("srptool @VERSION@\n\
-Copyright (C) 2000-2012 Free Software Foundation, all rights reserved.\n\
-This is free software. It is licensed for use, modification and\n\
-redistribution under the terms of the GNU General Public License,\n\
-version 3 or later <http://gnu.org/licenses/gpl.html>\n"));
-
-  /* referenced via srptoolOptions.pzCopyNotice */
-  puts(_("srptool is free software: you can redistribute it and/or modify it under\n\
-the terms of the GNU General Public License as published by the Free\n\
-Software Foundation, either version 3 of the License, or (at your option)\n\
-any later version.\n\n"));
-  puts(_("srptool is distributed in the hope that it will be useful, but WITHOUT ANY\n\
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n\
-FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more\n\
-details.\n\n"));
-  puts(_("You should have received a copy of the GNU General Public License along\n\
-with this program.  If not, see <http://www.gnu.org/licenses/>.\n"));
-
-  /* referenced via srptoolOptions.pOptDesc->pzText */
-  puts(_("Enable debugging."));
-
-  /* referenced via srptoolOptions.pOptDesc->pzText */
-  puts(_("specify the index of the group parameters in tpasswd.conf to use."));
-
-  /* referenced via srptoolOptions.pOptDesc->pzText */
-  puts(_("specify a username"));
-
-  /* referenced via srptoolOptions.pOptDesc->pzText */
-  puts(_("specify a password file."));
+        coerce_it((void*)&(opts->pzPackager));
+        coerce_it((void*)&(opts->pzShortUsage));
 
-  /* referenced via srptoolOptions.pOptDesc->pzText */
-  puts(_("specify salt size."));
-
-  /* referenced via srptoolOptions.pOptDesc->pzText */
-  puts(_("just verify the password."));
-
-  /* referenced via srptoolOptions.pOptDesc->pzText */
-  puts(_("specify a password conf file."));
-
-  /* referenced via srptoolOptions.pOptDesc->pzText */
-  puts(_("Generate a password configuration file."));
-
-  /* referenced via srptoolOptions.pOptDesc->pzText */
-  puts(_("display extended usage information and exit"));
-
-  /* referenced via srptoolOptions.pOptDesc->pzText */
-  puts(_("extended usage information passed thru pager"));
-
-  /* referenced via srptoolOptions.pOptDesc->pzText */
-  puts(_("output version information and exit"));
-
-  /* referenced via srptoolOptions.pzUsageTitle */
-  puts(_("srptool - GnuTLS SRP tool\n\
-Usage:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
-
-  /* referenced via srptoolOptions.pzExplain */
-  puts(_("\n"));
-
-  /* referenced via srptoolOptions.pzDetail */
-  puts(_("Simple program that emulates the programs in the Stanford SRP (Secure\n\
-Remote Password) libraries using GnuTLS.  It is intended for use in places\n\
-where you don't expect SRP authentication to be the used for system users.\n\n"));
-  puts(_("In brief, to use SRP you need to create two files.  These are the password\n\
-file that holds the users and the verifiers associated with them and the\n\
-configuration file to hold the group parameters (called tpasswd.conf).\n"));
+        for (ix = opts->optCt; ix > 0; ix--, od++)
+            coerce_it((void*)&(od->pzText));
+    }
 
-  /* referenced via srptoolOptions.pzFullVersion */
-  puts(_("srptool @VERSION@"));
+    if ((opts->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
+        tOptDesc * od = opts->pOptDesc;
+        int        ix;
 
-  /* referenced via srptoolOptions.pzFullUsage */
-  puts(_("<<<NOT-FOUND>>>"));
+        for (ix = opts->optCt; ix > 0; ix--, od++) {
+            coerce_it((void*)&(od->pz_Name));
+            coerce_it((void*)&(od->pz_DisableName));
+            coerce_it((void*)&(od->pz_DisablePfx));
+        }
+        srptoolOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
+    }
+}
 
-  /* referenced via srptoolOptions.pzShortUsage */
-  puts(_("srptool [options]\n\
-srptool --help for usage instructions.\n"));
-  /* LIBOPTS-MESSAGES: */
-#line 60 "../autoopts.c"
-  puts(_("allocation of %d bytes failed\n"));
-#line 86 "../autoopts.c"
-  puts(_("allocation of %d bytes failed\n"));
-#line 53 "../init.c"
-  puts(_("AutoOpts function called without option descriptor\n"));
-#line 89 "../init.c"
-  puts(_("\tThis exceeds the compiled library version:  "));
-#line 87 "../init.c"
-  puts(_("Automated Options Processing Error!\n"
-       "\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
-#line 73 "../autoopts.c"
-  puts(_("realloc of %d bytes at 0x%p failed\n"));
-#line 91 "../init.c"
-  puts(_("\tThis is less than the minimum library version:  "));
-#line 121 "../version.c"
-  puts(_("Automated Options version %s\n"
-       "\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n"));
-#line 310 "../usage.c"
-  puts(_("(AutoOpts bug):  %s.\n"));
-#line 90 "../reset.c"
-  puts(_("optionResetOpt() called, but reset-option not configured"));
-#line 329 "../usage.c"
-  puts(_("could not locate the 'help' option"));
-#line 351 "../autoopts.c"
-  puts(_("optionProcess() was called with invalid data"));
-#line 783 "../usage.c"
-  puts(_("invalid argument type specified"));
-#line 589 "../find.c"
-  puts(_("defaulted to option with optional arg"));
-#line 76 "../alias.c"
-  puts(_("aliasing option is out of range."));
-#line 229 "../enum.c"
-  puts(_("%s error:  the keyword '%s' is ambiguous for %s\n"));
-#line 108 "../find.c"
-  puts(_("  The following options match:\n"));
-#line 290 "../find.c"
-  puts(_("%s: ambiguous option name: %s (matches %d options)\n"));
-#line 161 "../check.c"
-  puts(_("%s: Command line arguments required\n"));
-#line 43 "../alias.c"
-  puts(_("%d %s%s options allowed\n"));
-#line 81 "../makeshell.c"
-  puts(_("%s error %d (%s) calling %s for '%s'\n"));
-#line 293 "../makeshell.c"
-  puts(_("interprocess pipe"));
-#line 168 "../version.c"
-  puts(_("error: version option argument '%c' invalid.  Use:\n"
-       "\t'v' - version only\n"
-       "\t'c' - version and copyright\n"
-       "\t'n' - version and full copyright notice\n"));
-#line 58 "../check.c"
-  puts(_("%s error:  the '%s' and '%s' options conflict\n"));
-#line 214 "../find.c"
-  puts(_("%s: The '%s' option has been disabled."));
-#line 421 "../find.c"
-  puts(_("%s: The '%s' option has been disabled."));
-#line 38 "../alias.c"
-  puts(_("-equivalence"));
-#line 460 "../find.c"
-  puts(_("%s: illegal option -- %c\n"));
-#line 110 "../reset.c"
-  puts(_("%s: illegal option -- %c\n"));
-#line 268 "../find.c"
-  puts(_("%s: illegal option -- %s\n"));
-#line 746 "../find.c"
-  puts(_("%s: illegal option -- %s\n"));
-#line 118 "../reset.c"
-  puts(_("%s: illegal option -- %s\n"));
-#line 332 "../find.c"
-  puts(_("%s: unknown vendor extension option -- %s\n"));
-#line 154 "../enum.c"
-  puts(_("  or an integer from %d through %d\n"));
-#line 164 "../enum.c"
-  puts(_("  or an integer from %d through %d\n"));
-#line 782 "../usage.c"
-  puts(_("%s error:  invalid option descriptor for %s\n"));
-#line 1110 "../usage.c"
-  puts(_("%s error:  invalid option descriptor for %s\n"));
-#line 379 "../find.c"
-  puts(_("%s: invalid option name: %s\n"));
-#line 518 "../find.c"
-  puts(_("%s: The '%s' option requires an argument.\n"));
-#line 171 "../autoopts.c"
-  puts(_("(AutoOpts bug):  Equivalenced option '%s' was equivalenced to both\n"
-       "\t'%s' and '%s'."));
-#line 94 "../check.c"
-  puts(_("%s error:  The %s option is required\n"));
-#line 623 "../find.c"
-  puts(_("%s: The '%s' option cannot have an argument.\n"));
-#line 151 "../check.c"
-  puts(_("%s: Command line arguments are not allowed.\n"));
-#line 531 "../save.c"
-  puts(_("error %d (%s) creating %s\n"));
-#line 229 "../enum.c"
-  puts(_("%s error:  '%s' does not match any %s keywords.\n"));
-#line 93 "../reset.c"
-  puts(_("%s error: The '%s' option requires an argument.\n"));
-#line 184 "../save.c"
-  puts(_("error %d (%s) stat-ing %s\n"));
-#line 238 "../save.c"
-  puts(_("error %d (%s) stat-ing %s\n"));
-#line 143 "../restore.c"
-  puts(_("%s error: no saved option state\n"));
-#line 246 "../autoopts.c"
-  puts(_("'%s' is not a command line option.\n"));
-#line 114 "../time.c"
-  puts(_("%s error:  '%s' is not a recognizable date/time.\n"));
-#line 132 "../save.c"
-  puts(_("'%s' not defined\n"));
-#line 53 "../time.c"
-  puts(_("%s error:  '%s' is not a recognizable time duration.\n"));
-#line 92 "../check.c"
-  puts(_("%s error:  The %s option must appear %d times.\n"));
-#line 157 "../numeric.c"
-  puts(_("%s error:  '%s' is not a recognizable number.\n"));
-#line 195 "../enum.c"
-  puts(_("%s error:  %s exceeds %s keyword count\n"));
-#line 366 "../usage.c"
-  puts(_("Try '%s %s' for more information.\n"));
-#line 45 "../alias.c"
-  puts(_("one %s%s option allowed\n"));
-#line 195 "../makeshell.c"
-  puts(_("standard output"));
-#line 930 "../makeshell.c"
-  puts(_("standard output"));
-#line 304 "../usage.c"
-  puts(_("standard output"));
-#line 451 "../usage.c"
-  puts(_("standard output"));
-#line 660 "../usage.c"
-  puts(_("standard output"));
-#line 175 "../version.c"
-  puts(_("standard output"));
-#line 304 "../usage.c"
-  puts(_("standard error"));
-#line 451 "../usage.c"
-  puts(_("standard error"));
-#line 660 "../usage.c"
-  puts(_("standard error"));
-#line 175 "../version.c"
-  puts(_("standard error"));
-#line 195 "../makeshell.c"
-  puts(_("write"));
-#line 930 "../makeshell.c"
-  puts(_("write"));
-#line 303 "../usage.c"
-  puts(_("write"));
-#line 450 "../usage.c"
-  puts(_("write"));
-#line 659 "../usage.c"
-  puts(_("write"));
-#line 174 "../version.c"
-  puts(_("write"));
-#line 60 "../numeric.c"
-  puts(_("%s error:  %s option value %ld is out of range.\n"));
-#line 44 "../check.c"
-  puts(_("%s error:  %s option requires the %s option\n"));
-#line 131 "../save.c"
-  puts(_("%s warning:  cannot save options - %s not regular file\n"));
-#line 183 "../save.c"
-  puts(_("%s warning:  cannot save options - %s not regular file\n"));
-#line 237 "../save.c"
-  puts(_("%s warning:  cannot save options - %s not regular file\n"));
-#line 256 "../save.c"
-  puts(_("%s warning:  cannot save options - %s not regular file\n"));
-#line 530 "../save.c"
-  puts(_("%s warning:  cannot save options - %s not regular file\n"));
-  /* END-LIBOPTS-MESSAGES */
+#endif /* ENABLE_NLS */
 
-  /* USAGE-TEXT: */
-#line 908 "../usage.c"
-  puts(_("\t\t\t\t- an alternate for '%s'\n"));
-#line 1177 "../usage.c"
-  puts(_("Version, usage and configuration options:"));
-#line 959 "../usage.c"
-  puts(_("\t\t\t\t- default option for unnamed options\n"));
-#line 872 "../usage.c"
-  puts(_("\t\t\t\t- disabled as '--%s'\n"));
-#line 1146 "../usage.c"
-  puts(_(" --- %-14s %s\n"));
-#line 1144 "../usage.c"
-  puts(_("This option has been disabled"));
-#line 899 "../usage.c"
-  puts(_("\t\t\t\t- enabled by default\n"));
-#line 40 "../alias.c"
-  puts(_("%s error:  only "));
-#line 1221 "../usage.c"
-  puts(_(" - examining environment variables named %s_*\n"));
-#line 168 "../file.c"
-  puts(_("\t\t\t\t- file must not pre-exist\n"));
-#line 172 "../file.c"
-  puts(_("\t\t\t\t- file must pre-exist\n"));
-#line 416 "../usage.c"
-  puts(_("Options are specified by doubled hyphens and their name or by a single\n"
-       "hyphen and the flag character.\n"));
-#line 908 "../makeshell.c"
-  puts(_("\n"
-       "= = = = = = = =\n\n"
-       "This incarnation of genshell will produce\n"
-       "a shell script to parse the options for %s:\n\n"));
-#line 161 "../enum.c"
-  puts(_("  or an integer mask with any of the lower %d bits set\n"));
-#line 932 "../usage.c"
-  puts(_("\t\t\t\t- is a set membership option\n"));
-#line 953 "../usage.c"
-  puts(_("\t\t\t\t- must appear between %d and %d times\n"));
-#line 418 "../usage.c"
-  puts(_("Options are specified by single or double hyphens and their name.\n"));
-#line 939 "../usage.c"
-  puts(_("\t\t\t\t- may appear multiple times\n"));
-#line 926 "../usage.c"
-  puts(_("\t\t\t\t- may not be preset\n"));
-#line 1336 "../usage.c"
-  puts(_("   Arg Option-Name    Description\n"));
-#line 1272 "../usage.c"
-  puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1330 "../usage.c"
-  puts(_("  Flg Arg Option-Name    Description\n"));
-#line 1331 "../usage.c"
-  puts(_(" %3s %s"));
-#line 1337 "../usage.c"
-  puts(_(" %3s %s"));
-#line 423 "../usage.c"
-  puts(_("The '-#<number>' option may omit the hash char\n"));
-#line 419 "../usage.c"
-  puts(_("All arguments are named options.\n"));
-#line 1006 "../usage.c"
-  puts(_(" - reading file %s"));
-#line 445 "../usage.c"
-  puts(_("\n"
-       "Please send bug reports to:  <%s>\n"));
-#line 100 "../version.c"
-  puts(_("\n"
-       "Please send bug reports to:  <%s>\n"));
-#line 129 "../version.c"
-  puts(_("\n"
-       "Please send bug reports to:  <%s>\n"));
-#line 938 "../usage.c"
-  puts(_("\t\t\t\t- may NOT appear - preset only\n"));
-#line 978 "../usage.c"
-  puts(_("\n"
-       "The following option preset mechanisms are supported:\n"));
-#line 1219 "../usage.c"
-  puts(_("\n"
-       "The following option preset mechanisms are supported:\n"));
-#line 717 "../usage.c"
-  puts(_("prohibits these options:\n"));
-#line 712 "../usage.c"
-  puts(_("prohibits the option '%s'\n"));
-#line 81 "../numeric.c"
-  puts(_("%s%ld to %ld"));
-#line 79 "../numeric.c"
-  puts(_("%sgreater than or equal to %ld"));
-#line 75 "../numeric.c"
-  puts(_("%s%ld exactly"));
-#line 68 "../numeric.c"
-  puts(_("%sit must lie in one of the ranges:\n"));
-#line 68 "../numeric.c"
-  puts(_("%sit must be in the range:\n"));
-#line 88 "../numeric.c"
-  puts(_(", or\n"));
-#line 66 "../numeric.c"
-  puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n"));
-#line 77 "../numeric.c"
-  puts(_("%sless than or equal to %ld"));
-#line 426 "../usage.c"
-  puts(_("Operands and options may be intermixed.  They will be reordered.\n"));
-#line 687 "../usage.c"
-  puts(_("requires the option '%s'\n"));
-#line 690 "../usage.c"
-  puts(_("requires these options:\n"));
-#line 1348 "../usage.c"
-  puts(_("   Arg Option-Name   Req?  Description\n"));
-#line 1342 "../usage.c"
-  puts(_("  Flg Arg Option-Name   Req?  Description\n"));
-#line 162 "../enum.c"
-  puts(_("or you may use a numeric representation.  Preceding these with a '!'\n"
-       "will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
-       "will set them all.  Multiple entries may be passed as an option\n"
-       "argument list.\n"));
-#line 945 "../usage.c"
-  puts(_("\t\t\t\t- may appear up to %d times\n"));
-#line 72 "../enum.c"
-  puts(_("The valid \"%s\" option keywords are:\n"));
-#line 1181 "../usage.c"
-  puts(_("The next option supports vendor supported extra options:"));
-#line 808 "../usage.c"
-  puts(_("These additional options are:"));
-  /* END-USAGE-TEXT */
-}
-#endif /* uncompilable code */
 #ifdef  __cplusplus
 }
 #endif
diff --git a/src/srptool-args.h b/src/srptool-args.h
index cfffbb2b7e..96c844cf87 100644
--- a/src/srptool-args.h
+++ b/src/srptool-args.h
@@ -1,12 +1,12 @@
 /*   -*- buffer-read-only: t -*- vi: set ro:
- *
+ *  
  *  DO NOT EDIT THIS FILE   (srptool-args.h)
- *
- *  It has been AutoGen-ed  May  5, 2013 at 12:48:28 PM by AutoGen 5.17.3
+ *  
+ *  It has been AutoGen-ed  October  4, 2013 at 07:15:59 PM by AutoGen 5.17
  *  From the definitions    srptool-args.def
  *  and the template file   options
  *
- * Generated from AutoOpts 38:0:13 templates.
+ * Generated from AutoOpts 37:0:12 templates.
  *
  *  AutoOpts is a copyrighted work.  This header file is not encumbered
  *  by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,23 +21,24 @@
  *
  *  Copyright (C) 2000-2012 Free Software Foundation, all rights reserved.
  *  This is free software. It is licensed for use, modification and
- *  redistribution under the terms of the GNU General Public License,
- *  version 3 or later <http://gnu.org/licenses/gpl.html>
+ *  redistribution under the terms of the
+ *  GNU General Public License, version 3 or later
+ *      <http://gnu.org/licenses/gpl.html>
  *
  *  srptool is free software: you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
  *  Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
- *
+ *  
  *  srptool is distributed in the hope that it will be useful, but
  *  WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  *  See the GNU General Public License for more details.
- *
+ *  
  *  You should have received a copy of the GNU General Public License along
  *  with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/**
+/*
  *  This file contains the programmatic interface to the Automated
  *  Options generated for the srptool program.
  *  These macros are documented in the AutoGen info file in the
@@ -48,22 +49,22 @@
 #include "config.h"
 #include <autoopts/options.h>
 
-/**
+/*
  *  Ensure that the library used for compiling this generated header is at
  *  least as new as the version current when the header template was released
  *  (not counting patch version increments).  Also ensure that the oldest
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 155648
+#define AO_TEMPLATE_VERSION 151552
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
   Choke Me.
 #endif
 
-/**
- *  Enumeration of each option type for srptool
+/*
+ *  Enumeration of each option:
  */
 typedef enum {
     INDEX_OPT_DEBUG        =  0,
@@ -78,51 +79,34 @@ typedef enum {
     INDEX_OPT_HELP         =  9,
     INDEX_OPT_MORE_HELP    = 10
 } teOptIndex;
-/** count of all options for srptool */
+
 #define OPTION_CT    11
-/** srptool version */
 #define SRPTOOL_VERSION       "@VERSION@"
-/** Full srptool version text */
 #define SRPTOOL_FULL_VERSION  "srptool @VERSION@"
 
-/**
+/*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
  *  option name (as in the teOptIndex enumeration above).
  *  e.g. HAVE_OPT(DEBUG)
  */
 #define         DESC(n) (srptoolOptions.pOptDesc[INDEX_OPT_## n])
-/** 'true' if an option has been specified in any way */
 #define     HAVE_OPT(n) (! UNUSED_OPT(& DESC(n)))
-/** The string argument to an option. The argument type must be "string". */
 #define      OPT_ARG(n) (DESC(n).optArg.argString)
-/** Mask the option state revealing how an option was specified.
- *  It will be one and only one of \a OPTST_SET, \a OPTST_PRESET,
- * \a OPTST_DEFINED, \a OPTST_RESET or zero.
- */
 #define    STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK)
-/** Count of option's occurrances *on the command line*. */
 #define    COUNT_OPT(n) (DESC(n).optOccCt)
-/** mask of \a OPTST_SET and \a OPTST_DEFINED. */
 #define    ISSEL_OPT(n) (SELECTED_OPT(&DESC(n)))
-/** 'true' if \a HAVE_OPT would yield 'false'. */
 #define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n)))
-/** 'true' if OPTST_DISABLED bit not set. */
 #define  ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n)))
-/** number of stacked option arguments.
- *  Valid only for stacked option arguments. */
 #define  STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt)
-/** stacked argument vector.
- *  Valid only for stacked option arguments. */
 #define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs)
-/** Reset an option. */
 #define    CLEAR_OPT(n) STMTS( \
                 DESC(n).fOptState &= OPTST_PERSISTENT_MASK;   \
                 if ((DESC(n).fOptState & OPTST_INITENABLED) == 0) \
                     DESC(n).fOptState |= OPTST_DISABLED; \
                 DESC(n).optCookie = NULL )
 
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/**
+/* * * * * *
+ *
  *  Enumeration of srptool exit codes
  */
 typedef enum {
@@ -131,15 +115,16 @@ typedef enum {
     SRPTOOL_EXIT_USAGE_ERROR        = 64,
     SRPTOOL_EXIT_LIBOPTS_FAILURE    = 70
 } srptool_exit_code_t;
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/**
+/* * * * * *
+ *
  *  Interface defines for specific options.
- * @{
  */
 #define VALUE_OPT_DEBUG          'd'
 
 #define OPT_VALUE_DEBUG          (DESC(DEBUG).optArg.argInt)
 #define VALUE_OPT_INDEX          'i'
+
+#define OPT_VALUE_INDEX          (DESC(INDEX).optArg.argInt)
 #define VALUE_OPT_USERNAME       'u'
 #define VALUE_OPT_PASSWD         'p'
 #define VALUE_OPT_SALT           's'
@@ -148,11 +133,8 @@ typedef enum {
 #define VALUE_OPT_VERIFY         5
 #define VALUE_OPT_PASSWD_CONF    'v'
 #define VALUE_OPT_CREATE_CONF    7
-/** option flag (value) for " (get "val-name") " option */
 #define VALUE_OPT_HELP          'h'
-/** option flag (value) for " (get "val-name") " option */
 #define VALUE_OPT_MORE_HELP     '!'
-/** option flag (value) for " (get "val-name") " option */
 #define VALUE_OPT_VERSION       'v'
 /*
  *  Interface defines not associated with particular options
@@ -164,7 +146,7 @@ typedef enum {
                 srptoolOptions.pzCurOpt  = NULL)
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*srptoolOptions.pUsageProc)(&srptoolOptions, c)
-/* extracted from opthead.tlib near line 538 */
+/* extracted from opthead.tlib near line 497 */
 
 #ifdef  __cplusplus
 extern "C" {