- more MAP -> TABLE

7 files changed, 21 insertions, 21 deletions

diff --git a/smtpd/control.c b/smtpd/control.c
index eca1be5f..15c965e8 100644
--- a/smtpd/control.c
+++ b/smtpd/control.c
@@ -651,7 +651,7 @@ control_dispatch_ext(int fd, short event, void *arg)
 			    NULL, 0);
 			break;
 
-		case IMSG_LKA_UPDATE_MAP:
+		case IMSG_LKA_UPDATE_TABLE:
 			if (euid)
 				goto badcred;
 
@@ -660,7 +660,7 @@ control_dispatch_ext(int fd, short event, void *arg)
 			if (len >= MAX_LINE_SIZE)
 				goto invalid;
 
-			imsg_compose_event(env->sc_ievs[PROC_LKA], IMSG_LKA_UPDATE_MAP,
+			imsg_compose_event(env->sc_ievs[PROC_LKA], IMSG_LKA_UPDATE_TABLE,
 			    0, 0, -1, imsg.data, len + 1);
 			imsg_compose_event(&c->iev, IMSG_CTL_OK, 0, 0, -1,
 			    NULL, 0);
diff --git a/smtpd/lka.c b/smtpd/lka.c
index ee33ebd8..329edc71 100644
--- a/smtpd/lka.c
+++ b/smtpd/lka.c
@@ -149,7 +149,7 @@ lka_imsg(struct imsgev *iev, struct imsg *imsg)
 			TAILQ_INSERT_TAIL(env->sc_rules_reload, rule, r_entry);
 			return;
 
-		case IMSG_CONF_MAP:
+		case IMSG_CONF_TABLE:
 			map = xmemdup(imsg->data, sizeof *map, "lka:map");
 			TAILQ_INIT(&map->m_contents);
 			TAILQ_INSERT_TAIL(env->sc_tables_reload, map, m_entry);
@@ -175,7 +175,7 @@ lka_imsg(struct imsgev *iev, struct imsg *imsg)
 			env->sc_tables = tmp;
 			return;
 
-		case IMSG_CONF_MAP_CONTENT:
+		case IMSG_CONF_TABLE_CONTENT:
 			map = TAILQ_LAST(env->sc_tables_reload, maplist);
 			mapel = xmemdup(imsg->data, sizeof *mapel, "lka:mapel");
 			TAILQ_INSERT_TAIL(&map->m_contents, mapel, me_entry);
@@ -208,7 +208,7 @@ lka_imsg(struct imsgev *iev, struct imsg *imsg)
 
 	if (iev->proc == PROC_CONTROL) {
 		switch (imsg->hdr.type) {
-		case IMSG_LKA_UPDATE_MAP:
+		case IMSG_LKA_UPDATE_TABLE:
 			map = map_findbyname(imsg->data);
 			if (map == NULL) {
 				log_warnx("warn: lka: no such map \"%s\"",
diff --git a/smtpd/parser.c b/smtpd/parser.c
index c93386de..5fc595d2 100644
--- a/smtpd/parser.c
+++ b/smtpd/parser.c
@@ -57,7 +57,7 @@ static const struct token t_show[];
 static const struct token t_show_envelope[];
 static const struct token t_show_message[];
 static const struct token t_update[];
-static const struct token t_update_map[];
+static const struct token t_update_table[];
 
 static const struct token t_main[] = {
 	{KEYWORD,	"schedule-id",  	NONE,		t_schedule_id},
@@ -122,12 +122,12 @@ static const struct token t_log[] = {
 };
 
 static const struct token t_update[] = {
-	{KEYWORD,	"map",		     	NONE,		t_update_map},
+	{KEYWORD,	"table",       	     	NONE,		t_update_table},
 	{ENDTOKEN,	"",			NONE,      	NULL}
 };
 
-static const struct token t_update_map[] = {
-	{VARIABLE,	"name",		      	UPDATE_MAP,	NULL},
+static const struct token t_update_table[] = {
+	{VARIABLE,	"name",		      	UPDATE_TABLE,	NULL},
 	{ENDTOKEN,	"",			NONE,      	NULL}
 };
 
diff --git a/smtpd/parser.h b/smtpd/parser.h
index 01227026..1687c2db 100644
--- a/smtpd/parser.h
+++ b/smtpd/parser.h
@@ -36,7 +36,7 @@ enum actions {
 	RESUME_MDA,
 	RESUME_MTA,
 	RESUME_SMTP,
-	UPDATE_MAP,
+	UPDATE_TABLE,
 };
 
 struct parse_result {
diff --git a/smtpd/smtpctl.c b/smtpd/smtpctl.c
index 0b8d78c6..7532883b 100644
--- a/smtpd/smtpctl.c
+++ b/smtpd/smtpctl.c
@@ -255,10 +255,10 @@ main(int argc, char *argv[])
 	case SHOW_STATS:
 		imsg_compose(ibuf, IMSG_STATS, 0, 0, -1, NULL, 0);
 		break;
-	case UPDATE_MAP:
+	case UPDATE_TABLE:
 		if (strlcpy(name, res->data, sizeof name) >= sizeof name)
 			errx(1, "map name too long.");
-		imsg_compose(ibuf, IMSG_LKA_UPDATE_MAP, 0, 0, -1,
+		imsg_compose(ibuf, IMSG_LKA_UPDATE_TABLE, 0, 0, -1,
 		    name, strlen(name) + 1);
 		done = 1;
 		break;
@@ -310,7 +310,7 @@ main(int argc, char *argv[])
 			break;
 		case NONE:
 			break;
-		case UPDATE_MAP:
+		case UPDATE_TABLE:
 			break;
 		case MONITOR:
 
diff --git a/smtpd/smtpd.c b/smtpd/smtpd.c
index e6fefac0..96a343cf 100644
--- a/smtpd/smtpd.c
+++ b/smtpd/smtpd.c
@@ -358,10 +358,10 @@ parent_send_config_ruleset(int proc)
 	}
 	else {
 		TAILQ_FOREACH(m, env->sc_tables, m_entry) {
-			imsg_compose_event(env->sc_ievs[proc], IMSG_CONF_MAP,
+			imsg_compose_event(env->sc_ievs[proc], IMSG_CONF_TABLE,
 			    0, 0, -1, m, sizeof(*m));
 			TAILQ_FOREACH(mapel, &m->m_contents, me_entry) {
-			imsg_compose_event(env->sc_ievs[proc], IMSG_CONF_MAP_CONTENT,
+			imsg_compose_event(env->sc_ievs[proc], IMSG_CONF_TABLE_CONTENT,
 			    0, 0, -1, mapel, sizeof(*mapel));
 			}
 		}
@@ -1294,14 +1294,14 @@ imsg_to_str(int type)
 	CASE(IMSG_CONF_START);
 	CASE(IMSG_CONF_SSL);
 	CASE(IMSG_CONF_LISTENER);
-	CASE(IMSG_CONF_MAP);
-	CASE(IMSG_CONF_MAP_CONTENT);
+	CASE(IMSG_CONF_TABLE);
+	CASE(IMSG_CONF_TABLE_CONTENT);
 	CASE(IMSG_CONF_RULE);
 	CASE(IMSG_CONF_RULE_SOURCE);
 	CASE(IMSG_CONF_FILTER);
 	CASE(IMSG_CONF_END);
 
-	CASE(IMSG_LKA_UPDATE_MAP);
+	CASE(IMSG_LKA_UPDATE_TABLE);
 	CASE(IMSG_LKA_MAIL);
 	CASE(IMSG_LKA_RCPT);
 	CASE(IMSG_LKA_SECRET);
diff --git a/smtpd/smtpd.h b/smtpd/smtpd.h
index a92374a0..d86314a8 100644
--- a/smtpd/smtpd.h
+++ b/smtpd/smtpd.h
@@ -140,14 +140,14 @@ enum imsg_type {
 	IMSG_CONF_START,
 	IMSG_CONF_SSL,
 	IMSG_CONF_LISTENER,
-	IMSG_CONF_MAP,
-	IMSG_CONF_MAP_CONTENT,
+	IMSG_CONF_TABLE,
+	IMSG_CONF_TABLE_CONTENT,
 	IMSG_CONF_RULE,
 	IMSG_CONF_RULE_SOURCE,
 	IMSG_CONF_FILTER,
 	IMSG_CONF_END,
 
-	IMSG_LKA_UPDATE_MAP,
+	IMSG_LKA_UPDATE_TABLE,
 
 	IMSG_LKA_MAIL,
 	IMSG_LKA_RCPT,