X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/89d69fbd2ae1f9c8c989850ec7057814c655a727..9322ba2854211794c27fae9468768b80b767c211:/uip/mhparam.c

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 22453467..edbefd78 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -77,6 +77,13 @@ static char *iconv =
     "";
 #endif
 
+static char *oauth =
+#ifdef OAUTH_SUPPORT
+    "oauth";
+#else
+    "";
+#endif
+
 struct proc {
     char *p_name;
     char **p_field;
@@ -116,6 +123,7 @@ static struct proc procs [] = {
      { "datalocking",      &datalocking },
      { "spoollocking",     &spoollocking },
      { "iconv",		   &iconv },
+     { "oauth",		   &oauth },
      { "sasl",             &sasl },
      { "tls",              &tls },
      { NULL,               NULL },
@@ -137,7 +145,7 @@ main(int argc, char **argv)
     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;
@@ -199,14 +207,16 @@ main(int argc, char **argv)
 	for (np = m_defs; np; np = np->n_next)
 	    printf("%s: %s\n", np->n_name, np->n_field);
 
-    } else if (debug) {
+    }
+
+    if (debug) {
 	struct proc *ps;
 
 	/* In case datalocking was set in profile. */
 	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) {
@@ -222,16 +232,18 @@ main(int argc, char **argv)
 	for (ps = procs; ps->p_name; ps++)
 	    printf ("%s: %s\n", ps->p_name, *ps->p_field ? *ps->p_field : "");
 
-    } else {
+    }
+
+    if (! all) {
         if (components < 0)
 	    components = compp > 1;
 
 	for (i = 0; i < compp; i++)  {
-	    register char *value;
+	    char *value;
 
 	    if (! strcmp ("spoollocking", comps[i])) {
 		/* In case spoollocking was set in mts.conf. */
-		mts_init(invo_name);
+		mts_init();
             }
 
 	    value = context_find (comps[i]);
@@ -241,8 +253,8 @@ main(int argc, char **argv)
 	        if (components)
 		    printf("%s: ", comps[i]);
 
-		printf("%s\n", value);
-	    } else
+		puts(value);
+	    } else if (missed < 120)
 	        missed++;
 	}
     }
@@ -258,7 +270,7 @@ p_find(char *str)
     struct proc *ps;
 
     for (ps = procs; ps->p_name; ps++)
-	if (!strcasecmp (ps->p_name, str ? str : ""))
+	if (!strcasecmp (ps->p_name, str))
 	    return (*ps->p_field);
 
     return NULL;