aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman
diff options
context:
space:
mode:
authorJim Popovitch <jimpop@gmail.com>2013-10-20 21:50:21 +0000
committerJim Popovitch <jimpop@gmail.com>2013-10-20 21:50:21 +0000
commit715eeb4227e48eba5c1aff1a0be219dda4faa5db (patch)
tree254c047be36c22e35448525b7f54fd59662e7dda /Mailman
parenta1bf240906a8774ae63f1c3299ebd1079c217cce (diff)
downloadmailman2-715eeb4227e48eba5c1aff1a0be219dda4faa5db.tar.gz
mailman2-715eeb4227e48eba5c1aff1a0be219dda4faa5db.tar.xz
mailman2-715eeb4227e48eba5c1aff1a0be219dda4faa5db.zip
Incorporated some feedback from Mark S.
Diffstat (limited to 'Mailman')
-rwxr-xr-xMailman/versions.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Mailman/versions.py b/Mailman/versions.py
index 02d266da..7973e427 100755
--- a/Mailman/versions.py
+++ b/Mailman/versions.py
@@ -385,7 +385,8 @@ def NewVars(l):
# the current GUI description model. So, 0==Hold, 1==Reject, 2==Discard
add_only_if_missing('member_moderation_action', 0)
add_only_if_missing('member_moderation_notice', '')
- add_only_if_missing('dmarc_moderation_action', 0)
+ add_only_if_missing('dmarc_moderation_action',
+ mm_cfg.DEFAULT_DMARC_MODERATION_ACTION)
add_only_if_missing('dmarc_moderation_notice', '')
add_only_if_missing('new_member_options',
mm_cfg.DEFAULT_NEW_MEMBER_OPTIONS)