projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Lots of little code cleanups to prevent warnings - mostly making sure
[mmh]
/
mts
/
smtp
/
smtp.c
diff --git
a/mts/smtp/smtp.c
b/mts/smtp/smtp.c
index
e2f6574
..
a0d84d5
100644
(file)
--- 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 "smtp.h"
#include <zotnet/mts/mts.h>
#include <signal.h>
+#include <h/signals.h>
#ifdef MPOP
#include <errno.h>
#endif
#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
/*
* 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
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,
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 (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;
client = clientname;
- else
+ } else {
client = LocalName(); /* no clientname -> LocalName */
client = LocalName(); /* no clientname -> LocalName */
+ }
+ }
#ifdef ZMAILER
if (client == NULL || *client == '\0')
#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);
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;
}
mktemp (sm_tmpfil);
if ((sd = creat (sm_tmpfil, 0600)) != NOTOK) {
sm_ispool = 1;
break;
}
+#endif
}
free (cp);
}
free (cp);