Update of /cvsroot/mahogany/M/src/modules/spam
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30820/src/modules/spam
Modified Files:
HeadersFilter.cpp
Log Message:
fixed bug in one of the recent changes which resulted in all tests being skipped
Index: HeadersFilter.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/spam/HeadersFilter.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -u -2 -r1.14 -r1.15
--- HeadersFilter.cpp 25 Jun 2006 14:25:40 -0000 1.14
+++ HeadersFilter.cpp 25 Jun 2006 14:36:07 -0000 1.15
@@ -924,4 +924,9 @@
static bool CheckWhiteList(const Message& msg, String *match)
{
+ const wxArrayString
+ whitelist(strutil_restore_array(READ_APPCONFIG_TEXT(MP_WHITE_LIST)));
+ if ( whitelist.empty() )
+ return false;
+
// examine all addresses in the message header for match in the whitelist
wxArrayString addresses;
@@ -930,7 +935,4 @@
return false;
- const wxArrayString
- whitelist(strutil_restore_array(READ_APPCONFIG_TEXT(MP_WHITE_LIST)));
-
for ( size_t n = 0; n < count; n++ )
{
@@ -1062,7 +1064,6 @@
{
wxArrayString tests = strutil_restore_array(param);
- const size_t count = tests.GetCount();
size_t n;
- if ( !count )
+ if ( tests.empty() )
{
// use defaults
@@ -1077,4 +1078,6 @@
}
+ const size_t count = tests.size();
+
// check the white list first because it overrides all the others
for ( n = 0; n < count; n++ )
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
