Mercurial > dovecot > original-hg > dovecot-1.2
changeset 8417:106ad33091ca HEAD
Made CRITICAL_MSG* public to MAIL_ERRSTR_CRITICAL_MSG* in mail-error.h.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Sun, 16 Nov 2008 04:45:06 +0200 |
parents | f5d753c4c8c6 |
children | 29b1ec15880a |
files | src/lib-storage/mail-error.h src/lib-storage/mail-storage.c src/lib-storage/mail-storage.h src/lib-storage/mailbox-list.c |
diffstat | 4 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/mail-error.h Sun Nov 16 04:21:02 2008 +0200 +++ b/src/lib-storage/mail-error.h Sun Nov 16 04:45:06 2008 +0200 @@ -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)
--- a/src/lib-storage/mail-storage.c Sun Nov 16 04:21:02 2008 +0200 +++ b/src/lib-storage/mail-storage.c Sun Nov 16 04:45:06 2008 +0200 @@ -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 @@ 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; }
--- a/src/lib-storage/mail-storage.h Sun Nov 16 04:21:02 2008 +0200 +++ b/src/lib-storage/mail-storage.h Sun Nov 16 04:45:06 2008 +0200 @@ -39,7 +39,9 @@ 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 {
--- a/src/lib-storage/mailbox-list.c Sun Nov 16 04:21:02 2008 +0200 +++ b/src/lib-storage/mailbox-list.c Sun Nov 16 04:45:06 2008 +0200 @@ -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 @@ 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; }