couple of bugfixes

Author: Richard Jones

CHANGES.txt

@@ -1,6 +1,12 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
+2004-??-?? 0.7.4
+Fixed:
+- re-acquire the OTK manager when we re-open the database
+- mailgw handler can close the database on us
+
+
 2004-05-28 0.7.3
 Fixed:
 - add "checked" to truth values for Boolean input

doc/index.txt

@@ -123,6 +123,7 @@ Joel Shprentz,
 Terrel Shumway,
 Emil Sit,
 Nathaniel Smith,
+Mitchell Surface,
 Mike Thompson,
 Darryl VanDorp,
 J Vickroy.

roundup/cgi/actions.py

@@ -1,4 +1,4 @@
-#$Id: actions.py,v 1.27.2.2 2004-05-23 23:26:30 richard Exp $
+#$Id: actions.py,v 1.27.2.3 2004-05-28 01:03:53 richard Exp $
 
 import re, cgi, StringIO, urllib, Cookie, time, random
 
@@ -575,6 +575,7 @@ def handle(self):
             if self.user != 'admin':
                 self.client.opendb('admin')
                 self.db = self.client.db
+                otks = self.db.getOTKManager()
 
             # change the password
             newpw = password.generatePassword()

roundup/scripts/roundup_mailgw.py

@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup_mailgw.py,v 1.15 2004-05-06 01:12:24 richard Exp $
+# $Id: roundup_mailgw.py,v 1.15.2.1 2004-05-28 01:03:53 richard Exp $
 
 """Command-line script stub that calls the roundup.mailgw.
 """
@@ -174,7 +174,7 @@ def main(argv):
         return usage(argv, _('Error: The source must be either "mailbox",'
             ' "pop", "apop", "imap" or "imaps"'))
     finally:
-        db.close()
+        handler.db.close()
 
 def run():
     # time out after a minute if we can