git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix dnssec indication variable when used from smtp:commect event
[exim.git]
/
src
/
src
/
receive.c
diff --git
a/src/src/receive.c
b/src/src/receive.c
index af8e6de4c6487077886e9e445fc9dec32fb428a3..f27dc425ebb9fc64f13970537c2c8070c3898101 100644
(file)
--- a/
src/src/receive.c
+++ b/
src/src/receive.c
@@
-14,7
+14,7
@@
extern int dcc_ok;
#endif
#ifdef EXPERIMENTAL_DMARC
#endif
#ifdef EXPERIMENTAL_DMARC
-#include "dmarc.h"
+#
include "dmarc.h"
#endif /* EXPERIMENTAL_DMARC */
/*************************************************
#endif /* EXPERIMENTAL_DMARC */
/*************************************************
@@
-497,6
+497,10
@@
recipients_list[recipients_count].bmi_optin = bmi_current_optin;
/* reset optin string pointer for next recipient */
bmi_current_optin = NULL;
#endif
/* 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;
}
recipients_list[recipients_count++].errors_to = NULL;
}
@@
-680,6
+684,7
@@
while ((ch = (receive_getc)()) != EOF)
case 1: /* After written "\n" */
if (ch == '.') { ch_state = 3; continue; }
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;
if (ch != '\n') ch_state = 0; else linelength = -1;
break;
@@
-993,10
+998,11
@@
switch(where)
{
case ACL_WHERE_DKIM:
case ACL_WHERE_MIME:
{
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"
{
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;
}
}
return;
}
}