Removed export of most of the variables in test/common.sh.in. The

[nmh] / sbr / mts.c

diff --git a/sbr/mts.c b/sbr/mts.c
index 70dae02485e7268c261b91bf9c5e1ac1de10587b..99851d92a71a95c34bdc7020a6785adb25179394 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -8,13 +8,10 @@
  */
 
 #include <h/mh.h>   /* for snprintf() */
-#include <h/nmh.h>
 #include <h/utils.h>
 
 #define nmhetcdir(file) NMHETCDIR#file
 
-#include <ctype.h>
-#include <stdio.h>
 #include <h/mts.h>
 #include <pwd.h>
 #include <sys/socket.h>
@@ -81,13 +78,6 @@ char *pophost    = "";
 char *maildelivery = nmhetcdir(/maildelivery);
 
 
-/*
- * Aliasing Facility (doesn't belong here)
- */
-int Everyone = NOTOK;
-static char *everyone = "-1";
-char *NoShell = "";
-
 /*
  * Customize the MTS settings for nmh by adjusting
  * the file mts.conf in the nmh etc directory.
@@ -116,8 +106,6 @@ static struct bind binds[] = {
     { "pophost", &pophost },
 
     { "maildelivery", &maildelivery },
-    { "everyone", &everyone },
-    { "noshell", &NoShell },
     { NULL, NULL }
 };
 
@@ -125,14 +113,14 @@ static struct bind binds[] = {
 /* Convert name of mts method to integer value and store it. */
 void
 save_mts_method (const char *value) {
-    if (! mh_strcasecmp (value, "smtp")) {
+    if (! strcasecmp (value, "smtp")) {
         mts_method = "smtp";
         sm_mts = MTS_SMTP;
-    } else if (! mh_strcasecmp (value, "sendmail/smtp")  ||
-               ! mh_strcasecmp (value, "sendmail")) {
+    } else if (! strcasecmp (value, "sendmail/smtp")  ||
+               ! strcasecmp (value, "sendmail")) {
         mts_method = "sendmail/smtp";
         sm_mts = MTS_SENDMAIL_SMTP;
-    } else if (! mh_strcasecmp (value, "sendmail/pipe")) {
+    } else if (! strcasecmp (value, "sendmail/pipe")) {
         mts_method = "sendmail/pipe";
         sm_mts = MTS_SENDMAIL_PIPE;
     } else {
@@ -166,8 +154,6 @@ mts_init (char *name)
         fclose (fp);
     }
 
-    Everyone = atoi (everyone);
-
     save_mts_method (mts_method);
 }