Merged changes from v2.1 tree.

diff --cc src/auth/auth-request.c
Simple merge

diff --cc src/auth/db-ldap.c
Simple merge

diff --cc src/director/director-connection.c
Simple merge

diff --cc src/doveadm/doveadm-log.c
index 705337cd43d4a86d7da8ae53b7ce2344541ffb25,4d0b5859b5bb5cfd012916a61554ad64d3acd984..225f603771bd3dc9ef45321486307468b05077ca
--- 1/src/doveadm/doveadm-log.c
--- 2/src/doveadm/doveadm-log.c
+++ b/src/doveadm/doveadm-log.c
@@@ -23,8 -23,9 +23,10 @@@
  #define LOG_ERRORS_FNAME "log-errors"
  #define LOG_TIMESTAMP_FORMAT "%b %d %H:%M:%S"
  
 -static void cmd_log_test(int argc ATTR_UNUSED, char *argv[] ATTR_UNUSED)
+ extern struct doveadm_cmd doveadm_cmd_log[];
+ 
 +static void ATTR_NULL(2)
 +cmd_log_test(int argc ATTR_UNUSED, char *argv[] ATTR_UNUSED)
  {
        struct failure_context ctx;
        unsigned int i;

diff --cc src/lib-index/mail-transaction-log-file.c
Simple merge

diff --cc src/lib-master/master-instance.c
index 3cfd0fe699fd239f23940e8473339659b4d71a6f,f2873e919518c1053d7e854f3146386657c222ae..b9d2c9ef53fed304e44f95ee486846a58602eb1f
--- 1/src/lib-master/master-instance.c
--- 2/src/lib-master/master-instance.c
+++ b/src/lib-master/master-instance.c
@@@ -144,9 -171,10 +171,10 @@@ static int master_instance_write_init(s
                return -1;
        }
        if (master_instance_list_refresh(list) < 0) {
 -              (void)file_dotlock_delete(dotlock_r);
 +              file_dotlock_delete(dotlock_r);
                return -1;
        }
+       list->locked = TRUE;
        return fd;
  }
  
@@@ -159,15 -189,18 +189,18 @@@ static int master_instance_write_finish
        T_BEGIN {
                ret = master_instance_list_write(list, fd, lock_path);
        } T_END;
+ 
+       list->locked = FALSE;
        if (ret < 0) {
 -              (void)file_dotlock_delete(dotlock);
 +              file_dotlock_delete(dotlock);
                return -1;
        }
        if (fdatasync(fd) < 0) {
                i_error("fdatasync(%s) failed: %m", lock_path);
 -              (void)file_dotlock_delete(dotlock);
 +              file_dotlock_delete(dotlock);
                return -1;
        }
+       list->config_paths_changed = FALSE;
        return file_dotlock_replace(dotlock, 0);
  }
  
@@@ -222,7 -256,8 +256,8 @@@ int master_instance_list_set_name(struc
        if (orig_inst != NULL &&
            strcmp(orig_inst->base_dir, base_dir) != 0) {
                /* name already used */
 -              (void)file_dotlock_delete(&dotlock);
 +              file_dotlock_delete(&dotlock);
+               list->locked = FALSE;
                return 0;
        }
  
@@@ -257,7 -292,8 +292,8 @@@ int master_instance_list_remove(struct 
        }
  
        if (i == count) {
 -              (void)file_dotlock_delete(&dotlock);
 +              file_dotlock_delete(&dotlock);
+               list->locked = FALSE;
                return 0;
        }
        return master_instance_write_finish(list, fd, &dotlock) < 0 ? -1 : 1;

diff --cc src/lib-master/master-service.c
Simple merge

diff --cc src/lib-storage/index/dbox-multi/mdbox-map.c
Simple merge

diff --cc src/lib-storage/index/imapc/imapc-mailbox.c
Simple merge

diff --cc src/lib-storage/index/imapc/imapc-storage.c
Simple merge

diff --cc src/lib-storage/index/mbox/mbox-mail.c
Simple merge

diff --cc src/lib-storage/index/shared/shared-list.c
Simple merge

diff --cc src/plugins/quota/quota-maildir.c
Simple merge

diff --cc src/plugins/quota/quota.c
index a71486d40cb5b561a082904558e530201103050b,bc7655ad4d4aebb8e71b05c506b1367bd9c22590..221e606f49a3f623fd2aaceaf465f1574a0e5891
--- 1/src/plugins/quota/quota.c
--- 2/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@@ -636,9 -637,9 +636,9 @@@ void quota_add_user_namespace(struct qu
        if (path != NULL) {
                namespaces = array_get(&quota->namespaces, &count);
                for (i = 0; i < count; i++) {
 -                      path2 = mailbox_list_get_path(namespaces[i]->list, NULL,
 +                      path2 = mailbox_list_get_root_path(namespaces[i]->list,
                                        MAILBOX_LIST_PATH_TYPE_MAILBOX);
-                       if (strcmp(path, path2) == 0) {
+                       if (path2 != NULL && strcmp(path, path2) == 0) {
                                /* duplicate */
                                return;
                        }