X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/55f65ae2d3baf60396d3359db952460939de03ca..034abb1cc56e6b4d15282635ea46f276b97680d8:/uip/post.c?ds=sidebyside

diff --git a/uip/post.c b/uip/post.c
index 84bc1418..9b358521 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -89,6 +89,7 @@
     X("fileproc", -4, FILEPROCSW) \
     X("mhlproc", -3, MHLPROCSW) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
+    X("credentials legacy|file:filename", 0, CREDENTIALSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \
 
 #define X(sw, minchars, id) id,
@@ -222,7 +223,6 @@ static char from[BUFSIZ];	/* my network address            */
 static char sender[BUFSIZ];	/* my Sender: header		 */
 static char efrom[BUFSIZ];	/* my Envelope-From: header	 */
 static char fullfrom[BUFSIZ];	/* full contents of From header  */
-static char signature[BUFSIZ];	/* my signature                  */
 static char *filter = NULL;	/* the filter for BCC'ing        */
 static char *subject = NULL;	/* the subject field for BCC'ing */
 static char *fccfold[FCCS];	/* foldernames for FCC'ing       */
@@ -283,14 +283,7 @@ main (int argc, char **argv)
     FILE *in, *out;
     m_getfld_state_t gstate = 0;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* foil search of user profile/context */
-    if (context_foil (NULL) == -1)
-	done (1);
+    if (nmh_init(argv[0], 0 /* use context_foil() */)) { return 1; }
 
     mts_init (invo_name);
     arguments = getarguments (invo_name, argc, argv, 0);
@@ -494,6 +487,13 @@ main (int argc, char **argv)
                     save_mts_method (cp);
 		    continue;
 
+		case CREDENTIALSSW: {
+		    if (!(cp = *argp++) || *cp == '-')
+			adios (NULL, "missing argument to %s", argp[-2]);
+		    add_profile_entry ("credentials", cp);
+		    continue;
+		}
+
 		case MESSAGEIDSW:
 		    if (!(cp = *argp++) || *cp == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
@@ -528,15 +528,12 @@ main (int argc, char **argv)
 	    if ((out = fopen ("/dev/null", "w")) == NULL)
 		adios ("/dev/null", "unable to open");
 	} else {
-            char *cp = m_mktemp(m_maildir(invo_name), NULL, &out);
-            if (cp == NULL) {
-                cp = m_mktemp2(NULL, invo_name, NULL, &out);
-                if (cp == NULL) {
-		    adios ("post", "unable to create temporary file");
-                }
-            }
+	    char *cp = m_mktemp2(NULL, invo_name, NULL, &out);
+	    if (cp == NULL) {
+		adios(NULL, "unable to create temporary file in %s",
+		      get_temp_dir());
+	    }
             strncpy(tmpfil, cp, sizeof(tmpfil));
-	    chmod (tmpfil, 0600);
 	}
     }
 
@@ -633,17 +630,21 @@ main (int argc, char **argv)
 	    post (tmpfil, 0, verbose, envelope);
 	}
 	post (bccfil, 1, verbose, envelope);
-	unlink (bccfil);
+	(void) m_unlink (bccfil);
     } else {
 	post (tmpfil, 0, isatty (1), envelope);
     }
 
     p_refile (tmpfil);
-    unlink (tmpfil);
+    (void) m_unlink (tmpfil);
+
+    if (verbose) {
+    	if (partno)
+	    printf ("Partial Message #%s Processed\n", partno);
+	else
+	    printf ("Message Processed\n");
+    }
 
-    if (verbose)
-	printf (partno ? "Partial Message #%s Processed\n" : "Message Processed\n",
-		partno);
     done (0);
     return 1;
 }
@@ -658,7 +659,7 @@ putfmt (char *name, char *str, FILE *out)
 {
     int count, grp, i, keep;
     char *cp, *pp, *qp;
-    char namep[BUFSIZ];
+    char namep[BUFSIZ], error[BUFSIZ];
     struct mailname *mp = NULL, *np = NULL;
     struct headers *hdr;
 
@@ -721,18 +722,20 @@ putfmt (char *name, char *str, FILE *out)
 
     tmpaddrs.m_next = NULL;
     for (count = 0; (cp = getname (str)); count++)
-	if ((mp = getm (cp, NULL, 0, AD_HOST, NULL))) {
+	if ((mp = getm (cp, NULL, 0, error, sizeof(error)))) {
 	    if (tmpaddrs.m_next)
 		np->m_next = mp;
 	    else
 		tmpaddrs.m_next = mp;
 	    np = mp;
 	}
-	else
+	else {
+	    admonish(cp, "%s", error);
 	    if (hdr->flags & HTRY)
 		badadr++;
 	    else
 		badmsg++;
+	}
 
     if (count < 1) {
 	if (hdr->flags & HNIL)
@@ -773,7 +776,8 @@ putfmt (char *name, char *str, FILE *out)
 	    if (np->m_gname)
 		putgrp (namep, np->m_gname, out, hdr->flags);
 	    while ((cp = getname (pp))) {
-		if (!(mp = getm (cp, NULL, 0, AD_HOST, NULL))) {
+		if (!(mp = getm (cp, NULL, 0, error, sizeof(error)))) {
+		    admonish(cp, "%s", error);
 		    badadr++;
 		    continue;
 		}
@@ -922,9 +926,6 @@ putfmt (char *name, char *str, FILE *out)
 static void
 start_headers (void)
 {
-    char  *cp, sigbuf[BUFSIZ];
-    struct mailname *mp;
-
     time (&tclock);
 
     /*
@@ -935,21 +936,6 @@ start_headers (void)
     efrom[0] = '\0';
     sender[0] = '\0';
     fullfrom[0] = '\0';
-
-    if ((cp = getfullname ()) && *cp) {
-	strncpy (sigbuf, cp, sizeof(sigbuf));
-	snprintf (signature, sizeof(signature), "%s <%s>",
-		sigbuf, getlocaladdr());
-	if ((cp = getname (signature)) == NULL)
-	    adios (NULL, "getname () failed -- you lose extraordinarily big");
-	if ((mp = getm (cp, NULL, 0, AD_HOST, NULL)) == NULL)
-	    adios (NULL, "bad signature '%s'", sigbuf);
-	mnfree (mp);
-	while (getname (""))
-	    continue;
-    } else {
-	strncpy (signature, getlocaladdr(), sizeof(signature));
-    }
 }
 
 
@@ -1286,8 +1272,9 @@ make_bcc_file (int dashstuff)
     FILE *out;
     char *tfile = NULL, *program;
 
-    tfile = m_mktemp2(NULL, "bccs", NULL, &out);
-    if (tfile == NULL) adios("bcc", "unable to create temporary file");
+    if ((tfile = m_mktemp2(NULL, "bccs", NULL, &out)) == NULL) {
+	adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+    }
     strncpy (bccfil, tfile, sizeof(bccfil));
 
     fprintf (out, "From: %s\n", fullfrom);
@@ -1718,9 +1705,9 @@ sigser (int i)
 {
     NMH_UNUSED (i);
 
-    unlink (tmpfil);
+    (void) m_unlink (tmpfil);
     if (msgflags & MINV)
-	unlink (bccfil);
+	(void) m_unlink (bccfil);
 
     if (!whomsw || checksw)
 	sm_end (NOTOK);
@@ -1842,9 +1829,9 @@ die (char *what, char *fmt, ...)
 {
     va_list ap;
 
-    unlink (tmpfil);
+    (void) m_unlink (tmpfil);
     if (msgflags & MINV)
-	unlink (bccfil);
+	(void) m_unlink (bccfil);
 
     if (!whomsw || checksw)
 	sm_end (NOTOK);