Reformatted the regex test case.

1 files changed, 43 insertions, 44 deletions

diff --git a/check/magma/servers/smtp/checkers_check.c b/check/magma/servers/smtp/checkers_check.c
index aa9c3fbc..2fb00adf 100644
--- a/check/magma/servers/smtp/checkers_check.c
+++ b/check/magma/servers/smtp/checkers_check.c
@@ -90,63 +90,62 @@ bool_t check_smtp_checkers_greylist_sthread(stringer_t *errmsg) {
 
 bool_t check_smtp_checkers_regex_sthread(stringer_t *errmsg) {
 
+	struct re_pattern_buffer regbuff;
+	mm_wipe(&regbuff, sizeof(struct re_pattern_buffer));
 	chr_t *expressions[] = {
-			"85\\.155\\.166\\.44\\.dyn\\.user\\.ono\\.com\\",
-			"http\\:\\/\\/www\\.yourlogcabins\\.com\\",
-			"82\\.128\\.33\\.161\\]\\ \\(port\\=2680\\ helo\\=User\\)\\ by\\ 4\\.mx\\.freenet\\.de\\ with\\ esmtpa\\ \\(ID\\ danielch",
-			"\\[41\\.222\\.192\\.83\\]\\ \\(helo\\=User\\)\\ by\\ server45\\.serverparksteenbergen\\.nl\\ with\\ esmtpa\\ \\(Exim\\",
-			"server45\\.serverparksteenbergen\\.nl\\ \\(77\\.243\\.231\\.36",
-			"LU7FDZ\\",
-			"fresh\\",
-			"redbox\\",
-			"tiger\\",
-			"Vicodin\\ fling\\ medications\\",
-			"noreply\\@message\\.myspace\\.com\\",
-			"Subscription\\",
-			"Unsubscribe\\",
-			"http\\:\\/\\/www\\.ameba\\.jp\\/\\",
-			"lblanchard\\@ocean\\-institute\\.org\\",
-			"email\\.tcm\\.com\\",
-			"\\*\\.tcm\\.com\\",
-			"tcm\\.com\\",
-			"Turner\\ Classic\\",
-			"Turner\\ Classic\\",
+			"\\/\\^From\\:\\.\\*\\(gmxmagazin\\\\\\@gmx\\\\\\-gmbh\\\\\\.de\\|mailings\\\\\\@gmx\\\\\\-gmbh\\\\\\.de\\|\\.\\*gmxred\\.\\*\\|elsa",
+			"online836745\\@telkomsa\\.net\\,\\ adbplc78\\@gmail\\.com\\,\\ inside\\.all\\@uol\\.com\\.br\\,\\ a2\\-shark1\\.uol\\",
+			"ashley\\ madison\\ married\\ affair\\ wives\\ pleasurable\\ gal\\ nsa\\ fun\\ dangerous\\ risky\\ scared\\ cost\\",
+			"verify\\ credit\\ free\\ account\\ anonymous\\ info\\ revealing\\ phone\\ picture\\ Whats\\ whats\\ wats\\ wat\\",
+			"2\\.128\\.128\\.1\\]\\ \\(port\\=680\\ helo\\=User\\)\\ by\\ 4\\.mx\\.freenet\\.us\\ with\\ esmtpa\\ \\(ID\\ ch",
+			"\\[41\\.222\\.192\\.83\\]\\ \\(helo\\=User\\)\\ by\\ server45\\.serverpark\\.nl\\ with\\ esmtpa\\ \\(Exim\\",
 			"LOTTERY\\ WINNER\\ WINNING\\ BLACKHOLED\\ SCAM\\ LUCKY\\ \\/LUCKY\\ WINNER\\/\\ WON\\ ONLINE\\",
 			"lucky\\+winner\\ CONGRATULATION\\ CONGRATULATIONS\\ DEAL\\ CHEAP\\ WIN\\",
-			"Linda\\ Blanchard\\",
-			"online836745\\@telkomsa\\.net\\,\\ adbplc78\\@gmail\\.com\\,\\ inside\\.all\\@uol\\.com\\.br\\,\\ a2\\-shark1\\.uol\\",
-			"bra\\",
-			"\\ an\\",
-			"MortgageAssistance411\\",
-			"weekend\\ cash\\",
+			"\\\"Woodcraft\\\"\\ \\<Woodcraft\\@woodcraftnews\\.com\\>\\",
+			"server45\\.serverfarm\\.nl\\ \\(17\\.31\\.21\\.69",
+			"Receipt\\ for\\ your\\ PayPal\\ payment\\ to\\",
+			"45\\.155\\.169\\.44\\.dyn\\.user\\.com\\",
+			"Stop\\ paying\\ off\\ the\\ tobacco\\",
+			"noreply\\@message\\.myspace\\.com\\",
+			"http\\:\\/\\/www\\.ameba\\.com\\/\\",
+			"http\\:\\/\\/www\\.mycabin\\.com\\",
+			"Vicodin\\ fling\\ medications\\",
+			"obama\\@tax\\-institute\\.org\\",
+			"Start\\ on\\ a\\ new\\-career\\",
+			"R\\-help\\ Digest\\,\\ Vol\\",
+			"The\\ Pimsleur\\ Approach\\",
 			"Manner\\ Shultz\\ Group\\",
-			"Finance\\ Depat\\.\\",
-			"LUMINEERS\\",
+			"Gordon\\,\\ you\\ have\\",
+			"Cambridge\\ SoundWorks\\",
+			"MortgageAssistance411\\",
 			"Auto\\ Price\\ Finder\\",
+			"Mailer\\'s\\ graphics\\",
+			"Finance\\ Depat\\.\\",
 			"flight\\ simulator\\",
-			"The\\ Pimsleur\\ Approach\\",
-			"Start\\ on\\ a\\ new\\-career\\",
+			"email\\.tcm\\.com\\",
+			"Linda\\ Blanchard\\",
 			"World\\ Marketing\\",
-			"Stop\\ paying\\ off\\ the\\ tobacco\\",
-			"Mailer\\'s\\ graphics\\",
+			"Turner\\ Classic\\",
+			"\\*\\.tcm\\.com\\",
 			"Dr\\.Oz\\-watch\\",
-			"verify\\ credit\\ free\\ account\\ anonymous\\ info\\ revealing\\ phone\\ picture\\ Whats\\ whats\\ wats\\ wat\\",
 			"Do\\ you\\ know\\",
-			"Gordon\\,\\ you\\ have\\",
-			"rich\\",
 			"Do\\ you\\ know\\",
-			"R\\-help\\ Digest\\,\\ Vol\\",
-			"\\\"Woodcraft\\\"\\ \\<Woodcraft\\@woodcraftnews\\.com\\>\\",
-			"Cambridge\\ SoundWorks\\",
-			"IZUALO\\",
-			"Receipt\\ for\\ your\\ PayPal\\ payment\\ to\\",
-			"ashley\\ madison\\ married\\ affair\\ wives\\ pleasurable\\ gal\\ nsa\\ fun\\ dangerous\\ risky\\ scared\\ cost\\",
+			"weekend\\ cash\\",
+			"Subscription\\",
 			"eLoan\\ Plus\\",
+			"Unsubscribe\\",
+			"tcm\\.com\\",
+			"LUMINEERS\\",
 			"cafepress\\",
-			"\\/\\^From\\:\\.\\*\\(gmxmagazin\\\\\\@gmx\\\\\\-gmbh\\\\\\.de\\|mailings\\\\\\@gmx\\\\\\-gmbh\\\\\\.de\\|\\.\\*gmxred\\.\\*\\|elsa"
+			"LU7FDZ\\",
+			"redbox\\",
+			"IZUALO\\",
+			"fresh\\",
+			"tiger\\",
+			"\\ an\\",
+			"rich\\",
+			"bra\\"
 	};
-	struct re_pattern_buffer regbuff;
-	mm_wipe(&regbuff, sizeof(struct re_pattern_buffer));
 
 	for (size_t i = 0; i < (sizeof(expressions)/sizeof(chr_t*)); i++) {
 		if (regcomp(&regbuff, expressions[i], REG_ICASE) != 0) {