X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6b4bc4a25eaac2eddd1bef51e3f00c21f98ed32d..da401a155138ef0affde38d3a040b68d078d1dad:/uip/send.c

diff --git a/uip/send.c b/uip/send.c
index 8a659222..be5dc793 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -9,8 +9,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <errno.h>
-#include <signal.h>
 
 
 #ifndef CYRUS_SASL
@@ -69,6 +67,7 @@
     X("attachformat", 7, ATTACHFORMATSW) \
     X("port server-port-name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
+    X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \
@@ -121,9 +120,7 @@ main (int argc, char **argv)
     char *attach = NMH_ATTACH_HEADER;	/* header field name for attachments */
     int attachformat = 1; /* mhbuild format specifier for attachments */
 
-#ifdef LOCALE
     setlocale(LC_ALL, "");
-#endif
     invo_name = r1bindex (argv[0], '/');
 
     /* read user profile/context */
@@ -138,13 +135,19 @@ main (int argc, char **argv)
     vec[vecp++] = getcpy (m_maildir (""));
 
     if ((cp = context_find ("fileproc"))) {
-      vec[vecp++] = "-fileproc";
-      vec[vecp++] = cp;
+	vec[vecp++] = "-fileproc";
+	vec[vecp++] = cp;
     }
 
     if ((cp = context_find ("mhlproc"))) {
-      vec[vecp++] = "-mhlproc";
-      vec[vecp++] = cp;
+	vec[vecp++] = "-mhlproc";
+	vec[vecp++] = cp;
+    }
+
+    if ((cp = context_find ("credentials"))) {
+	/* post doesn't read context so need to pass credentials. */
+	vec[vecp++] = "-credentials";
+	vec[vecp++] = cp;
     }
 
     while ((cp = *argp++)) {
@@ -245,6 +248,7 @@ main (int argc, char **argv)
 		case SASLSW:
 		case NOSASLSW:
 		case TLSSW:
+		case INITTLSSW:
 		case NTLSSW:
 		    vec[vecp++] = --cp;
 		    continue;
@@ -308,12 +312,6 @@ main (int argc, char **argv)
 
     if (dfolder == NULL) {
 	if (msgp == 0) {
-#ifdef WHATNOW
-	    if ((cp = getenv ("mhdraft")) && *cp) {
-		msgs[msgp++] = cp;
-		goto go_to_it;
-	    }
-#endif /* WHATNOW */
 	    msgs[msgp++] = getcpy (m_draft (NULL, NULL, 1, &isdf));
 	    if (stat (msgs[0], &st) == NOTOK)
 		adios (msgs[0], "unable to stat draft file");