Ken Hornstein's SASL patch was not integrated properly with Ruud's new merged

mts/sendmail code.  Kimmo has since fixed nmh so it compiles, but according to
Ken, the SASL stuff still does not work.  Integrating a patch from him for this.

diff --git a/ChangeLog b/ChangeLog
index d0485a6..ead1a4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,11 @@ Mon Jul 17 13:11:52 2000 Dan Harkless <dan-nmh@dilvish.speed.net>
        unnecessary local makes and an out-of-sync stamp-h.in file, but
        would not cause problems for other people using the CVS files.
 
        unnecessary local makes and an out-of-sync stamp-h.in file, but
        would not cause problems for other people using the CVS files.
 

+       * Ken Hornstein's SASL patch was not integrated properly with
+       Ruud's new merged mts/sendmail code.  Kimmo has since fixed nmh so
+       it compiles, but according to Ken, the SASL stuff still does not
+       work.  Integrating a patch from him for this.
+

 Tue Jul 18 19:36:59 EDT 2000 Kimmo Suominen <kim@tac.nyc.ny.us>
 
        * Added the answer to Dan's question in README.developers.
 Tue Jul 18 19:36:59 EDT 2000 Kimmo Suominen <kim@tac.nyc.ny.us>
 
        * Added the answer to Dan's question in README.developers.

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index a37ebea..f2390b8 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -13,6 +13,15 @@
 #include <errno.h>
 #endif
 
 #include <errno.h>
 #endif
 

+#ifdef CYRUS_SASL
+#include <sasl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <errno.h>
+#endif /* CYRUS_SASL */
+

 /*
  * This module implements an interface to SendMail very similar
  * to the MMDF mm_(3) routines.  The sm_() routines herein talk
 /*
  * This module implements an interface to SendMail very similar
  * to the MMDF mm_(3) routines.  The sm_() routines herein talk

diff --git a/uip/Makefile.in b/uip/Makefile.in
index ca6b5bc..ff9fa56 100644 (file)
--- a/uip/Makefile.in
+++ b/uip/Makefile.in
@@ -29,7 +29,7 @@ MTSLIB   = ../mts/smtp/libsmtp.a
 KRB4_LIBS = @KRB4_LIBS@
 SASL_LIBS = @SASL_LIBS@
 HESIOD_LIBS = @HESIOD_LIBS@
 KRB4_LIBS = @KRB4_LIBS@
 SASL_LIBS = @SASL_LIBS@
 HESIOD_LIBS = @HESIOD_LIBS@

-LOCALLIBS = ../config/version.o ../config/config.o ../sbr/libmh.a $(MTSLIB) ../zotnet/libzot.a
+LOCALLIBS = ../config/version.o ../config/config.o $(MTSLIB) ../sbr/libmh.a ../zotnet/libzot.a

 LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(SASL_LIBS) $(HESIOD_LIBS) $(LIBS)
 
 LINT   = @LINT@
 LINKLIBS = $(LOCALLIBS) $(KRB4_LIBS) $(SASL_LIBS) $(HESIOD_LIBS) $(LIBS)
 
 LINT   = @LINT@