]> source.dussan.org Git - rspamd.git/commitdiff
* Fix error with statfiles sorting function
authorVsevolod Stakhov <vsevolod@rambler-co.ru>
Thu, 23 Jul 2009 13:16:36 +0000 (17:16 +0400)
committerVsevolod Stakhov <vsevolod@rambler-co.ru>
Thu, 23 Jul 2009 13:16:36 +0000 (17:16 +0400)
conf/lotto.inc
src/statfile.c

index 78ffdea5710b109c0ed9bc8fb4fd1dee82e614bd..40cb98f2a114e5fd46e2b161c5035ac2f890665b 100644 (file)
@@ -11,6 +11,6 @@ $__KAM_LOTTO4="/(claims (officer|agent)|lottery coordinator|fiduciary (officer|a
 $__KAM_LOTTO5="/(freelotto group|Royal Heritage Lottery|UK National (Online)? Lottery|U\.?K\.? Grand Promotions|Lottery Department UK|Euromillion Loteria|Luckyday International Lottery|International Lottery)/isrP";
 $__KAM_LOTTO6="/(Dear Lucky Winner|Winning Notification|Attention:Winner|Dear Winner)/isrP";
 $__KAM_LOTTO7="Subject=/(Your Lucky Day|(Attention:|ONLINE) WINNER)/iH";
-$KAM_LOTTO1="(${R_UNDISC_RCPT} | ${R_BAD_CTE_7BIT} | ${R_NO_SPACE_IN_FROM}) & regexp_match_number(3, ${__KAM_LOTTO1}, ${__KAM_LOTTO2}, ${__KAM_LOTTO3}, ${__KAM_LOTTO4}, ${__KAM_LOTTO5}, ${__KAM_LOTTO6}, ${__KAM_LOTTO7})";
-$R_LOTTO="(${R_UNDISC_RCPT} | ${R_BAD_CTE_7BIT} | ${R_NO_SPACE_IN_FROM}) & regexp_match_number(3, ${__KAM_LOTTO1},  ${__KAM_LOTTO2}, ${__KAM_LOTTO3}, ${__KAM_LOTTO4}, ${__KAM_LOTTO5}, ${__KAM_LOTTO6})";
+$KAM_LOTTO1="regexp_match_number(3, ${__KAM_LOTTO1}, ${__KAM_LOTTO2}, ${__KAM_LOTTO3}, ${__KAM_LOTTO4}, ${__KAM_LOTTO5}, ${__KAM_LOTTO6}, ${__KAM_LOTTO7})";
+#$R_LOTTO="regexp_match_number(3, ${__KAM_LOTTO1},  ${__KAM_LOTTO2}, ${__KAM_LOTTO3}, ${__KAM_LOTTO4}, ${__KAM_LOTTO5}, ${__KAM_LOTTO6})";
 
index 048ebc4858c9819201834df194df92d1e8178995..d1382e368d49aaffeeafd76f78568cf0a7c37080 100644 (file)
@@ -35,7 +35,7 @@ cmpstatfile (const void *a, const void *b)
 {
        const stat_file_t *s1 = a, *s2 = b;
 
-       return rspamd_strcase_equal (s1->filename, s2->filename);
+       return g_ascii_strcasecmp (s1->filename, s2->filename);
 }
 
 /* Check whether specified file is statistic file and calculate its len in blocks */