X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fmts.c;h=46f5990e655cc5ebcc387cde72c78b6480139838;hp=6a9d84f48f13fe36a45686a220202ad71a149fb5;hb=128545e06224233b7e91fc4c83f8830252fe16c9;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b

diff --git a/sbr/mts.c b/sbr/mts.c
index 6a9d84f..46f5990 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -74,33 +74,15 @@ static char*    masquerade = "";
  * MTS specific variables
  */
 #if defined(SMTPMTS)
-static char *sm_method = "smtp";
-int  sm_mts    = MTS_SMTP;
-char *hostable = nmhetcdir(/hosts);
+static char *sm_method = "sendmail";
+int  sm_mts    = MTS_SENDMAIL;
 char *sendmail = SENDMAILPATH;
 #endif
 
 /*
- * SMTP/POP stuff
+ * SMTP 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
@@ -139,24 +121,10 @@ static struct bind binds[] = {
 
 #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 },
@@ -199,17 +167,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
 }
 
 
@@ -401,21 +358,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 ());