and a few more custom flag -> keyword changes

--HG--
branch : HEAD

diff --git a/configure.in b/configure.in
index b860f2af0e3fb7d08ca477b42e13826340e22758..54c10acf52209697241db2d18c2b5489ff6e640e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(src)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(dovecot, 1.0-test2)
+AM_INIT_AUTOMAKE(dovecot, 1.0-test3)
 
 AM_MAINTAINER_MODE
 

diff --git a/src/imap/main.c b/src/imap/main.c
index 3e621c939727e2cd75c5c8de5bc3ca653183fb75..0934414e9393045306c6d799be72db85ebc2aca5 100644 (file)
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -113,7 +113,7 @@ static void main_init(void)
                (unsigned int)strtoul(str, NULL, 10) :
                DEFAULT_IMAP_MAX_LINE_LENGTH;
 
-       str = getenv("MAIL_MAX_FLAG_LENGTH");
+       str = getenv("MAIL_MAX_KEYWORD_LENGTH");
        max_keyword_length = str != NULL ?
                (unsigned int)strtoul(str, NULL, 10) :
                DEFAULT_MAX_KEYWORD_LENGTH;

diff --git a/src/master/mail-process.c b/src/master/mail-process.c
index 7b42a2fa5488543c166ce851a3d221dbc4d9c15b..f21b67ab1ee3635c4b0f1de2cf59e5b088aa58cb 100644 (file)
--- a/src/master/mail-process.c
+++ b/src/master/mail-process.c
@@ -252,8 +252,8 @@ int create_mail_process(struct login_group *group, int socket,
                                set->mailbox_idle_check_interval));
        env_put(t_strconcat("CLIENT_WORKAROUNDS=",
                            set->client_workarounds, NULL));
-       env_put(t_strdup_printf("MAIL_MAX_FLAG_LENGTH=%u",
-                               set->mail_max_flag_length));
+       env_put(t_strdup_printf("MAIL_MAX_KEYWORD_LENGTH=%u",
+                               set->mail_max_keyword_length));
        env_put(t_strdup_printf("IMAP_MAX_LINE_LENGTH=%u",
                                set->imap_max_line_length));
 

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index 5730887ce793eda10ab52985ff0a3b363977c9da..6f8b5773945aa22bf11a4170329bb2bdb12c9e20 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -85,7 +85,7 @@ static struct setting_def setting_defs[] = {
        DEF(SET_INT, mailbox_check_interval),
        DEF(SET_INT, mailbox_idle_check_interval),
        DEF(SET_BOOL, mail_full_filesystem_access),
-       DEF(SET_INT, mail_max_flag_length),
+       DEF(SET_INT, mail_max_keyword_length),
        DEF(SET_BOOL, mail_save_crlf),
        DEF(SET_BOOL, mail_read_mmaped),
        DEF(SET_BOOL, mmap_disable),
@@ -206,7 +206,7 @@ struct settings default_settings = {
        MEMBER(mailbox_check_interval) 0,
        MEMBER(mailbox_idle_check_interval) 30,
        MEMBER(mail_full_filesystem_access) FALSE,
-       MEMBER(mail_max_flag_length) 50,
+       MEMBER(mail_max_keyword_length) 50,
        MEMBER(mail_save_crlf) FALSE,
        MEMBER(mail_read_mmaped) FALSE,
        MEMBER(mmap_disable) FALSE,

diff --git a/src/master/master-settings.h b/src/master/master-settings.h
index d6ca4109c58adcdae30c3f8e7a3a56eebd5f0650..4c7221fe3cbbeccdc66a6b982a04390286513892 100644 (file)
--- a/src/master/master-settings.h
+++ b/src/master/master-settings.h
@@ -60,7 +60,7 @@ struct settings {
        unsigned int mailbox_check_interval;
        unsigned int mailbox_idle_check_interval;
        int mail_full_filesystem_access;
-       int mail_max_flag_length;
+       int mail_max_keyword_length;
        int mail_save_crlf;
        int mail_read_mmaped;
        int mmap_disable;