#endif
#ifdef EXPERIMENTAL_DMARC
-#include "dmarc.h"
+# include "dmarc.h"
#endif /* EXPERIMENTAL_DMARC */
/*************************************************
/* reset optin string pointer for next recipient */
bmi_current_optin = NULL;
#endif
+#ifdef EXPERIMENTAL_DSN
+recipients_list[recipients_count].orcpt = NULL;
+recipients_list[recipients_count].dsn_flags = 0;
+#endif
recipients_list[recipients_count++].errors_to = NULL;
}
case 1: /* After written "\n" */
if (ch == '.') { ch_state = 3; continue; }
+ if (ch == '\r') { ch_state = 2; continue; }
if (ch != '\n') ch_state = 0; else linelength = -1;
break;
{
case ACL_WHERE_DKIM:
case ACL_WHERE_MIME:
- case ACL_WHERE_DATA: if (cutthrough_fd >= 0 && (acl_removed_headers || acl_added_headers))
+ case ACL_WHERE_DATA:
+ if (cutthrough_fd >= 0 && (acl_removed_headers || acl_added_headers))
{
log_write(0, LOG_MAIN|LOG_PANIC, "Header modification in data ACLs"
- "will not take effect on cutthrough deliveries");
+ " will not take effect on cutthrough deliveries");
return;
}
}