From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Mon, 20 Aug 2018 20:00:04 +0000 (+0200)
Subject: submission: Rename workaround enum values.
X-Git-Tag: 2.3.9~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01be72bc6fe6f3cf353e88f0ff773d48ca414449;p=thirdparty%2Fdovecot%2Fcore.git

submission: Rename workaround enum values.

Avoid conflicts with other protocols.
---

diff --git a/src/submission/submission-client.c b/src/submission/submission-client.c
index ed378131b4..165a600fdc 100644
--- a/src/submission/submission-client.c
+++ b/src/submission/submission-client.c
@@ -225,11 +225,11 @@ struct client *client_create(int fd_in, int fd_out,
 	smtp_set.rawlog_dir = set->rawlog_dir;
 	smtp_set.debug = user->mail_debug;
 
-	if ((workarounds & WORKAROUND_WHITESPACE_BEFORE_PATH) != 0) {
+	if ((workarounds & SUBMISSION_WORKAROUND_WHITESPACE_BEFORE_PATH) != 0) {
 		smtp_set.workarounds |=
 			SMTP_SERVER_WORKAROUND_WHITESPACE_BEFORE_PATH;
 	}
-	if ((workarounds & WORKAROUND_MAILBOX_FOR_PATH) != 0) {
+	if ((workarounds & SUBMISSION_WORKAROUND_MAILBOX_FOR_PATH) != 0) {
 		smtp_set.workarounds |=
 			SMTP_SERVER_WORKAROUND_MAILBOX_FOR_PATH;
 	}
diff --git a/src/submission/submission-settings.c b/src/submission/submission-settings.c
index cc659a9c7b..ab41165949 100644
--- a/src/submission/submission-settings.c
+++ b/src/submission/submission-settings.c
@@ -163,8 +163,10 @@ struct submission_client_workaround_list {
 
 static const struct submission_client_workaround_list
 submission_client_workaround_list[] = {
-	{ "whitespace-before-path", WORKAROUND_WHITESPACE_BEFORE_PATH },
-	{ "mailbox-for-path", WORKAROUND_MAILBOX_FOR_PATH },
+	{ "whitespace-before-path",
+	  SUBMISSION_WORKAROUND_WHITESPACE_BEFORE_PATH },
+	{ "mailbox-for-path",
+	  SUBMISSION_WORKAROUND_MAILBOX_FOR_PATH },
 	{ NULL, 0 }
 };
 
diff --git a/src/submission/submission-settings.h b/src/submission/submission-settings.h
index 6a2085c709..695d50e09c 100644
--- a/src/submission/submission-settings.h
+++ b/src/submission/submission-settings.h
@@ -5,8 +5,8 @@
 
 /* <settings checks> */
 enum submission_client_workarounds {
-	WORKAROUND_WHITESPACE_BEFORE_PATH	= BIT(0),
-	WORKAROUND_MAILBOX_FOR_PATH		= BIT(1),
+	SUBMISSION_WORKAROUND_WHITESPACE_BEFORE_PATH	= BIT(0),
+	SUBMISSION_WORKAROUND_MAILBOX_FOR_PATH		= BIT(1),
 };
 /* </settings checks> */