Update of /cvsroot/mailman/mailman/Mailman
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25414/Mailman
Modified Files:
Tag: Release_2_1-maint
Bouncer.py Defaults.py.in
Log Message:
Now default is NOT to VERP_PROBES for backward compatibility.
Index: Bouncer.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Bouncer.py,v
retrieving revision 2.37.2.4
retrieving revision 2.37.2.5
diff -u -d -r2.37.2.4 -r2.37.2.5
--- Bouncer.py 20 Sep 2004 12:20:43 -0000 2.37.2.4
+++ Bouncer.py 22 Oct 2004 07:01:30 -0000 2.37.2.5
@@ -151,11 +151,15 @@
# 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 @@
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:
Index: Defaults.py.in
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Defaults.py.in,v
retrieving revision 2.112.2.20
retrieving revision 2.112.2.21
diff -u -d -r2.112.2.20 -r2.112.2.21
--- Defaults.py.in 12 Oct 2004 02:44:10 -0000 2.112.2.20
+++ Defaults.py.in 22 Oct 2004 07:01:30 -0000 2.112.2.21
@@ -605,6 +605,8 @@
# VERP format and regexp for probe messages
VERP_PROBE_FORMAT = '%(bounces)s+%(token)s'
VERP_PROBE_REGEXP = r'^(?P<bounces>[^+]+?)\+(?P<token>[EMAIL PROTECTED])@.*$'
+# 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
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
