Added remedy for compile warnings when built with --with-tls on

[nmh] / uip / mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index b0c119cfa4365a676536d62e9ffc93fbe32c8672..325a1a34fdd7782ce5a37e39bfc83f8b26334c79 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -33,19 +33,9 @@ extern char *mhetcdir;
 
 char *sbackup = BACKUP_PREFIX;
 
-char *lockmethod =
-#if defined FCNTL_LOCKING
-    "fcntl"
-#elif defined FLOCK_LOCKING
-    "flock"
-#elif defined LOCKF_LOCKING
-    "lockf"
-#elif defined DOT_LOCKING
-    "dot"
-#else
-    "none"
-#endif
-    ;
+char *datalocking = "fcntl";
+
+extern char *spoollocking;
 
 char *sasl =
 #ifdef CYRUS_SASL
@@ -109,7 +99,8 @@ static struct proc procs [] = {
      { "etcdir",           &mhetcdir },
      { "libdir",           &mhlibdir },
      { "sbackup",          &sbackup },
-     { "lockmethod",       &lockmethod },
+     { "datalocking",      &datalocking },
+     { "spoollocking",     &spoollocking },
      { "sasl",             &sasl },
      { "tls",              &tls },
      { NULL,               NULL },
@@ -131,10 +122,7 @@ main(int argc, char **argv)
     char *cp, buf[BUFSIZ], **argp;
     char **arguments, *comps[MAXARGS];
 
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -194,6 +182,9 @@ main(int argc, char **argv)
     } else if (debug) {
        struct proc *ps;
 
+       /* Need to see if datalocking was set in profile. */
+       if ((cp = context_find("datalocking"))) { datalocking = cp; }
+
        /*
         * Print the current value of everything in
         * procs array.  This will show their current
@@ -221,7 +212,7 @@ main(int argc, char **argv)
                missed++;
        }
     }
-    
+
     done (missed);
     return 1;
 }