From: markus schnalke <meillo@marmaro.de>
Date: Wed, 28 Sep 2011 14:17:08 +0000 (+0200)
Subject: We'll always use sendmail (spost) now
X-Git-Tag: mmh-thesis-end~514
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=05b7f957ba42e79f49b3a62aea2502168c9abf7a;p=mmh

We'll always use sendmail (spost) now
---

diff --git a/config/config.c b/config/config.c
index c2d307e..de9e343 100644
--- a/config/config.c
+++ b/config/config.c
@@ -267,7 +267,7 @@ char *packproc = nmhbindir (/packf);
  * deliver mail to users.  This is the interface to the MTS.
  */
 
-char *postproc = nmhlibdir (/post);
+char *postproc = nmhlibdir (/spost);
 
 /*
  * This is program is called by slocal to handle
diff --git a/configure.in b/configure.in
index 354aa61..44f07b3 100644
--- a/configure.in
+++ b/configure.in
@@ -165,18 +165,9 @@ else
 fi
 
 dnl What method of posting should post use?
-AC_ARG_WITH(mts,
-  AS_HELP_STRING([--with-mts=@<:@smtp|sendmail@:>@],
-  [specify the default mail transport agent/service]))
-
-if test x"$with_mts" = x"smtp"; then
-  MTS="smtp"
-elif test x"$with_mts" = x"sendmail"; then
-  MTS="sendmail"
-else
-  MTS="smtp"
-fi
-AC_SUBST(MTS)dnl
+dnl We'll always use sendmail now. (mmh)
+MTS="sendmail"
+dnl #AC_SUBST(MTS)dnl
 
 dnl Both the smtp and sendmail mail transport services use the smtp code
 AC_DEFINE(SMTPMTS, 1,
diff --git a/mts/Makefile.in b/mts/Makefile.in
index dd2a18f..eeafd3a 100644
--- a/mts/Makefile.in
+++ b/mts/Makefile.in
@@ -33,10 +33,6 @@ DIST = $(AUX)
 # subdirectories
 SUBDIRS = smtp
 
-# mail transport agent we are using (currently always smtp)
-# MTS = smtp
-# DEPRECATED: smtp/sendmail functionality handled by mts.conf
-
 # ========= DEPENDENCIES FOR BUILDING AND INSTALLING ==========
 
 all: all-recursive libmts.a
diff --git a/sbr/mts.c b/sbr/mts.c
index cd2a3d8..0e01318 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -74,8 +74,8 @@ static char*    masquerade = "";
  * MTS specific variables
  */
 #if defined(SMTPMTS)
-static char *sm_method = "smtp";
-int  sm_mts    = MTS_SMTP;
+static char *sm_method = "sendmail";
+int  sm_mts    = MTS_SENDMAIL;
 char *hostable = nmhetcdir(/hosts);
 char *sendmail = SENDMAILPATH;
 #endif
@@ -173,17 +173,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
 }
 
 
diff --git a/uip/Makefile.in b/uip/Makefile.in
index 370fc15..ba22ac9 100644
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -62,7 +62,7 @@ CMDS = ali anno burst comp dist flist folder forw install-mh mark mhbuild \
 LCMDS = flists folders next prev
 
 # misc support binaries
-MISC = ap conflict dp fmtdump mhl post rcvdist rcvpack \
+MISC = ap conflict dp fmtdump mhl rcvdist rcvpack \
        rcvstore rcvtty slocal spost viamail mhtest
 
 # commands with 'S'pecial installation needs
@@ -76,7 +76,7 @@ SRCS = ali.c aliasbr.c anno.c annosbr.c ap.c burst.c comp.c		  \
 	mhlsbr.c mhmail.c mhmisc.c mhn.c mhoutsbr.c mhparam.c mhparse.c	  \
 	mhpath.c mhshow.c mhshowsbr.c mhstore.c mhstoresbr.c mhtest.c	  \
 	msgchk.c msh.c mshcmds.c new.c packf.c pick.c picksbr.c popsbr.c \
-	post.c prompter.c rcvdist.c rcvpack.c rcvstore.c rcvtty.c	  \
+	prompter.c rcvdist.c rcvpack.c rcvstore.c rcvtty.c	  \
 	refile.c repl.c replsbr.c rmf.c rmm.c scan.c scansbr.c send.c	  \
 	sendsbr.c show.c slocal.c sortm.c spost.c termsbr.c viamail.c	  \
 	vmh.c vmhsbr.c vmhtest.c whatnow.c whatnowproc.c whatnowsbr.c	  \
@@ -184,9 +184,6 @@ packf: packf.o dropsbr.o $(LOCALLIBS)
 pick: pick.o picksbr.o $(LOCALLIBS)
 	$(LINK) pick.o picksbr.o $(LINKLIBS)
 
-post: post.o aliasbr.o $(LOCALLIBS)
-	$(LINK) post.o aliasbr.o $(LINKLIBS)
-
 prompter: prompter.o $(LOCALLIBS)
 	$(LINK) prompter.o $(LINKLIBS)