X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsend.c;h=9e804bc4320702418ee8217689f146b3f251a7b0;hb=8a87f7b5fd5622dcde0fc4b48d93157616b496f0;hp=9d634ed1de100d5403e5848815300c8585e3b90f;hpb=edc8d4615f73003ef06c644373763c345f1872c6;p=mmh

diff --git a/uip/send.c b/uip/send.c
index 9d634ed..9e804bc 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -102,17 +102,21 @@ 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) },
     { NULL, 0 }
 };
@@ -153,9 +157,6 @@ main (int argc, char **argv)
     struct stat st;
     char	*attach = (char *)0;	/* header field name for attachments */
     int attachformat = 0; /* mhbuild format specifier for attachments */
-#ifdef UCI
-    FILE *fp;
-#endif /* UCI */
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
@@ -281,6 +282,7 @@ main (int argc, char **argv)
 		case SOMLSW: 
 		case SNOOPSW: 
 		case SASLSW:
+		case NOSASLSW:
 		case TLSSW:
 		    vec[vecp++] = --cp;
 		    continue;
@@ -291,6 +293,7 @@ main (int argc, char **argv)
 		case CLIESW: 
 		case SERVSW: 
 		case SASLMECHSW:
+		case SASLMXSSFSW:
 		case USERSW:
 		case PORTSW:
 		    vec[vecp++] = --cp;
@@ -411,18 +414,6 @@ go_to_it:
     if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0)
 	if ((cp = context_find ("signature")) && *cp)
 	    m_putenv ("SIGNATURE", cp);
-#ifdef UCI
-	else {
-	    snprintf (buf, sizeof(buf), "%s/.signature", mypath);
-	    if ((fp = fopen (buf, "r")) != NULL
-		&& fgets (buf, sizeof buf, fp) != NULL) {
-		    fclose (fp);
-		    if (cp = strchr (buf, '\n'))
-			*cp = 0;
-		    m_putenv ("SIGNATURE", buf);
-	    }
-	}
-#endif /* UCI */
 
     for (msgnum = 0; msgnum < msgp; msgnum++)
 	if (stat (msgs[msgnum], &st) == NOTOK)
@@ -441,6 +432,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