mailbox-list.c (dovecot-2.3.16) | : | mailbox-list.c (dovecot-2.3.17) | ||
---|---|---|---|---|
skipping to change at line 2055 | skipping to change at line 2055 | |||
int mailbox_list_init_fs(struct mailbox_list *list, struct event *event_parent, | int mailbox_list_init_fs(struct mailbox_list *list, struct event *event_parent, | |||
const char *driver, | const char *driver, | |||
const char *args, const char *root_dir, | const char *args, const char *root_dir, | |||
struct fs **fs_r, const char **error_r) | struct fs **fs_r, const char **error_r) | |||
{ | { | |||
struct fs_settings fs_set; | struct fs_settings fs_set; | |||
struct ssl_iostream_settings ssl_set; | struct ssl_iostream_settings ssl_set; | |||
struct mailbox_list_fs_context *ctx; | struct mailbox_list_fs_context *ctx; | |||
struct fs *parent_fs; | struct fs *parent_fs; | |||
i_zero(&ssl_set); | ||||
i_zero(&fs_set); | i_zero(&fs_set); | |||
mail_user_init_fs_settings(list->ns->user, &fs_set, &ssl_set); | mail_user_init_fs_settings(list->ns->user, &fs_set, &ssl_set); | |||
/* fs_set.event_parent points to user->event by default */ | /* fs_set.event_parent points to user->event by default */ | |||
if (event_parent != NULL) | if (event_parent != NULL) | |||
fs_set.event_parent = event_parent; | fs_set.event_parent = event_parent; | |||
fs_set.root_path = root_dir; | fs_set.root_path = root_dir; | |||
fs_set.temp_file_prefix = mailbox_list_get_global_temp_prefix(list); | fs_set.temp_file_prefix = mailbox_list_get_global_temp_prefix(list); | |||
if (fs_init(driver, args, &fs_set, fs_r, error_r) < 0) | if (fs_init(driver, args, &fs_set, fs_r, error_r) < 0) | |||
return -1; | return -1; | |||
skipping to change at line 2109 | skipping to change at line 2108 | |||
if (list->lock_refcount > 0) { | if (list->lock_refcount > 0) { | |||
list->lock_refcount++; | list->lock_refcount++; | |||
return 0; | return 0; | |||
} | } | |||
mailbox_list_get_root_permissions(list, &perm); | mailbox_list_get_root_permissions(list, &perm); | |||
i_zero(&set); | i_zero(&set); | |||
set.lock_timeout_secs = list->mail_set->mail_max_lock_timeout == 0 ? | set.lock_timeout_secs = list->mail_set->mail_max_lock_timeout == 0 ? | |||
MAILBOX_LIST_LOCK_SECS : | MAILBOX_LIST_LOCK_SECS : | |||
I_MIN(MAILBOX_LIST_LOCK_SECS, list->mail_set->mail_max_lock_timeo ut); | I_MIN(MAILBOX_LIST_LOCK_SECS, list->mail_set->mail_max_lock_timeo ut); | |||
set.lock_method = list->mail_set->parsed_lock_method; | set.lock_settings.lock_method = list->mail_set->parsed_lock_method; | |||
set.mode = perm.file_create_mode; | set.mode = perm.file_create_mode; | |||
set.gid = perm.file_create_gid; | set.gid = perm.file_create_gid; | |||
set.gid_origin = perm.file_create_gid_origin; | set.gid_origin = perm.file_create_gid_origin; | |||
lock_fname = MAILBOX_LIST_LOCK_FNAME; | lock_fname = MAILBOX_LIST_LOCK_FNAME; | |||
if (list->set.volatile_dir != NULL) { | if (list->set.volatile_dir != NULL) { | |||
/* Use VOLATILEDIR. It's shared with all mailbox_lists, so use | /* Use VOLATILEDIR. It's shared with all mailbox_lists, so use | |||
hash of the namespace prefix as a way to make this lock name | hash of the namespace prefix as a way to make this lock name | |||
unique across the namespaces. */ | unique across the namespaces. */ | |||
unsigned char ns_prefix_hash[SHA1_RESULTLEN]; | unsigned char ns_prefix_hash[SHA1_RESULTLEN]; | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 1 lines changed or added |