Mercurial > dovecot > core-2.2
changeset 10263:18f5fdeed659 HEAD
mail storage service: Added MAIL_STORAGE_SERVICE_NO_LOG_INIT flag.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Thu, 05 Nov 2009 20:15:40 -0500 |
| parents | 07e0e2b4abe1 |
| children | 7bdb5816f797 |
| files | src/lib-storage/mail-storage-service.c src/lib-storage/mail-storage-service.h |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/mail-storage-service.c Thu Nov 05 19:47:44 2009 -0500 +++ b/src/lib-storage/mail-storage-service.c Thu Nov 05 20:15:40 2009 -0500 @@ -490,8 +490,10 @@ /* do all the global initialization. delay initializing plugins until we drop privileges the first time. */ - master_service_init_log(service, t_strconcat(service->name, ": ", NULL)); - + if ((flags & MAIL_STORAGE_SERVICE_NO_LOG_INIT) == 0) { + master_service_init_log(service, + t_strconcat(service->name, ": ", NULL)); + } dict_drivers_register_builtin(); return ctx; } @@ -736,7 +738,8 @@ return -1; } - mail_storage_service_init_log(ctx->service, user); + if ((ctx->flags & MAIL_STORAGE_SERVICE_NO_LOG_INIT) == 0) + mail_storage_service_init_log(ctx->service, user); if ((ctx->flags & MAIL_STORAGE_SERVICE_FLAG_NO_RESTRICT_ACCESS) == 0) { service_drop_privileges(user_set, user->system_groups_user,
--- a/src/lib-storage/mail-storage-service.h Thu Nov 05 19:47:44 2009 -0500 +++ b/src/lib-storage/mail-storage-service.h Thu Nov 05 20:15:40 2009 -0500 @@ -18,7 +18,9 @@ /* Don't chdir() to user's home */ MAIL_STORAGE_SERVICE_FLAG_NO_CHDIR = 0x10, /* Drop privileges only temporarily (keep running as setuid-root) */ - MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP = 0x20 + MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP = 0x20, + /* Don't initialize logging or change log prefixes */ + MAIL_STORAGE_SERVICE_NO_LOG_INIT = 0x40 }; struct mail_storage_service_input {