aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Mailman/Bouncer.py19
-rw-r--r--Mailman/Defaults.py.in2
2 files changed, 16 insertions, 5 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py
index 9f786eb4..451f11fc 100644
--- a/Mailman/Bouncer.py
+++ b/Mailman/Bouncer.py
@@ -151,11 +151,15 @@ class Bouncer:
# Now that we've adjusted the bounce score for this bounce, let's
# check to see if the disable-by-bounce threshold has been reached.
if info.score >= self.bounce_score_threshold:
- syslog('bounce', 'sending %s list probe to: %s (score %s >= %s)',
+ if mm_cfg.VERP_PROBES:
+ syslog('bounce',
+ 'sending %s list probe to: %s (score %s >= %s)',
self.internal_name(), member, info.score,
self.bounce_score_threshold)
- self.sendProbe(member, msg)
- info.reset(0, info.date, info.noticesleft)
+ self.sendProbe(member, msg)
+ info.reset(0, info.date, info.noticesleft)
+ else:
+ self.disableBouncingMember(member, info, msg)
def disableBouncingMember(self, member, info, msg):
# Initialize their confirmation cookie. If we do it when we get the
@@ -163,8 +167,13 @@ class Bouncer:
cookie = self.pend_new(Pending.RE_ENABLE, self.internal_name(), member)
info.cookie = cookie
# Disable them
- syslog('bounce', '%s: %s disabling due to probe bounce received',
- self.internal_name(), member)
+ if mm_cfg.VERP_PROBES:
+ syslog('bounce', '%s: %s disabling due to probe bounce received',
+ self.internal_name(), member)
+ else:
+ syslog('bounce', '%s: %s disabling due to bounce score %s >= %s',
+ self.internal_name(), member,
+ info.score, self.bounce_score_threshold)
self.setDeliveryStatus(member, MemberAdaptor.BYBOUNCE)
self.sendNextNotification(member)
if self.bounce_notify_owner_on_disable:
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index 03da115b..3c7ecfdb 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -605,6 +605,8 @@ VERP_REGEXP = r'^(?P<bounces>[^+]+?)\+(?P<mailbox>[^=]+)=(?P<host>[^@]+)@.*$'
# VERP format and regexp for probe messages
VERP_PROBE_FORMAT = '%(bounces)s+%(token)s'
VERP_PROBE_REGEXP = r'^(?P<bounces>[^+]+?)\+(?P<token>[^@]+)@.*$'
+# Set this Yes to activate VERP probe for disabling by bounce
+VERP_PROBES = No
# A perfect opportunity for doing VERP is the password reminders, which are
# already addressed individually to each recipient. Set this to Yes to enable