More test-version-check debugging, on Linux buildbot hosts.

[nmh] / uip / mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index acb416c71a4bf41a8f7bbcde0c84cc7a2cb3dedd..a2a7489a1b2373959567b619bca6a1440511f4be 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -29,8 +29,10 @@ DEFINE_SWITCH_ENUM(MHPARAM);
 DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 #undef X
 
 DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 #undef X
 

-extern char *mhetcdir;
+extern char *mhbindir;

 extern char *mhlibexecdir;
 extern char *mhlibexecdir;

+extern char *mhetcdir;
+extern char *mhdocdir;

 
 static char *sbackup = BACKUP_PREFIX;
 
 
 static char *sbackup = BACKUP_PREFIX;
 


@@ -75,6 +77,13 @@ static char *iconv =
     "";
 #endif
 
     "";
 #endif
 

+static char *oauth =
+#ifdef OAUTH_SUPPORT
+    "oauth";
+#else
+    "";
+#endif
+

 struct proc {
     char *p_name;
     char **p_field;
 struct proc {
     char *p_name;
     char **p_field;


@@ -104,14 +113,17 @@ static struct proc procs [] = {
      { "version",          &version_num },
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },
      { "version",          &version_num },
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },

-     { "etcdir",           &mhetcdir },
-     { "libdir",           &mhlibexecdir },
+     { "bindir",           &mhbindir },

      { "libexecdir",       &mhlibexecdir },
      { "libexecdir",       &mhlibexecdir },

+     { "libdir",           &mhlibexecdir },
+     { "etcdir",           &mhetcdir },
+     { "docdir",           &mhdocdir },

      { "localmbox",       &localmbox },
      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },
      { "spoollocking",     &spoollocking },
      { "iconv",                   &iconv },
      { "localmbox",       &localmbox },
      { "sbackup",          &sbackup },
      { "datalocking",      &datalocking },
      { "spoollocking",     &spoollocking },
      { "iconv",                   &iconv },

+     { "oauth",                   &oauth },

      { "sasl",             &sasl },
      { "tls",              &tls },
      { NULL,               NULL },
      { "sasl",             &sasl },
      { "tls",              &tls },
      { NULL,               NULL },


@@ -133,7 +145,7 @@ main(int argc, char **argv)
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *comps[MAXARGS];
 
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *comps[MAXARGS];
 

-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -202,7 +214,7 @@ main(int argc, char **argv)
        if ((cp = context_find("datalocking"))) { datalocking = cp; }
 
        /* In case spoollocking was set in mts.conf. */
        if ((cp = context_find("datalocking"))) { datalocking = cp; }
 
        /* In case spoollocking was set in mts.conf. */

-       mts_init(invo_name);
+       mts_init();

 
        /* Also set localmbox here */
        if (! localmbox_primed) {
 
        /* Also set localmbox here */
        if (! localmbox_primed) {


@@ -227,7 +239,7 @@ main(int argc, char **argv)
 
            if (! strcmp ("spoollocking", comps[i])) {
                /* In case spoollocking was set in mts.conf. */
 
            if (! strcmp ("spoollocking", comps[i])) {
                /* In case spoollocking was set in mts.conf. */

-               mts_init(invo_name);
+               mts_init();

             }
 
            value = context_find (comps[i]);
             }
 
            value = context_find (comps[i]);