dovecot-1.1: mbox: pop3_lock_session=yes was broken with mail_pr...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/f03594a9e468
changeset: 8204:f03594a9e468
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Mar 15 17:48:21 2009 -0400
description:
mbox: pop3_lock_session=yes was broken with mail_privileged_group.

diffstat:

1 file changed, 3 insertions(+), 14 deletions(-)
src/lib-storage/index/mbox/mbox-lock.c |   17 +++--------------

diffs (27 lines):

diff -r eb9260685494 -r f03594a9e468 src/lib-storage/index/mbox/mbox-lock.c
--- a/src/lib-storage/index/mbox/mbox-lock.c	Fri Mar 13 18:56:11 2009 -0400
+++ b/src/lib-storage/index/mbox/mbox-lock.c	Sun Mar 15 17:48:21 2009 -0400
@@ -325,20 +325,9 @@ static int mbox_dotlock_privileged_op(st
 		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;
 	}