[Spambayes-checkins] spambayes/scripts sb_server.py,1.50,1.51

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28728/scripts

Modified Files:
	sb_server.py 
Log Message:
Fix [ 1383801 ] trustedIPs wildcard to regex broken

Don't unnecessarily reopen messageinfo db.

Index: sb_server.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_server.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** sb_server.py	14 Dec 2005 08:18:00 -0000	1.50
--- sb_server.py	7 Apr 2006 02:35:34 -0000	1.51
***************
*** 290,294 ****
              return True
  
!         trustedIPs = trustedIPs.replace('.', '\.').replace('*', '([01]?\d\d?|2[04]\d|25[0-5])')
          for trusted in trustedIPs.split(','):
              if re.search("^" + trusted + "$", remoteIP):
--- 290,294 ----
              return True
  
!         trustedIPs = trustedIPs.replace('.', '\.').replace('*', '([01]?\d\d?|2[0-4]\d|25[0-5])')
          for trusted in trustedIPs.split(','):
              if re.search("^" + trusted + "$", remoteIP):
***************
*** 884,891 ****
              self.DBName, self.useDB = storage.database_type([])
          self.bayes = storage.open_storage(self.DBName, self.useDB)
!         if not hasattr(self, "MBDName"):
!             self.MDBName, self.useMDB = spambayes.message.database_type()
!         self.mdb = spambayes.message.open_storage(self.MDBName, self.useMDB)
!         spambayes.message.Message.message_info_db = self.mdb
  
          # Load stats manager.
--- 884,888 ----
              self.DBName, self.useDB = storage.database_type([])
          self.bayes = storage.open_storage(self.DBName, self.useDB)
!         self.mdb = spambayes.message.Message().message_info_db
  
          # Load stats manager.