From: Timo Sirainen <tss@iki.fi>
Date: Sun, 15 Mar 2009 21:48:03 +0000 (-0400)
Subject: mbox: pop3_lock_session=yes was broken with mail_privileged_group.
X-Git-Tag: 1.2.beta3~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ff28df76775a0740faa4370ec72d5a6a97534bf;p=thirdparty%2Fdovecot%2Fcore.git

mbox: pop3_lock_session=yes was broken with mail_privileged_group.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/mbox/mbox-lock.c b/src/lib-storage/index/mbox/mbox-lock.c
index 40c9f44e31..2f77e904b7 100644
--- a/src/lib-storage/index/mbox/mbox-lock.c
+++ b/src/lib-storage/index/mbox/mbox-lock.c
@@ -330,20 +330,9 @@ static int mbox_dotlock_privileged_op(struct mbox_mailbox *mbox,
 		mbox->mbox_used_privileges = FALSE;
 		break;
 	case MBOX_DOTLOCK_OP_TOUCH:
-		if (!file_dotlock_is_locked(mbox->mbox_dotlock)) {
-			if (file_dotlock_delete(&mbox->mbox_dotlock) < 0) {
-				mbox_set_syscall_error(mbox,
-						       "file_dotlock_delete()");
-			}
-			mbox->mbox_used_privileges = TRUE;
-			ret = -1;
-		} else {
-			ret = file_dotlock_touch(mbox->mbox_dotlock);
-			if (ret < 0) {
-				mbox_set_syscall_error(mbox,
-						       "file_dotlock_touch()");
-			}
-		}
+		ret = file_dotlock_touch(mbox->mbox_dotlock);
+		if (ret < 0)
+			mbox_set_syscall_error(mbox, "file_dotlock_touch()");
 		break;
 	}