From: Timo Sirainen <tss@iki.fi>
Date: Sun, 16 Nov 2008 02:45:06 +0000 (+0200)
Subject: Made CRITICAL_MSG* public to MAIL_ERRSTR_CRITICAL_MSG* in mail-error.h.
X-Git-Tag: 1.2.alpha4~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac4e6609cbdca594db1b1c02afb1e372ab22e060;p=thirdparty%2Fdovecot%2Fcore.git

Made CRITICAL_MSG* public to MAIL_ERRSTR_CRITICAL_MSG* in mail-error.h.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/mail-error.h b/src/lib-storage/mail-error.h
index ab9536d710..0a65febe8b 100644
--- a/src/lib-storage/mail-error.h
+++ b/src/lib-storage/mail-error.h
@@ -10,6 +10,12 @@
 #define MAIL_ERRSTR_NO_SPACE "Not enough disk space"
 #define MAIL_ERRSTR_LOCK_TIMEOUT "Timeout while waiting for lock"
 
+/* Message to show to users when critical error occurs */
+#define MAIL_ERRSTR_CRITICAL_MSG \
+	"Internal error occurred. Refer to server log for more information."
+#define MAIL_ERRSTR_CRITICAL_MSG_STAMP \
+	MAIL_ERRSTR_CRITICAL_MSG " [%Y-%m-%d %H:%M:%S]"
+
 #define T_MAIL_ERR_MAILBOX_NOT_FOUND(name) \
 	t_strdup_printf(MAIL_ERRSTR_MAILBOX_NOT_FOUND, name)
 
diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 107103a13d..dd66bba686 100644
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -16,11 +16,6 @@
 #include <time.h>
 #include <ctype.h>
 
-/* Message to show to users when critical error occurs */
-#define CRITICAL_MSG \
-	"Internal error occurred. Refer to server log for more information."
-#define CRITICAL_MSG_STAMP CRITICAL_MSG " [%Y-%m-%d %H:%M:%S]"
-
 #define DEFAULT_MAX_KEYWORD_LENGTH 50
 
 struct mail_storage_module_register mail_storage_module_register = { 0 };
@@ -294,8 +289,9 @@ void mail_storage_set_internal_error(struct mail_storage *storage)
 
 	i_free(storage->error_string);
 	storage->error_string =
-		strftime(str, sizeof(str), CRITICAL_MSG_STAMP, tm) > 0 ?
-		i_strdup(str) : i_strdup(CRITICAL_MSG);
+		strftime(str, sizeof(str),
+			 MAIL_ERRSTR_CRITICAL_MSG_STAMP, tm) > 0 ?
+		i_strdup(str) : i_strdup(MAIL_ERRSTR_CRITICAL_MSG);
 	storage->error = MAIL_ERROR_TEMP;
 }
 
diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h
index d515040223..5502c084e5 100644
--- a/src/lib-storage/mail-storage.h
+++ b/src/lib-storage/mail-storage.h
@@ -39,7 +39,9 @@ enum mail_storage_flags {
 	MAIL_STORAGE_FLAG_NFS_FLUSH_STORAGE	= 0x800,
 	MAIL_STORAGE_FLAG_NFS_FLUSH_INDEX	= 0x1000,
 	/* Don't use fsync() or fdatasync() */
-	MAIL_STORAGE_FLAG_FSYNC_DISABLE		= 0x2000
+	MAIL_STORAGE_FLAG_FSYNC_DISABLE		= 0x2000,
+	/* Force opening mailbox and ignoring any ACLs */
+	MAIL_STORAGE_FLAG_IGNORE_ACLS		= 0x4000
 };
 
 enum mailbox_open_flags {
diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 0de285fb5f..fd6e2354bc 100644
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -24,11 +24,6 @@
 #define MAILBOX_MAX_HIERARCHY_LEVELS 20
 #define MAILBOX_MAX_HIERARCHY_NAME_LENGTH 200
 
-/* Message to show to users when critical error occurs */
-#define CRITICAL_MSG \
-	"Internal error occurred. Refer to server log for more information."
-#define CRITICAL_MSG_STAMP CRITICAL_MSG " [%Y-%m-%d %H:%M:%S]"
-
 struct ns_list_iterate_context {
 	struct mailbox_list_iterate_context ctx;
 	struct mailbox_list_iterate_context *backend_ctx;
@@ -780,8 +775,9 @@ void mailbox_list_set_internal_error(struct mailbox_list *list)
 
 	i_free(list->error_string);
 	list->error_string =
-		strftime(str, sizeof(str), CRITICAL_MSG_STAMP, tm) > 0 ?
-		i_strdup(str) : i_strdup(CRITICAL_MSG);
+		strftime(str, sizeof(str),
+			 MAIL_ERRSTR_CRITICAL_MSG_STAMP, tm) > 0 ?
+		i_strdup(str) : i_strdup(MAIL_ERRSTR_CRITICAL_MSG);
 	list->error = MAIL_ERROR_TEMP;
 }