From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 16 Feb 2019 14:42:11 +0000 (+0000)
Subject: [Minor] Fix getting of emails
X-Git-Tag: 1.9.0~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba63e160b52fa55478968c97053b9651f7d571c8;p=thirdparty%2Frspamd.git

[Minor] Fix getting of emails
---

diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index 7067ee836a..f9c1f3a397 100644
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -2072,6 +2072,7 @@ lua_task_get_emails (lua_State * L)
 		lua_createtable (L, g_hash_table_size (task->emails), 0);
 		cb.i = 1;
 		cb.L = L;
+		cb.mask = PROTOCOL_MAILTO;
 		g_hash_table_foreach (task->emails, lua_tree_url_callback, &cb);
 	}
 	else {
diff --git a/src/lua/lua_url.c b/src/lua/lua_url.c
index 69a12e028e..0a301e96d0 100644
--- a/src/lua/lua_url.c
+++ b/src/lua/lua_url.c
@@ -720,28 +720,7 @@ lua_url_to_table (lua_State *L)
 
 
 		lua_pushstring (L, "protocol");
-
-		switch (u->protocol) {
-		case PROTOCOL_FILE:
-			lua_pushstring (L, "file");
-			break;
-		case PROTOCOL_FTP:
-			lua_pushstring (L, "ftp");
-			break;
-		case PROTOCOL_HTTP:
-			lua_pushstring (L, "http");
-			break;
-		case PROTOCOL_HTTPS:
-			lua_pushstring (L, "https");
-			break;
-		case PROTOCOL_MAILTO:
-			lua_pushstring (L, "mailto");
-			break;
-		case PROTOCOL_UNKNOWN:
-		default:
-			lua_pushstring (L, "unknown");
-			break;
-		}
+		lua_pushstring (L, rspamd_url_protocol_name (u->protocol));
 		lua_settable (L, -3);
 	}
 	else {