Moved the sendmail path config line from mts.conf to the MH profile

[mmh] / sbr / mts.c

diff --git a/sbr/mts.c b/sbr/mts.c
index 7610cda..6418ef5 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -2,8 +2,6 @@
 /*
  * mts.c -- definitions for the mail transport system
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -50,10 +48,6 @@ static void mts_read_conf_file (FILE *fp);
  */
 static char *mtsconf = nmhetcdir(/mts.conf);
 
-static char *localname   = "";
-static char *localdomain = "";
-static char *systemname  = "";
-
 char *mmdfldir = MAILSPOOL;
 char *mmdflfil = "";
 char *uucpldir = "/usr/spool/mail";
@@ -67,44 +61,12 @@ static char username[BUFSIZ];
 static char fullname[BUFSIZ];
 
 /* Variables for username masquerading: */
-       boolean  draft_from_masquerading = FALSE;  /* also used from post.c */
+       boolean  draft_from_masquerading = FALSE;
 static boolean  mmailid_masquerading = FALSE;
        boolean  username_extension_masquerading = FALSE;  /* " from addrsbr.c */
 static char*    masquerade = "";
 
 /*
- * MTS specific variables
- */
-#if defined(SMTPMTS)
-static char *sm_method = "smtp";
-int  sm_mts    = MTS_SMTP;
-char *hostable = nmhetcdir(/hosts);
-char *sendmail = SENDMAILPATH;
-#endif
-
-/*
- * SMTP/POP stuff
- */
-char *clientname = NULL;
-char *servers    = "localhost \01localnet";
-char *pophost    = "";
-
-/*
- * BBoards-specific variables
- */
-char *bb_domain = "";
-
-
-/*
- * POP BBoards-specific variables
- */
-#ifdef BPOP
-char *popbbhost = "";
-char *popbbuser = "";
-char *popbblist = nmhetcdir(/hosts.popbb);
-#endif /* BPOP */
-
-/*
  * Global MailDelivery file
  */
 char *maildelivery = nmhetcdir(/maildelivery);
@@ -128,9 +90,6 @@ struct bind {
 };
 
 static struct bind binds[] = {
-    { "localname", &localname },
-    { "localdomain", &localdomain },
-    { "systemname", &systemname },
     { "mmdfldir", &mmdfldir },
     { "mmdflfil", &mmdflfil },
     { "uucpldir", &uucpldir },
@@ -138,28 +97,6 @@ static struct bind binds[] = {
     { "mmdelim1", &mmdlm1 },
     { "mmdelim2", &mmdlm2 },
     { "masquerade", &masquerade },
-
-#if defined(SMTPMTS)
-    { "mts",      &sm_method },
-    { "hostable", &hostable  },
-    { "sendmail", &sendmail  },
-#endif
-
-    { "clientname",  &clientname },
-    { "servers", &servers },
-    { "pophost", &pophost },
-    { "bbdomain", &bb_domain },
-
-#ifdef BPOP
-    { "popbbhost", &popbbhost },
-    { "popbbuser", &popbbuser },
-    { "popbblist", &popbblist },
-#endif
-
-#ifdef NNTP
-    { "nntphost", &popbbhost },
-#endif
-
     { "maildelivery", &maildelivery },
     { "everyone", &everyone },
     { "noshell", &NoShell },
@@ -201,17 +138,6 @@ mts_init (char *name)
 
     if (strstr(masquerade, "username_extension") != NULL)
        username_extension_masquerading = TRUE;
-
-#ifdef SMTPMTS
-    if (strcmp(sm_method, "smtp") == 0)
-        sm_mts = MTS_SMTP;
-    else if (strcmp(sm_method, "sendmail") == 0)
-        sm_mts = MTS_SENDMAIL;
-    else {
-        advise(NULL, "unsupported \"mts\" value in mts.conf: %s", sm_method);
-        sm_mts = MTS_SMTP;
-    }
-#endif
 }
 
 
@@ -287,37 +213,23 @@ LocalName (void)
 
     mts_init ("mts");
 
-    /* check if the mts.conf file specifies a "localname" */
-    if (*localname) {
-       strncpy (buffer, localname, sizeof(buffer));
-    } else {
-       memset(buffer, 0, sizeof(buffer));
+    memset(buffer, 0, sizeof(buffer));
 #ifdef HAVE_UNAME
-       /* first get our local name */
-       uname (&name);
-       strncpy (buffer, name.nodename, sizeof(buffer) - 1);
+    /* first get our local name */
+    uname (&name);
+    strncpy (buffer, name.nodename, sizeof(buffer) - 1);
 #else
-       /* first get our local name */
-       gethostname (buffer, sizeof(buffer) - 1);
+    /* first get our local name */
+    gethostname (buffer, sizeof(buffer) - 1);
 #endif
-       /* now fully qualify our name */
-
-       memset(&hints, 0, sizeof(hints));
-       hints.ai_flags = AI_CANONNAME;
-       hints.ai_family = PF_UNSPEC;
-       if (getaddrinfo(buffer, NULL, &hints, &res) == 0) {
-           strncpy(buffer, res->ai_canonname, sizeof(buffer) - 1);
-           freeaddrinfo(res);
-       }
-    }
-
-    /*
-     * If the mts.conf file specifies a "localdomain",
-     * we append that now.  This should rarely be needed.
-     */
-    if (*localdomain) {
-       strcat (buffer, ".");
-       strcat (buffer, localdomain);
+    /* now fully qualify our name */
+
+    memset(&hints, 0, sizeof(hints));
+    hints.ai_flags = AI_CANONNAME;
+    hints.ai_family = PF_UNSPEC;
+    if (getaddrinfo(buffer, NULL, &hints, &res) == 0) {
+       strncpy(buffer, res->ai_canonname, sizeof(buffer) - 1);
+       freeaddrinfo(res);
     }
 
     return buffer;
@@ -344,12 +256,6 @@ SystemName (void)
 
     mts_init ("mts");
 
-    /* check if mts.conf file specifies a "systemname" */
-    if (*systemname) {
-       strncpy (buffer, systemname, sizeof(buffer));
-       return buffer;
-    }
-
 #ifdef HAVE_UNAME
     uname (&name);
     strncpy (buffer, name.nodename, sizeof(buffer));
@@ -403,21 +309,9 @@ getuserinfo (void)
     register char *np;
     register struct passwd *pw;
 
-#ifdef KPOP
-    uid_t uid;
-
-    uid = getuid ();
-    if (uid == geteuid () && (cp = getenv ("USER")) != NULL
-       && (pw = getpwnam (cp)) != NULL)
-      strncpy (username, cp, sizeof(username));
-    else if ((pw = getpwuid (uid)) == NULL
-            || pw->pw_name == NULL
-            || *pw->pw_name == '\0') {
-#else /* KPOP */
     if ((pw = getpwuid (getuid ())) == NULL
            || pw->pw_name == NULL
            || *pw->pw_name == '\0') {
-#endif /* KPOP */
        strncpy (username, "unknown", sizeof(username));
        snprintf (fullname, sizeof(fullname), "The Unknown User-ID (%d)",
                (int) getuid ());