Fix HoldQuarantinedMessages being silently dependent on RejectFailures (issue #237)#302
Open
thegushi wants to merge 2 commits into
Open
Fix HoldQuarantinedMessages being silently dependent on RejectFailures (issue #237)#302thegushi wants to merge 2 commits into
thegushi wants to merge 2 commits into
Conversation
added 2 commits
May 11, 2026 21:03
…(issue trusteddomainproject#235) OPENDMARC_LIB_VERSION was hardcoded as 0x00000000 in libopendmarc/dmarc.h. The intended fix was a dist-hook in Makefile.am that used sed to substitute the computed HEX_VERSION at 'make dist' time. GitHub releases pull a raw git tarball directly, bypassing 'make dist' entirely, so the substitution never happened and every released package shipped with the zeroed version. Fix: convert libopendmarc/dmarc.h to a proper autoconf template (libopendmarc/dmarc.h.in) with 0x@HEX_VERSION@ as the placeholder. Add libopendmarc/dmarc.h to AC_CONFIG_FILES so ./configure generates the correctly-stamped header at build time regardless of how the source was obtained. For version 1.4.2 this produces 0x01040200. Also: remove the now-redundant dmarc.h sed substitution from the dist-hook, and add the generated libopendmarc/dmarc.h to .gitignore. Note: distributors and packagers should use 'make dist' to produce release tarballs and upload them as GitHub release assets, rather than relying on GitHub's auto-generated source archives.
…s (issue trusteddomainproject#237) HoldQuarantinedMessages is documented as a standalone option but was AND'd with RejectFailures in the quarantine policy branch, so it had no effect unless both were enabled.
thegushi
added
the
needs-testing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
HoldQuarantinedMessageswas AND'd withRejectFailuresin thep=quarantinepolicy branch, so it silently had no effect unless both options were enabled simultaneouslyHoldQuarantinedMessagesas a completely standalone option with no such requirementconf_rejectfailconditionTest plan
HoldQuarantinedMessages truewithoutRejectFailuresand confirm messages failing DMARC withp=quarantineare heldHoldQuarantinedMessagesandRejectFailuresare enabledp=rejectbehavior is unaffectedFixes #237