X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=mts%2Fsmtp%2Fsmtp.c;h=a0d84d5fbe8a8f2c69e5eb36442521c58c27d24b;hp=90b37a82572eacde30dee6fef39c3eb6e62a442a;hb=8563731b02ce9d750806f6b1769af8b399d964e8;hpb=3da6cc979e0e8e466f760acc113314c57176fea9 diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c index 90b37a8..a0d84d5 100644 --- a/mts/smtp/smtp.c +++ b/mts/smtp/smtp.c @@ -9,10 +9,13 @@ #include "smtp.h" #include #include +#include #ifdef MPOP #include #endif + + /* * This module implements an interface to SendMail very similar * to the MMDF mm_(3) routines. The sm_() routines herein talk @@ -104,6 +107,8 @@ static int smail_brkany (char, char *); char **smail_copyip (char **, char **, int); #endif +/* from zotnet/mts/client.c */ +int client (char *, char *, char *, int, char *, int); int sm_init (char *client, char *server, int watch, int verbose, @@ -125,11 +130,13 @@ sm_init (char *client, char *server, int watch, int verbose, if (sm_rfp != NULL && sm_wfp != NULL) goto send_options; - if (client == NULL || *client == '\0') - if (clientname) + if (client == NULL || *client == '\0') { + if (clientname) { client = clientname; - else + } else { client = LocalName(); /* no clientname -> LocalName */ + } + } #ifdef ZMAILER if (client == NULL || *client == '\0')