comply with safebrowsing naming guidelines.

git-svn: trunk@4912

ChangeLog

@@ -1,3 +1,8 @@
+Fri Mar  6 16:33:49 EET 2009 (edwin)
+------------------------------------
+ * libclamav/phishcheck.c: comply with safebrowsing naming
+ guidelines.
+
 Fri Mar  6 16:15:19 EET 2009 (edwin)
 ------------------------------------
  * libclamav/mpool.c, libclamav/str.c, libclamav/str.h: avoid

libclamav/phishcheck.c

@@ -829,10 +829,14 @@ int phishingScan(cli_ctx* ctx,tag_arguments_t* hrefs)
 					*ctx->virname="Phishing.Heuristics.Email.Cloaked.Username";/*http://banksite@fake.example.com*/
 					break;
 				case CL_PHISH_HASH0:
+					*ctx->virname="Suspected-malware_safebrowsing.clamav.net";
+					break;
 				case CL_PHISH_HASH1:
-				case CL_PHISH_HASH2:
 					*ctx->virname="Phishing.URL.Blacklisted";
 					break;
+				case CL_PHISH_HASH2:
+					*ctx->virname="Suspected-phishing_safebrowsing.clamav.net";
+					break;
 				case CL_PHISH_NOMATCH:
 				default:
 					*ctx->virname="Phishing.Heuristics.Email.SpoofedDomain";

libclamav/regex_list.c

@@ -540,7 +540,7 @@ int load_regex_matcher(struct regex_matcher* matcher,FILE* fd,unsigned int *sign
 			/*matches displayed host*/
 			if (( rc = add_static_pattern(matcher, pattern) ))
 				return rc==CL_EMEM ? CL_EMEM : CL_EMALFDB;
-		} else if (buffer[0] == 'U' && !is_whitelist) {
+		} else if (buffer[0] == 'S' && !is_whitelist) {
 			pattern[pattern_len] = '\0';
 			if (( rc = add_hash(matcher, pattern, flags[0]) )) {
 				cli_errmsg("Error loading at line: %d\n", line);