projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update for git conversions (and cleanup of autogen.sh to use autoreconf)
[mmh]
/
uip
/
send.c
diff --git
a/uip/send.c
b/uip/send.c
index
43f4c02
..
7eb75bd
100644
(file)
--- a/
uip/send.c
+++ b/
uip/send.c
@@
-21,6
+21,12
@@
# define SASLminc(a) 0
#endif /* CYRUS_SASL */
# define SASLminc(a) 0
#endif /* CYRUS_SASL */
+#ifndef TLS_SUPPORT
+# define TLSminc(a) (a)
+#else /* TLS_SUPPORT */
+# define TLSminc(a) 0
+#endif /* TLS_SUPPORT */
+
static struct swit switches[] = {
#define ALIASW 0
{ "alias aliasfile", 0 },
static struct swit switches[] = {
#define ALIASW 0
{ "alias aliasfile", 0 },
@@
-108,6
+114,8
@@
static struct swit switches[] = {
{ "attachformat", 7 },
#define PORTSW 42
{ "port server-port-name/number" , 4 },
{ "attachformat", 7 },
#define PORTSW 42
{ "port server-port-name/number" , 4 },
+#define TLSSW 43
+ { "tls", TLSminc(-3) },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-265,6
+273,7
@@
main (int argc, char **argv)
case SOMLSW:
case SNOOPSW:
case SASLSW:
case SOMLSW:
case SNOOPSW:
case SASLSW:
+ case TLSSW:
vec[vecp++] = --cp;
continue;
vec[vecp++] = --cp;
continue;
@@
-423,7
+432,7
@@
go_to_it:
&& (distsw = atoi (cp))
&& altmsg) {
vec[vecp++] = "-dist";
&& (distsw = atoi (cp))
&& altmsg) {
vec[vecp++] = "-dist";
- distfile = getcpy (m_scratch (altmsg, invo_name));
+ distfile = getcpy (m_mktemp2 (altmsg, invo_name, NULL, NULL));
if (link (altmsg, distfile) == NOTOK) {
if (errno != EXDEV
#ifdef EISREMOTE
if (link (altmsg, distfile) == NOTOK) {
if (errno != EXDEV
#ifdef EISREMOTE
@@
-432,7
+441,7
@@
go_to_it:
)
adios (distfile, "unable to link %s to", altmsg);
free (distfile);
)
adios (distfile, "unable to link %s to", altmsg);
free (distfile);
- distfile = getcpy (m_tmpfil (invo_name));
+ distfile = getcpy (m_mktemp2(NULL, invo_name, NULL, NULL));
{
int in, out;
struct stat st;
{
int in, out;
struct stat st;