I had forgotten that nesec_set_tls() has to be called AFTER the

[nmh] / uip / mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 4fe8c8d3e4b285395f9e98b1a32511cf9b082cf2..9b5fa069634f873b28614f6dd71ec1e2a9c9a9ad 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -30,8 +30,9 @@ DEFINE_SWITCH_ARRAY(MHPARAM, switches);
 #undef X
 
 extern char *mhbindir;
 #undef X
 
 extern char *mhbindir;

-extern char *mhetcdir;

 extern char *mhlibexecdir;
 extern char *mhlibexecdir;

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

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


@@ -76,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;


@@ -106,14 +114,16 @@ static struct proc procs [] = {
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },
      { "bindir",           &mhbindir },
      { "whatnowproc",      &whatnowproc },
      { "whomproc",         &whomproc },
      { "bindir",           &mhbindir },

-     { "etcdir",           &mhetcdir },
-     { "libdir",           &mhlibexecdir },

      { "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 },