Changed imap-resp-code [ACL] to [NOPERM], which it will be in the next draft.

--HG--
branch : HEAD

diff --git a/src/imap/commands-util.c b/src/imap/commands-util.c
index 2a947dd84a256e14ce0d3ab7539585116cb6e2bd..84ff5169ab2a2662726c64008e0e07f61f0b7291 100644 (file)
--- a/src/imap/commands-util.c
+++ b/src/imap/commands-util.c
@@ -160,7 +160,7 @@ get_error_string(const char *error_string, enum mail_error error)
                resp_code = IMAP_RESP_CODE_CANNOT;
                break;
        case MAIL_ERROR_PERM:
-               resp_code = IMAP_RESP_CODE_ACL;
+               resp_code = IMAP_RESP_CODE_NOPERM;
                break;
        case MAIL_ERROR_NOSPACE:
                resp_code = IMAP_RESP_CODE_OVERQUOTA;

diff --git a/src/lib-imap/imap-resp-code.h b/src/lib-imap/imap-resp-code.h
index 9cf8cccce8cfa8c13ee516d2f4959a93ed0b7f59..63499a35043b0f062547b97acfd25437e5a251e7 100644 (file)
--- a/src/lib-imap/imap-resp-code.h
+++ b/src/lib-imap/imap-resp-code.h
@@ -7,7 +7,7 @@
 #define IMAP_RESP_CODE_AUTHZFAILED "AUTHORIZATIONFAILED"
 #define IMAP_RESP_CODE_EXPIRED "EXPIRED"
 #define IMAP_RESP_CODE_CONTACTADMIN "CONTACTADMIN"
-#define IMAP_RESP_CODE_ACL "ACL"
+#define IMAP_RESP_CODE_NOPERM "NOPERM"
 #define IMAP_RESP_CODE_INUSE "INUSE"
 #define IMAP_RESP_CODE_EXPUNGEISSUED "EXPUNGEISSUED"
 #define IMAP_RESP_CODE_CORRUPTION "CORRUPTION"

diff --git a/src/plugins/imap-acl/imap-acl-plugin.c b/src/plugins/imap-acl/imap-acl-plugin.c
index 901d917bdc9ee43158cfa6fc197b21be8a466303..2680953935326eb3f16e8a98d251e934cfb09b0f 100644 (file)
--- a/src/plugins/imap-acl/imap-acl-plugin.c
+++ b/src/plugins/imap-acl/imap-acl-plugin.c
@@ -13,7 +13,7 @@
 
 #include <stdlib.h>
 
-#define ERROR_NOT_ADMIN "["IMAP_RESP_CODE_ACL"] " \
+#define ERROR_NOT_ADMIN "["IMAP_RESP_CODE_NOPERM"] " \
        "You lack administrator privileges on this mailbox."
 
 #define ACL_MAILBOX_OPEN_FLAGS \