From: Vsevolod Stakhov <vsevolod@rambler-co.ru>
Date: Fri, 6 Mar 2009 15:00:35 +0000 (+0300)
Subject: * Fix logic of parsing hoster's domains in surbl module
X-Git-Tag: 0.2.7~265
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f3ffee8009da397270ce1ea127dab84285ed432;p=thirdparty%2Frspamd.git

* Fix logic of parsing hoster's domains in surbl module
---

diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c
index 46162c57d8..1185da68fa 100644
--- a/src/plugins/surbl.c
+++ b/src/plugins/surbl.c
@@ -265,7 +265,7 @@ format_surbl_request (memory_pool_t *pool, f_str_t *hostname, struct suffix_item
 		part2 = g_match_info_fetch (info, 2);
 		g_match_info_free (info);
 		result = memory_pool_alloc (pool, len); 
-		msg_debug ("format_surbl_request: got normal 2-d level domain %s.%s", part1, part2);
+		snprintf (result, len, "%s.%s", part1, part2);
 		if (g_hash_table_lookup (surbl_module_ctx->hosters, result) != NULL) {
 			/* Match additional part for hosters */
 			g_free (part1);
@@ -287,7 +287,10 @@ format_surbl_request (memory_pool_t *pool, f_str_t *hostname, struct suffix_item
 			g_match_info_free (info);
 			return NULL;
 		}
-		snprintf (result, len, "%s.%s.%s", part1, part2, suffix->suffix);
+		else {
+			snprintf (result, len, "%s.%s.%s", part1, part2, suffix->suffix);
+			msg_debug ("format_surbl_request: got normal 2-d level domain %s.%s", part1, part2);
+		}
 		g_free (part1);
 		g_free (part2);
 		return result;