X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=d06b6c4ae40c3e8407df5483dedf57f7ab18eee7;hb=a01a41d031c796b526329a4170eb23f0ac93b949;hp=43f4c0223de8178415429889a6eb0627dc408f67;hpb=7b98850d3b8b2453b473fdfb6db52f4aa3fe39b6;p=mmh

diff --git a/uip/send.c b/uip/send.c
index 43f4c02..d06b6c4 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -2,8 +2,6 @@
 /*
  * send.c -- send a composed message
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -21,6 +19,12 @@
 # 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 },
@@ -108,6 +112,8 @@ static struct swit switches[] = {
     { "attachformat", 7 },
 #define PORTSW		      42
     { "port server-port-name/number" , 4 },
+#define TLSSW		      43
+    { "tls", TLSminc(-3) },
     { NULL, 0 }
 };
 
@@ -265,6 +271,7 @@ main (int argc, char **argv)
 		case SOMLSW: 
 		case SNOOPSW: 
 		case SASLSW:
+		case TLSSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -423,7 +430,7 @@ go_to_it:
 	    && (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
@@ -432,7 +439,7 @@ go_to_it:
 		)
 		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;