Mercurial > dovecot > core-2.2
diff src/plugins/lazy-expunge/lazy-expunge-plugin.c @ 12630:82f984d7a241
lib-storage: Merged returning dir mode into mailbox_list_get_[root_]permissions().
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Tue, 01 Feb 2011 20:59:21 +0200 |
| parents | b748c622e896 |
| children | 447bce266022 |
line wrap: on
line diff
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c Tue Feb 01 20:41:54 2011 +0200 +++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c Tue Feb 01 20:59:21 2011 +0200 @@ -235,14 +235,15 @@ struct mailbox *dest_box; const char *dir, *origin; enum mail_error error; - mode_t mode; + mode_t file_mode, dir_mode; gid_t gid; int ret; /* make sure the destination root directory exists */ - mailbox_list_get_root_dir_permissions(dest_list, &mode, &gid, &origin); + mailbox_list_get_root_permissions(dest_list, &file_mode, &dir_mode, + &gid, &origin); dir = mailbox_list_get_path(dest_list, NULL, MAILBOX_LIST_PATH_TYPE_DIR); - if (mkdir_parents_chgrp(dir, mode, gid, origin) < 0 && + if (mkdir_parents_chgrp(dir, dir_mode, gid, origin) < 0 && errno != EEXIST) { mail_storage_set_critical(src_box->storage, "mkdir_parents(%s) failed: %m", dir);