From: Timo Sirainen <tss@iki.fi>
Date: Fri, 27 Feb 2009 22:39:48 +0000 (-0500)
Subject: pop3_lock_session=yes didn't use mail_privileged_group while dotlocking.
X-Git-Tag: 1.2.beta2~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d5cadd8dde9326f8ae3595a1cca1c9261aca82d;p=thirdparty%2Fdovecot%2Fcore.git

pop3_lock_session=yes didn't use mail_privileged_group while dotlocking.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/mbox/mbox-storage.c b/src/lib-storage/index/mbox/mbox-storage.c
index b10d0039b8..c5b4f1ca30 100644
--- a/src/lib-storage/index/mbox/mbox-storage.c
+++ b/src/lib-storage/index/mbox/mbox-storage.c
@@ -591,22 +591,6 @@ mbox_alloc_mailbox(struct mbox_storage *storage, struct mail_index *index,
 
 	index_storage_mailbox_init(&mbox->ibox, name, flags,
 				   want_memory_indexes(storage, path));
-
-	if ((flags & MAILBOX_OPEN_KEEP_LOCKED) != 0) {
-		if (mbox_lock(mbox, F_WRLCK, &mbox->mbox_global_lock_id) <= 0) {
-			struct mailbox *box = &mbox->ibox.box;
-
-			mailbox_close(&box);
-			return NULL;
-		}
-
-		if (mbox->mbox_dotlock != NULL) {
-			mbox->keep_lock_to =
-				timeout_add(MBOX_LOCK_TOUCH_MSECS,
-					    mbox_lock_touch_timeout, mbox);
-		}
-	}
-
 	return mbox;
 }
 
@@ -640,6 +624,20 @@ mbox_open(struct mbox_storage *storage, const char *name,
 		if (strncmp(path, rootdir, strlen(rootdir)) != 0)
 			mbox->mbox_privileged_locking = TRUE;
 	}
+	if ((flags & MAILBOX_OPEN_KEEP_LOCKED) != 0) {
+		if (mbox_lock(mbox, F_WRLCK, &mbox->mbox_global_lock_id) <= 0) {
+			struct mailbox *box = &mbox->ibox.box;
+
+			mailbox_close(&box);
+			return NULL;
+		}
+
+		if (mbox->mbox_dotlock != NULL) {
+			mbox->keep_lock_to =
+				timeout_add(MBOX_LOCK_TOUCH_MSECS,
+					    mbox_lock_touch_timeout, mbox);
+		}
+	}
 	return &mbox->ibox.box;
 }