← Back to branch summary

~phil.pennock/mailman/dmarc-reject

« back to all changes in this revision

Viewing changes to Mailman/versions.py

  • Committer: Jim Popovitch
  • Date: 2013-03-03 08:04:37 UTC
  • Revision ID: jimpop@gmail.com-20130303080437-rjqvq4cas36ieqv5
Hold/Reject/Discard moderation support for Senders with a DMARC p=reject policy

Show diffs side-by-side

added added

removed removed

Lines of Context:
Mailman/versions.py
385
385
    # the current GUI description model.  So, 0==Hold, 1==Reject, 2==Discard
386
386
    add_only_if_missing('member_moderation_action', 0)
387
387
    add_only_if_missing('member_moderation_notice', '')
 
388
    add_only_if_missing('dmarc_moderation_action', 0)
 
389
    add_only_if_missing('dmarc_moderation_notice', '')
388
390
    add_only_if_missing('new_member_options',
389
391
                        mm_cfg.DEFAULT_NEW_MEMBER_OPTIONS)
390
392
    # Emergency moderation flag