bug 2216: The Bayes expiry code didn't take into account that expiring at 12 hours could expire too many tokens so none of the time choices would be valid.  This caused the "should I abort?" if() statement to not work correctly.
bug 2216: The Bayes expiry code didn't take into account that expiring
at 12 hours could expire too many tokens so none of the time choices
would be valid.  This caused the "should I abort?" if() statement to
not work correctly.

Also, Bayes expiry is limited to once every 12 hours for normal usage,
but during a mass-check an expiry would occur whenever necessary.
Unfortunately, if an expiry attempt didn't expire enough tokens, the next
message would do another expiry run, and so on until it could finally
remove enough tokens.  Since this is horribly slow and inefficient,
mass-check now has a limit of one expiry every 5 minutes.


git-svn-id: d99324e817494df82bb0080d8e7ab74680731a10@5637 13f79535-47bb-0310-9956-ffa450edef68

apache/spamassassin,apache/spamassassin,apache/spamassassin,apache/spamassassin,apache/spamassassin