Moved code from zotnet/mts to mts/generic. Also, unified generic

[mmh] / mts / sendmail / sendmail.c

diff --git a/mts/sendmail/sendmail.c b/mts/sendmail/sendmail.c
index 7556503..00fe825 100644 (file)
--- a/mts/sendmail/sendmail.c
+++ b/mts/sendmail/sendmail.c
@@ -7,8 +7,12 @@
 
 #include <h/mh.h>
 #include <mts/smtp/smtp.h>
-#include <zotnet/mts/mts.h>
+#include <mts/generic/mts.h>
 #include <signal.h>
+#include "h/signals.h"  /* for SIGNAL() */
+#ifdef MPOP
+#include <errno.h>
+#endif
 
 /*
  * This module implements an interface to SendMail very similar
@@ -74,10 +78,6 @@ static char *sm_moreply = "; ";
 
 struct smtp sm_reply;          /* global... */
 
-#ifdef MPOP
-extern int errno;
-#endif
-
 static int doingEHLO;
 
 #define        MAXEHLO 20
@@ -99,7 +99,7 @@ static RETSIGTYPE alrmser (int);
 
 int
 sm_init (char *client, char *server, int watch, int verbose,
-         int debug, int onex, int queued)
+         int debug, int onex, int queued, int sasl, char *saslmech, char *user)
 {
     int i, result, vecp;
     int pdi[2], pdo[2];
@@ -113,11 +113,12 @@ sm_init (char *client, char *server, int watch, int verbose,
     if (sm_rfp != NULL && sm_wfp != NULL)
        return RP_OK;
 
-    if (client == NULL || *client == '\0')
+    if (client == NULL || *client == '\0') {
        if (clientname)
            client = clientname;
        else
            client = LocalName();       /* no clientname -> LocalName */
+    }
 
 #ifdef ZMAILER
     if (client == NULL || *client == '\0')