--- Mailman-2.1.6/Mailman/Commands/cmd_unsubscribe.py 2002-11-20 21:37:50 +++ mailman-mas/Mailman/Commands/cmd_unsubscribe.py 2005-07-27 13:36:35 @@ -69,19 +69,8 @@ res.results.append(_("""\ Your unsubscription request has been forwarded to the list administrator for approval.""")) - elif password is None: - # No password was given, so we need to do a mailback confirmation - # instead of unsubscribing them here. - cpaddr = mlist.getMemberCPAddress(address) - mlist.ConfirmUnsubscription(cpaddr) - # We don't also need to send a confirmation to this command - res.respond = 0 else: - # No admin approval is necessary, so we can just delete them if the - # passwords match. - oldpw = mlist.getMemberPassword(address) - if oldpw <> password: - res.results.append(_('You gave the wrong password')) - return STOP + # No admin approval is necessary, so we can just delete them + # Don't worry about the password mlist.ApprovedDeleteMember(address, 'mailcmd') res.results.append(_('Unsubscription request succeeded.'))