dovecot-2.2: lib-master: Fixed assert crash in some situations a...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/c58a27eecdd4
changeset: 14655:c58a27eecdd4
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Jun 13 16:29:37 2012 +0300
description:
lib-master: Fixed assert crash in some situations after updating instance name.

diffstat:

 src/lib-master/master-instance.c |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diffs (19 lines):

diff -r 4c31e450a867 -r c58a27eecdd4 src/lib-master/master-instance.c
--- a/src/lib-master/master-instance.c	Wed Jun 13 15:34:39 2012 +0300
+++ b/src/lib-master/master-instance.c	Wed Jun 13 16:29:37 2012 +0300
@@ -257,6 +257,7 @@
 	    strcmp(orig_inst->base_dir, base_dir) != 0) {
 		/* name already used */
 		(void)file_dotlock_delete(&dotlock);
+		list->locked = FALSE;
 		return 0;
 	}
 
@@ -292,6 +293,7 @@
 
 	if (i == count) {
 		(void)file_dotlock_delete(&dotlock);
+		list->locked = FALSE;
 		return 0;
 	}
 	return master_instance_write_finish(list, fd, &dotlock) < 0 ? -1 : 1;