Mercurial > dovecot > original-hg > dovecot-1.2
changeset 7539:dd378ab0263e HEAD
mbox: If INBOX creation fails because of EACCES, try with privileged group
enabled.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 25 May 2008 01:52:17 +0300 |
| parents | abdf9e06a956 |
| children | 30a97495c7bf |
| files | dovecot-example.conf src/lib-storage/index/mbox/mbox-storage.c |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/dovecot-example.conf Sun May 25 01:45:31 2008 +0300 +++ b/dovecot-example.conf Sun May 25 01:52:17 2008 +0300 @@ -270,7 +270,7 @@ #mail_gid = # Group to enable temporarily for privileged operations. Currently this is -# used only for creating mbox dotlock files when creation fails for INBOX. +# used only with INBOX when either its initial creation or dotlocking fails. # Typically this is set to "mail" to give access to /var/mail. #mail_privileged_group =
--- a/src/lib-storage/index/mbox/mbox-storage.c Sun May 25 01:45:31 2008 +0300 +++ b/src/lib-storage/index/mbox/mbox-storage.c Sun May 25 01:52:17 2008 +0300 @@ -4,6 +4,7 @@ #include "ioloop.h" #include "array.h" #include "istream.h" +#include "restrict-access.h" #include "mkdir-parents.h" #include "unlink-directory.h" #include "home-expand.h" @@ -472,6 +473,12 @@ /* make sure inbox file itself exists */ fd = open(inbox_path, O_RDWR | O_CREAT | O_EXCL, 0660); + if (fd == -1 && errno == EACCES) { + /* try again with increased privileges */ + (void)restrict_access_use_priv_gid(); + fd = open(inbox_path, O_RDWR | O_CREAT | O_EXCL, 0660); + restrict_access_drop_priv_gid(); + } if (fd != -1) (void)close(fd); else if (errno == ENOTDIR &&