X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Fsend.c;h=a97bab824eccbb48b9a22b8294de287ce73044da;hb=156d35f6425bea4c1ed3c4c79783dc613379c65b;hp=196af625a9aaf0a7b587fa15a38ff41038776f31;hpb=38615191e71744b066425e0c44412b62dbe49cc2;p=mmh

diff --git a/uip/send.c b/uip/send.c
index 196af62..a97bab8 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.
@@ -15,11 +13,11 @@
 #include <signal.h>
 
 
-#ifndef CYRUS_SASL
-# define SASLminc(a) (a)
-#else /* 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
@@ -93,19 +91,17 @@ static struct swit switches[] = {
 #define	CLIESW                34
     { "client host", -6 },
 #define	SERVSW                35
-    { "server host", -6 },
+    { "server host", 6 },
 #define	SNOOPSW               36
-    { "snoop", -5 },
-#define SASLSW                37
-    { "sasl", SASLminc(-4) },
-#define SASLMECHSW            38
-    { "saslmech", SASLminc(-5) },
-#define USERSW                39
-    { "user", SASLminc(-4) },
+    { "snoop", 5 },
 #define ATTACHSW              40
     { "attach", 6 },
 #define ATTACHFORMATSW        41
     { "attachformat", 7 },
+#define PORTSW		      42
+    { "port server-port-name/number" , 4 },
+#define TLSSW		      43
+    { "tls", TLSminc(-3) },
     { NULL, 0 }
 };
 
@@ -262,7 +258,7 @@ main (int argc, char **argv)
 		case SENDSW: 
 		case SOMLSW: 
 		case SNOOPSW: 
-		case SASLSW:
+		case TLSSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -271,8 +267,7 @@ main (int argc, char **argv)
 		case WIDTHSW: 
 		case CLIESW: 
 		case SERVSW: 
-		case SASLMECHSW:
-		case USERSW:
+		case PORTSW:
 		    vec[vecp++] = --cp;
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
@@ -420,7 +415,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
@@ -429,7 +424,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;