X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=mts%2Fsmtp%2Fsmtp.c;h=a0d84d5fbe8a8f2c69e5eb36442521c58c27d24b;hb=8563731b02ce9d750806f6b1769af8b399d964e8;hp=e2f65744f25564034a45e306a0b595f30b5c7ecf;hpb=910f3846bb30636fe25bdc6e06e72d50c6779bd9;p=mmh

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index e2f6574..a0d84d5 100644
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -9,10 +9,13 @@
 #include "smtp.h"
 #include <zotnet/mts/mts.h>
 #include <signal.h>
+#include <h/signals.h>
 #ifdef MPOP
 #include <errno.h>
 #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')
@@ -247,12 +254,16 @@ rclient (char *server, char *protocol, char *service)
 		if ((dp = strrchr(*ap, '/')) && *++dp == NULL)
 		    *--dp = NULL;
 		snprintf (sm_tmpfil, sizeof(sm_tmpfil), "%s/smtpXXXXXX", *ap);
+#ifdef HAVE_MKSTEMP
+		sd = mkstemp (sm_tmpfil);
+#else
 		mktemp (sm_tmpfil);
 
 		if ((sd = creat (sm_tmpfil, 0600)) != NOTOK) {
 		    sm_ispool = 1;
 		    break;
 		}
+#endif
 	    }
 
 	free (cp);