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 40c9f44e316989563a6823b198b61b1df6963eed..2f77e904b7624787b99f0ec24999f522666cdba5 100644 (file)
--- 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;
        }