summaryrefslogtreecommitdiffstats
path: root/network/opendmarc/patches/pull172.diff
blob: 1b7cd634fcc0ad425cb921478adbfa0e9274dbc4 (plain)
diff --git a/opendmarc/opendmarc.conf.5.in b/opendmarc/opendmarc.conf.5.in
index f7cea9a..52490cd 100644
--- a/opendmarc/opendmarc.conf.5.in
+++ b/opendmarc/opendmarc.conf.5.in
@@ -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.
diff --git a/opendmarc/opendmarc.conf.sample b/opendmarc/opendmarc.conf.sample
index 69c9afb..0222ecd 100644
--- a/opendmarc/opendmarc.conf.sample
+++ b/opendmarc/opendmarc.conf.sample
@@ -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
@@ -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)
 ##