X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=9df71d7be9e7f0239be35768f65fc3a455d46fbf;hb=4ad9321b5799aae68df21f77e7e788d897c3f015;hp=39d425f57ba9c91f3c030978fd055fec4f2c6340;hpb=03fe41ba1d68108808c966c6d7ff74bd8c1d648c;p=mmh

diff --git a/uip/send.c b/uip/send.c
index 39d425f..9df71d7 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -102,18 +102,24 @@ static struct swit switches[] = {
     { "snoop", 5 },
 #define SASLSW                37
     { "sasl", SASLminc(4) },
-#define SASLMECHSW            38
+#define NOSASLSW              38
+    { "nosasl", SASLminc(-6) },
+#define SASLMXSSFSW           39
+    { "saslmaxssf", SASLminc(-10) },
+#define SASLMECHSW            40
     { "saslmech mechanism", SASLminc(-5) },
-#define USERSW                39
+#define USERSW                41
     { "user username", SASLminc(-4) },
-#define ATTACHSW              40
+#define ATTACHSW              42
     { "attach", 6 },
-#define ATTACHFORMATSW        41
+#define ATTACHFORMATSW        43
     { "attachformat", 7 },
-#define PORTSW		      42
+#define PORTSW		      44
     { "port server-port-name/number" , 4 },
-#define TLSSW		      43
+#define TLSSW		      45
     { "tls", TLSminc(-3) },
+#define NTLSSW                46
+    { "notls", TLSminc(-5) },
     { NULL, 0 }
 };
 
@@ -278,7 +284,9 @@ main (int argc, char **argv)
 		case SOMLSW: 
 		case SNOOPSW: 
 		case SASLSW:
+		case NOSASLSW:
 		case TLSSW:
+		case NTLSSW:
 		    vec[vecp++] = --cp;
 		    continue;
 
@@ -288,6 +296,7 @@ main (int argc, char **argv)
 		case CLIESW: 
 		case SERVSW: 
 		case SASLMECHSW:
+		case SASLMXSSFSW:
 		case USERSW:
 		case PORTSW:
 		    vec[vecp++] = --cp;
@@ -426,6 +435,7 @@ go_to_it:
 	    && altmsg) {
 	vec[vecp++] = "-dist";
 	distfile = getcpy (m_mktemp2 (altmsg, invo_name, NULL, NULL));
+	unlink(distfile);
 	if (link (altmsg, distfile) == NOTOK) {
 	    if (errno != EXDEV
 #ifdef EISREMOTE