X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/ce399941039778944bc5bc8d10c5f3603089af30..db744b85cee9eccd9840823d06fa8ea1ff124993:/sbr/mts.c?ds=sidebyside

diff --git a/sbr/mts.c b/sbr/mts.c
index 4a44c442..285ced5d 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -62,7 +62,7 @@ static char localmbox[BUFSIZ];
  * MTS specific variables
  */
 static char *mts_method = "smtp";
-int  sm_mts    = MTS_SENDMAIL_SMTP;
+int  sm_mts    = MTS_SMTP;
 char *sendmail = SENDMAILPATH;
 
 /*
@@ -78,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.
@@ -113,8 +106,6 @@ static struct bind binds[] = {
     { "pophost", &pophost },
 
     { "maildelivery", &maildelivery },
-    { "everyone", &everyone },
-    { "noshell", &NoShell },
     { NULL, NULL }
 };
 
@@ -144,12 +135,11 @@ save_mts_method (const char *value) {
  */
 
 void
-mts_init (char *name)
+mts_init (void)
 {
     const char *cp;
     FILE *fp;
     static int inited = 0;
-    NMH_UNUSED (name);
 
     if (inited++ || (fp = fopen (get_mtsconf_pathname(), "r")) == NULL)
 	return;
@@ -163,8 +153,6 @@ mts_init (char *name)
         fclose (fp);
     }
 
-    Everyone = atoi (everyone);
-
     save_mts_method (mts_method);
 }
 
@@ -182,7 +170,6 @@ tailor_value (char *s)
     int i, r;
     char *bp;
     char buffer[BUFSIZ];
-    size_t len;
 
     for (bp = buffer; *s; bp++, s++) {
 	if (*s != QUOTE) {
@@ -215,11 +202,7 @@ tailor_value (char *s)
     }
     *bp = 0;
 
-    len = strlen (buffer) + 1;
-    bp = mh_xmalloc (len);
-    memcpy (bp, buffer, len);
-
-    return bp;
+    return mh_xstrdup(buffer);
 }
 
 /*
@@ -247,7 +230,7 @@ LocalName (int flag)
     if (buf[0])
 	return buf;
 
-    mts_init ("mts");
+    mts_init ();
 
     /* check if the mts.conf file specifies a "localname" */
     if (*localname && flag == 0) {
@@ -294,7 +277,7 @@ SystemName (void)
     if (buffer[0])
 	return buffer;
 
-    mts_init ("mts");
+    mts_init ();
 
     /* check if mts.conf file specifies a "systemname" */
     if (*systemname) {