Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct HoldQuarantinedMessages doc #172

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Correct HoldQuarantinedMessages doc #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions opendmarc/opendmarc.conf.5.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,18 +196,7 @@ aggregate reports can be extracted using
If set, the milter will signal to the mta that messages with
p=quarantine, which fail dmarc authentication, should be held in
the MTA's "Hold" or "Quarantine" queue. The name varies by MTA.
If false, messsages will be accepted and passed along with the
regular mail flow, and the quarantine will be left up to downstream
MTA/MDA/MUA filters, if any, to handle by re-evaluating the headers,
including the Authentication-Results header added by this filter.
The default is "false".

.TP
.I HoldQuarantinedMessages (Boolean)
If set, the milter will signal to the mta that messages with
p=quarantine, which fail dmarc authentication, should be held in
the MTA's "Hold" or "Quarantine" queue. The name varies by MTA.
If false, messsages will be accepted and passed along with the
If false, messages will be accepted and passed along with the
regular mail flow, and the quarantine will be left up to downstream
MTA/MDA/MUA filters, if any, to handle by re-evaluating the headers,
including the Authentication-Results header added by this filter.
Expand Down
16 changes: 1 addition & 15 deletions opendmarc/opendmarc.conf.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
## If set, the milter will signal to the mta that messages with
## p=quarantine, which fail dmarc authentication, should be held in
## the MTA's "Hold" or "Quarantine" queue. The name varies by MTA.
## If false, messsages will be accepted and passed along with the
## If false, messages will be accepted and passed along with the
## regular mail flow, and the quarantine will be left up to downstream
## MTA/MDA/MUA filters, if any, to handle by re-evaluating the headers,
## including the Authentication-Results header added by OpenDMARC
Expand All @@ -234,20 +234,6 @@
#
# IgnoreAuthenticatedClients false

## HoldQuarantinedMessages { true | false }
## default "false"
##
## If set, the milter will signal to the mta that messages with
## p=quarantine, which fail dmarc authentication, should be held in
## the MTA's "Hold" or "Quarantine" queue. The name varies by MTA.
## If false, messsages will be accepted and passed along with the
## regular mail flow, and the quarantine will be left up to downstream
## MTA/MDA/MUA filters, if any, to handle by re-evaluating the headers,
## including the Authentication-Results header added by OpenDMARC
#
# HoldQuarantinedMessages false


## IgnoreHosts path
## default (internal)
##
Expand Down