From: Timo Sirainen <tss@iki.fi>
Date: Sun, 2 May 2004 20:33:49 +0000 (+0300)
Subject: and a few more custom flag -> keyword changes
X-Git-Tag: 1.1.alpha1~4147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7132f4170ba7d40ccd29611fcb0ccc6f7413fcd;p=thirdparty%2Fdovecot%2Fcore.git

and a few more custom flag -> keyword changes

--HG--
branch : HEAD
---

diff --git a/configure.in b/configure.in
index b860f2af0e..54c10acf52 100644
--- 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 3e621c9397..0934414e93 100644
--- 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 7b42a2fa54..f21b67ab1e 100644
--- 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 5730887ce7..6f8b577394 100644
--- 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 d6ca4109c5..4c7221fe3c 100644
--- 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;