X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sink.c;h=5e9bef9864eb80f6ae3bac880a33b582be8a1e55;hb=ad7f24b60fa4ecfc037c0b9a970b99624c6e65fe;hp=a72c94884bb98e9665a62cfbb058ab276f22c2e1;hpb=a86b31feb8dc61c13de5ef7ddf4cf816841e79c7;p=~andy%2Ffetchmail

diff --git a/sink.c b/sink.c
index a72c9488..5e9bef98 100644
--- a/sink.c
+++ b/sink.c
@@ -1089,9 +1089,9 @@ static int open_mda_sink(struct query *ctl, struct msgblk *msg,
 	 */
 	nameslen = 0;
 	for (idp = msg->recipients; idp; idp = idp->next)
-	    if ((idp->val.status.mark == XMIT_ACCEPT))
+	    if (idp->val.status.mark == XMIT_ACCEPT)
 		nameslen += (strlen(idp->id) + 1);	/* string + ' ' */
-	if ((*good_addresses == 0))
+	if (*good_addresses == 0)
 	    nameslen = strlen(run.postmaster);
 
 	names = (char *)xmalloc(nameslen + 1);	/* account for '\0' */
@@ -1150,6 +1150,16 @@ static int open_mda_sink(struct query *ctl, struct msgblk *msg,
 	for (dp = after, sp = before; (*dp = *sp); dp++, sp++) {
 	    if (sp[0] != '%')	continue;
 
+	    if (sp > before && sp[-1] == '\'') {
+		report(stderr, GT_("MDA option contains single-quoted %%%c expansion.\n"), sp[1]);
+		report(stderr, GT_("Refusing to deliver. Check the manual and fix your mda option.\n"));
+		free(before);
+		free(after);
+		if (from) free(from);
+		if (names) free(names);
+		return PS_SYNTAX;
+	    }
+
 	    /* need to expand? BTW, no here overflow, because in
 	    ** the worst case (end of string) sp[1] == '\0' */
 	    if (sp[1] == 's' || sp[1] == 'T') {
@@ -1571,4 +1581,18 @@ void close_warning_by_mail(struct query *ctl, struct msgblk *msg)
     close_sink(ctl, msg, TRUE);
 }
 
+void abort_message_sink(struct query *ctl)
+/*
+ * Forcibly close the SMTP connection and re-open.
+ *
+ * Used to abort message delivery once the DATA command has been issued.
+ * Required because all text after the DATA command is considered to be
+ * part of the message body (it is impossible to issue an SMTP command
+ * to abort message delivery once the DATA command has been issued).
+ */
+{
+  smtp_close(ctl, 0);
+  smtp_setup(ctl);
+}
+
 /* sink.c ends here */