X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=mts%2Fsendmail%2Fsendmail.c;h=9a9c725fc35651097ed5032eb0e8ec674e2d7c2b;hb=ca7903e5fcabe1d7dc9f51d08dfdb82d61b3d5bf;hp=75565036f2b4ded0f13d6bc38a51fa05ba2cb061;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b;p=mmh diff --git a/mts/sendmail/sendmail.c b/mts/sendmail/sendmail.c index 7556503..9a9c725 100644 --- a/mts/sendmail/sendmail.c +++ b/mts/sendmail/sendmail.c @@ -9,6 +9,10 @@ #include #include #include +#include "h/signals.h" /* for SIGNAL() */ +#ifdef MPOP +#include +#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')