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 ed378131b494b15072b54689160350ef13395478..165a600fdc34b5f67c71f6a8884b986bd4cc2d18 100644 (file)
--- 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 cc659a9c7bbd62a64eb8f3b93937883b2944e147..ab411659493114a57be8864ec19e26676132e270 100644 (file)
--- 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 6a2085c70972cff45ba15192e303e446e79bc924..695d50e09c403db5e410c872a71f4c27f20944ca 100644 (file)
--- 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> */