Mercurial > dovecot > original-hg > dovecot-1.2
comparison src/deliver/deliver.c @ 8085:bf83aa9c3f4a HEAD
Removed pool parameter from mail_namespaces_init*(). Use mail_user's pool intead.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Tue, 12 Aug 2008 14:54:27 -0400 |
parents | db66611fd195 |
children | 6665a641780c |
comparison
equal
deleted
inserted
replaced
8084:f12f8c1da0bf | 8085:bf83aa9c3f4a |
---|---|
785 struct istream *input; | 785 struct istream *input; |
786 struct mailbox_transaction_context *t; | 786 struct mailbox_transaction_context *t; |
787 struct mailbox_header_lookup_ctx *headers_ctx; | 787 struct mailbox_header_lookup_ctx *headers_ctx; |
788 struct mail *mail; | 788 struct mail *mail; |
789 uid_t process_euid; | 789 uid_t process_euid; |
790 pool_t namespace_pool; | |
791 bool stderr_rejection = FALSE; | 790 bool stderr_rejection = FALSE; |
792 bool keep_environment = FALSE; | 791 bool keep_environment = FALSE; |
793 bool user_auth = FALSE; | 792 bool user_auth = FALSE; |
794 time_t mtime; | 793 time_t mtime; |
795 int i, ret; | 794 int i, ret; |
1000 mail_storage_register_all(); | 999 mail_storage_register_all(); |
1001 mailbox_list_register_all(); | 1000 mailbox_list_register_all(); |
1002 | 1001 |
1003 module_dir_init(modules); | 1002 module_dir_init(modules); |
1004 | 1003 |
1005 namespace_pool = pool_alloconly_create("namespaces", 1024); | |
1006 mail_user = mail_user_init(user, home); | 1004 mail_user = mail_user_init(user, home); |
1007 if (mail_namespaces_init(namespace_pool, mail_user) < 0) | 1005 if (mail_namespaces_init(mail_user) < 0) |
1008 i_fatal("Namespace initialization failed"); | 1006 i_fatal("Namespace initialization failed"); |
1009 | 1007 |
1010 /* create a separate mail user for the internal namespace */ | 1008 /* create a separate mail user for the internal namespace */ |
1011 raw_mail_user = mail_user_init(user, NULL); | 1009 raw_mail_user = mail_user_init(user, NULL); |
1012 raw_ns = mail_namespaces_init_empty(namespace_pool, raw_mail_user); | 1010 raw_ns = mail_namespaces_init_empty(raw_mail_user); |
1013 raw_ns->flags |= NAMESPACE_FLAG_INTERNAL; | 1011 raw_ns->flags |= NAMESPACE_FLAG_INTERNAL; |
1014 | 1012 |
1015 if (mail_storage_create(raw_ns, "raw", "/tmp", | 1013 if (mail_storage_create(raw_ns, "raw", "/tmp", |
1016 MAIL_STORAGE_FLAG_FULL_FS_ACCESS, | 1014 MAIL_STORAGE_FLAG_FULL_FS_ACCESS, |
1017 FILE_LOCK_METHOD_FCNTL, &errstr) < 0) | 1015 FILE_LOCK_METHOD_FCNTL, &errstr) < 0) |