AddMember(): ApprovedAddMember doesn't take a fullname argument, don't try

to send it. Thanks to the beauty of optional arguments, this changed the
fullname into the password, and used the password as the 'digest' flag,
causing all new members to be considered digest members ;P

ProcessConfirmation(): Adjust to the fact that the subscription info now
carries the fullname too. Also change the error message so the printf
operator doesn't complain about 'not all arguments converted' when 'data' is
a sequence (which it is guaranteed to be.)

1 files changed, 5 insertions, 5 deletions

diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index 965f99b77..53e88fb07 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -570,7 +570,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
 
         if self.subscribe_policy == 0:
             # No confirmation or approval is necessary
-            self.ApprovedAddMember(emailaddr, fullname, password, digest, lang)
+            self.ApprovedAddMember(emailaddr, password, digest, lang)
         elif self.subscribe_policy == 1 or self.subscribe_policy == 3:
             # User confirmation required
             cookie = Pending.new(Pending.SUBSCRIPTION,
@@ -851,14 +851,14 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
             op = data[0]
             data = data[1:]
         except ValueError:
-            raise Errors.MMBadConfirmation, 'op-less data %s' % data
+            raise Errors.MMBadConfirmation, 'op-less data %s' % (data,)
         if op == Pending.SUBSCRIPTION:
             try:
-                addr, password, digest, lang = data
+                addr, fullname, password, digest, lang = data
             except ValueError:
-                raise Errors.MMBadConfirmation, 'bad subscr data %s' % data
+                raise Errors.MMBadConfirmation, 'bad subscr data %s' % (data,)
             if self.subscribe_policy == 3: # confirm + approve
-                self.HoldSubscription(addr, password, digest, lang)
+                self.HoldSubscription(addr, fullname, password, digest, lang)
                 name = self.real_name
                 raise Errors.MMNeedApproval, _(
                     'subscriptions to %(name)s require administrator approval')