aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/versions.py
diff options
context:
space:
mode:
authorMark Sapiro <msapiro@value.net>2014-04-15 12:59:48 -0700
committerMark Sapiro <msapiro@value.net>2014-04-15 12:59:48 -0700
commit0d9b1cce5e97fe4095fe2cb72465129437d83b5a (patch)
tree91ac47389801b2c5c5bb67bbae8a5f45f4f05b0b /Mailman/versions.py
parent192caa4943eb87e466229736eccefd4381042fd7 (diff)
parentf00ecb3432578156b7f9df2ae33ad5f840e20de6 (diff)
downloadmailman2-0d9b1cce5e97fe4095fe2cb72465129437d83b5a.tar.gz
mailman2-0d9b1cce5e97fe4095fe2cb72465129437d83b5a.tar.xz
mailman2-0d9b1cce5e97fe4095fe2cb72465129437d83b5a.zip
Added and modified various options regarding DMARC. See the NEWS file.
Diffstat (limited to 'Mailman/versions.py')
-rwxr-xr-xMailman/versions.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Mailman/versions.py b/Mailman/versions.py
index 31c4f470..a568e8e6 100755
--- a/Mailman/versions.py
+++ b/Mailman/versions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2013 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -388,6 +388,9 @@ 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',
+ 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)
# Emergency moderation flag