Updated #include's to point to new location of mts.h on mts/generic

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index a1cdf8c37b49b1f5396937993583f53eef080ffb..545d39727ef14b5fe632c023e721e53587b77071 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -11,7 +11,7 @@
 
 /* High level parsing of addresses:
 
-   The routines in zotnet/mf/mf.c parse the syntactic representations of
+   The routines in sbr/mf.c parse the syntactic representations of
    addresses.  The routines in sbr/addrsbr.c associate semantics with those
    addresses.  
 

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index a667be82367f5ab7e27344efb4c7e5978da3346b..f62d0e80f5909280be7a12d6ae1fe8da5af941a6 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -6,7 +6,7 @@
  */
 
 #include <h/mh.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 /* This module has a long and checkered history.  First, it didn't burst
    maildrops correctly because it considered two CTRL-A:s in a row to be

diff --git a/uip/Makefile.in b/uip/Makefile.in
index ff9fa563ab3c511a7c2d1ed06c92f2b42c7dd40a..972caf94080455a70bcbe34e339c18c34406b4ca 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -25,11 +25,11 @@ INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir) $(HESIOD_INCLUDES) $(SASL_INCLUDES)
 LDFLAGS  = @LDFLAGS@
 
 LIBS     = @LIBS@
-MTSLIB   = ../mts/smtp/libsmtp.a
+MTSLIB   = ../mts/libmts.a
 KRB4_LIBS = @KRB4_LIBS@
 SASL_LIBS = @SASL_LIBS@
 HESIOD_LIBS = @HESIOD_LIBS@
-LOCALLIBS = ../config/version.o ../config/config.o $(MTSLIB) ../sbr/libmh.a ../zotnet/libzot.a
+LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a $(MTSLIB) 
 LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(SASL_LIBS) $(HESIOD_LIBS) $(LIBS)
 
 LINT   = @LINT@

diff --git a/uip/ali.c b/uip/ali.c
index 5b38b831669c4b7f43874e142f07f81bfbebf1d2..67e7aee56eab63903861f9df635ef91284fb5525 100644 (file)
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/aliasbr.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 /*
  * maximum number of names

diff --git a/uip/ap.c b/uip/ap.c
index dde1175986f2ae18170b1352489f5a701d901224..5184bafc96a906fb24f40d27845e39fb0ddff64b 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 #define        NADDRS  100
 

diff --git a/uip/conflict.c b/uip/conflict.c
index cac0ea85a17a494604f2d9f32d2ff31e16ecc316..c0ba63ba984af3a8281b34d774611945794eb2fd 100644 (file)
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/aliasbr.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <grp.h>
 #include <pwd.h>
 

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 5cf4ee32c46c089976438a8610fe193bc284b225..3c5fdd5bfaffdf1c7d342dc420014ecc2dc89bbb 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -10,7 +10,7 @@
 #ifndef        MMDFONLY
 # include <h/mh.h>
 # include <h/dropsbr.h>
-# include <zotnet/mts/mts.h>
+# include <mts/generic/mts.h>
 # include <h/tws.h>
 #else
 # include "dropsbr.h"

diff --git a/uip/inc.c b/uip/inc.c
index e6adb32f73b4d920dad68dd3dfa1f32e46aee545..3ea3b9ef51f687f2d5b3e407c91ed58e05a37c84 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -40,7 +40,7 @@
 #include <h/scansbr.h>
 #include <h/signals.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <errno.h>
 #include <signal.h>
 

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 045146b04c2256b88ca96c95c1bae5761b077987..63204a50ceb5323ba6d9131069dc7d09cfa178d6 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 227f111f525c99d8053597e7ae03ce0fbf507e09..4a6a9869d34541113bf47b50045fce2fed14ec88 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -19,7 +19,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 4f1f9d7a9c7f13db69f2dbf8e800aedf20abe9e6..0be30c05bb3d1aa3fdc38ed8de0dd9e695f9dc1d 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhlist.c b/uip/mhlist.c
index 3960b1cb49d8203fdd5fe01b2f71247eb747e60a..57b18b2513bf991746fdc6b49a8c7a1ffecdd9d1 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index ae5463c86ece51cbf12c815640d8db618f7d1f8b..42e0b05ad9b8fd7f8cca5f83775c98380f3711b8 100644 (file)
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -11,7 +11,7 @@
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhn.c b/uip/mhn.c
index adb06dae67290bc5e9cfaa7867eba53f95a93ca0..11c0276753d71f55840c5ca166c0bf73ffec3791 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index c2e080566b57c9357b8adfca3bc68ed06f40a23f..f292ddc80c5ca81c5f65e80afb51df1090a86c42 100644 (file)
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -12,7 +12,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 0813aa75c6ebff464ce58327cac59b7496020534..8f4d574e031a5d172c8c3374ad1971a646bb1acd 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhshow.c b/uip/mhshow.c
index a50292e9b2cc4dd585e9b1f7a37922da3c63089c..74a8f54beca6e2e4e641743580e88bedf49385ba 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index eb6910019736efdc70a6b227eb810ace0da9b03c..83616a263fae3f5cdfa91052495edb7243c7ee9d 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 14d7cde938c387e43202f88e99d8bf7c4a3007fb..b56a505219c76b58ac9dca7defc78b1dc21b1df6 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index b2a3e31b2fcf59a8ca4283e2709aa3b6ea919b72..f1b0162719eb4653b79369e40f777b166edd0d54 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/mhtest.c b/uip/mhtest.c
index 9a73bbfa336bb276b3d5bcd5691791ed822a5c79..90f733739983995d20a886e2fb96dd0e3ce43414 100644 (file)
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>

diff --git a/uip/msgchk.c b/uip/msgchk.c
index 52aedc86ba5b41f0a7ebdcb8ecdd8154577384c5..9489ef0d716ccbc86dba511dcb6c8451f0d3bd05 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -6,7 +6,7 @@
  */
 
 #include <h/mh.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <pwd.h>
 

diff --git a/uip/msh.c b/uip/msh.c
index 6bb6f06d262fa99053c68a214cf586d64f04fa1b..0db7905c46b14c4c745f9f46f9be2f7c2e610837 100644 (file)
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -17,7 +17,7 @@
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 #ifdef HAVE_TERMIOS_H
 # include <termios.h>

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index c199502d7acbc87c36d8e780d9ea0cd4dd8fe773..b8c7d9253dce5daa57ad38008e4ab62216b24828 100644 (file)
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -11,7 +11,7 @@
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <errno.h>
 #include <setjmp.h>
 #include <signal.h>

diff --git a/uip/popi.c b/uip/popi.c
index cb249302750df18db7787eb700c093711a9daf4f..2fae38164b4f6b8eca626d840bff9fa3490a587a 100644 (file)
--- a/uip/popi.c
+++ b/uip/popi.c
@@ -8,7 +8,7 @@
 #include <h/mh.h>
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <errno.h>
 
 #ifndef        RPOP
@@ -515,7 +515,7 @@ msh (void)
 
 
 #ifdef SMTPMTS
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <mts/smtp/smtp.h>
 
 static int

diff --git a/uip/post.c b/uip/post.c
index ef13279baa8ebe65ed3c53b9cc408dd2a709362e..d91e003817c17b5cc46e915dd6b861a6ee137a55 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -14,7 +14,7 @@
 #include <h/mime.h>
 
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 #include <errno.h>
 #include <setjmp.h>

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 1c70d740e28f61d22913a4da2d847cbab6eecb24..9eb9916e766adb954fa7bedb71e6c20629456bf3 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -9,7 +9,7 @@
 #include <h/fmt_scan.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 static struct swit switches[] = {
 #define        FORMSW       0

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index f120afda20bc7e2e36ed6b62f1d7a5611cfed537..a7601776371891770e172e2d5fd6e4035fe16e3f 100644 (file)
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -9,7 +9,7 @@
 #include <h/dropsbr.h>
 #include <h/rcvmail.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 static struct swit switches[] = {
 #define MBOXSW       0

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index bef959ca413542f2c2b4f7a6f52c5fe118cf0b1e..8734ebc2d81fea93c05b64e59334931d63988cfe 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -10,7 +10,7 @@
 #include <h/signals.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 static struct swit switches[] = {
 #define CRETSW         0

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index d769b40a6e3e8a095bdbea74510e9d7a24915457..32d78d2f732988a26db60d3166a28efb99935963 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -15,7 +15,7 @@
 #include <h/rcvmail.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <signal.h>
 #include <fcntl.h>
 

diff --git a/uip/scan.c b/uip/scan.c
index 77bc999cd2c414b36968488219c8bf4d9ac23680..d85d80e0c63708a77e37d81bfb198006bde0040e 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -9,7 +9,7 @@
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <errno.h>
 
 /*

diff --git a/uip/slocal.c b/uip/slocal.c
index d50330d53fe3c754e3206150b13f5d679de70d49..8a3f5f7c5f58fc8811b94f689ebf576b836a634f 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -27,7 +27,7 @@
 #include <h/rcvmail.h>
 #include <h/signals.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 #include <pwd.h>
 #include <signal.h>

diff --git a/uip/spost.c b/uip/spost.c
index 555bb68dceee6ca4cf30403e786eaf1bcdb1d3f9..18d1152e640f26cf9e1bbc6cbf27384e09008bc6 100644 (file)
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -14,7 +14,7 @@
 #include <h/aliasbr.h>
 #include <h/dropsbr.h>
 #include <h/tws.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 
 #define        uptolow(c)      ((isalpha(c) && isupper (c)) ? tolower (c) : c)
 

diff --git a/uip/viamail.c b/uip/viamail.c
index 8e3332d0597fd29778f7efef1a911bf507e05b5f..2168f717b70f0f38e873bdf9aacfc2bc825ea5cb 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -11,7 +11,7 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>