From 6f1a8c3b8d6f19bbe33e7d3fa746ae1d2e9ac455 Mon Sep 17 00:00:00 2001
From: markus schnalke <meillo@marmaro.de>
Date: Tue, 4 Oct 2011 21:05:33 +0200
Subject: [PATCH] Moved the sendmail path config line from mts.conf to the MH
 profile This another step in getting rid of the mts stuff.

---
 config/Makefile.in |    4 +++-
 config/config.c    |    6 ++++++
 h/mh.h             |    1 +
 h/mts.h            |    5 -----
 man/mh-profile.man |    8 ++++++++
 man/mh-tailor.man  |    7 -------
 sbr/mts.c          |    6 ------
 sbr/readconfig.c   |    1 +
 uip/mhparam.c      |    1 +
 9 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/config/Makefile.in b/config/Makefile.in
index 23ded2a..79d54d5 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -19,13 +19,15 @@ etcdir      = @sysconfdir@
 
 default_editor = @editorpath@
 default_pager  = @pagerpath@
+sendmailpath   = @sendmailpath@
 
 CC         = @CC@
 CFLAGS     = @CFLAGS@
 DEFS       = @DEFS@
 INCLUDES   = -I.. -I$(top_srcdir) @CPPFLAGS@
 CONFIGDEFS = -DNMHBINDIR='"$(bindir)"' -DNMHETCDIR='"$(etcdir)"' -DNMHLIBDIR='"$(libdir)"' \
-             -DDEFAULT_EDITOR='"$(default_editor)"' -DDEFAULT_PAGER='"$(default_pager)"'
+             -DDEFAULT_EDITOR='"$(default_editor)"' -DDEFAULT_PAGER='"$(default_pager)"' \
+             -DSENDMAILPATH='"$(sendmailpath)"'
 
 COMPILE  = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
 COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
diff --git a/config/config.c b/config/config.c
index 0603340..9d961bd 100644
--- a/config/config.c
+++ b/config/config.c
@@ -331,6 +331,12 @@ char *whatnowproc = nmhbindir (/whatnow);
 
 char *whomproc = nmhbindir (/whom);
 
+/* 
+ * This is the sendmail interface to use for sending mail.
+ */
+
+char *sendmail = SENDMAILPATH;
+
 /*
  * This is the editor invoked by the various message
  * composition programs.  It SHOULD be a full screen
diff --git a/h/mh.h b/h/mh.h
index abcf445..7442071 100644
--- a/h/mh.h
+++ b/h/mh.h
@@ -341,6 +341,7 @@ extern char *replcomps;
 extern char *replgroupcomps;
 extern char *rmfproc;
 extern char *rmmproc;
+extern char *sendmail;
 extern char *sendproc;
 extern char *showmimeproc;
 extern char *showproc;
diff --git a/h/mts.h b/h/mts.h
index c760618..07fa8a2 100644
--- a/h/mts.h
+++ b/h/mts.h
@@ -40,11 +40,6 @@ extern char *mmdlm2;
 void mts_init (char *);
 
 /*
- * MTS specific variables
- */
-extern char *sendmail;
-
-/*
  * Global MailDelivery File
  */
 extern char *maildelivery;
diff --git a/man/mh-profile.man b/man/mh-profile.man
index cd47524..46c8424 100644
--- a/man/mh-profile.man
+++ b/man/mh-profile.man
@@ -526,6 +526,14 @@ to delete a message from a folder.
 Currently not used.
 .RE
 .PP
+.BR sendmail :
+%sendmailpath%
+.RS 5
+The path name to the
+.B sendmail
+program.
+.RE
+.PP
 .BR sendproc :
 %bindir%/send
 .RS 5
diff --git a/man/mh-tailor.man b/man/mh-tailor.man
index 7623a7e..4f2d755 100644
--- a/man/mh-tailor.man
+++ b/man/mh-tailor.man
@@ -168,13 +168,6 @@ If set, then each user-id greater than \*(lqeveryone\*(rq that has a
 login shell equivalent to the given value (e.g., \*(lq/bin/csh\*(rq)
 indicates that mail for \*(lqeveryone\*(rq should not be sent to them.
 This is useful for handling admin, dummy, and guest logins.
-.SS "SendMail"
-.BR sendmail :
-%sendmailpath%
-.RS 5
-The pathname to the
-.B sendmail
-program.
 .SS "File Locking"
 A few words on locking:
 .B nmh
diff --git a/sbr/mts.c b/sbr/mts.c
index 3588fec..6418ef5 100644
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -67,11 +67,6 @@ static boolean  mmailid_masquerading = FALSE;
 static char*    masquerade = "";
 
 /*
- * MTS specific variables
- */
-char *sendmail = SENDMAILPATH;
-
-/*
  * Global MailDelivery file
  */
 char *maildelivery = nmhetcdir(/maildelivery);
@@ -102,7 +97,6 @@ static struct bind binds[] = {
     { "mmdelim1", &mmdlm1 },
     { "mmdelim2", &mmdlm2 },
     { "masquerade", &masquerade },
-    { "sendmail", &sendmail },
     { "maildelivery", &maildelivery },
     { "everyone", &everyone },
     { "noshell", &NoShell },
diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 2a68019..09cb44d 100644
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -33,6 +33,7 @@ static struct procstr procs[] = {
     { "postproc",      &postproc },
     { "rmfproc",       &rmfproc },
     { "rmmproc",       &rmmproc },
+    { "sendmail",      &sendmail },
     { "sendproc",      &sendproc },
     { "showmimeproc",  &showmimeproc },
     { "showproc",      &showproc },
diff --git a/uip/mhparam.c b/uip/mhparam.c
index 8384544..0d5b32c 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -58,6 +58,7 @@ static struct proc procs [] = {
      { "postproc",      &postproc },
      { "rmfproc",       &rmfproc },
      { "rmmproc",       &rmmproc },
+     { "sendmail",      &sendmail },
      { "sendproc",      &sendproc },
      { "showmimeproc",  &showmimeproc },
      { "showproc",      &showproc },
-- 
1.7.10.4