1 files changed, 4 insertions, 1 deletions

diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index 70c4aba8e..3924a511b 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -1033,7 +1033,10 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
                 lang = userdesc.language
             except ValueError:
                 raise Errors.MMBadConfirmation, 'bad subscr data %s' % (data,)
-            if self.subscribe_policy == 3: # confirm + approve
+            # We check for both 2 (approval required) and 3 (confirm +
+            # approval) because the policy could have been changed in the
+            # middle of the confirmation dance.
+            if self.subscribe_policy in (2, 3):
                 self.HoldSubscription(addr, fullname, password, digest, lang)
                 name = self.real_name
                 raise Errors.MMNeedApproval, _(