Mark Sapiro pushed to branch master at GNU Mailman / Mailman Core
Commits:
c496352b by Mark Sapiro at 2021-07-11T08:11:40-07:00
Don't del/add existing cc or reply-to when munging the from.
- - - - -
04b86690 by Mark Sapiro at 2021-07-11T15:40:53+00:00
Merge branch 'wrap' into 'master'
Don't del/add existing cc or reply-to when munging the from.
See merge request mailman/mailman!892
- - - - -
1 changed file:
- src/mailman/handlers/dmarc.py
Changes:
=====================================
src/mailman/handlers/dmarc.py
=====================================
@@ -141,8 +141,9 @@ def munged_headers(mlist, msg, msgdata):
if original_from[1] not in [x[1] for x in original]:
original.append(original_from)
value.append((add_to, COMMASPACE.join(formataddr(x) for x in original)))
- # Also, add the other if any.
- if other[1] is not None:
+ # If wrapping, add the other if any.
+ if (mlist.dmarc_mitigate_action is DMARCMitigateAction.wrap_message and
+ other[1] is not None):
value.append((other[0], other[1]))
return value
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/1d4a685cf6446d13f2fefd08760d5b26e8f8edbf...04b86690814588fc6f9f7b410dfef492604ce545
--
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/1d4a685cf6446d13f2fefd08760d5b26e8f8edbf...04b86690814588fc6f9f7b410dfef492604ce545
You're receiving this email because of your account on gitlab.com.
_______________________________________________
Mailman-checkins mailing list -- mailman-checkins@python.org
To unsubscribe send an email to mailman-checkins-le...@python.org
https://mail.python.org/mailman3/lists/mailman-checkins.python.org/
Member address: arch...@jab.org
