Mercurial > dovecot > original-hg > dovecot-1.2
changeset 8465:027a61241ebb HEAD
Added namespace owner username to struct mail_namespace.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Fri, 21 Nov 2008 17:41:30 +0200 |
parents | 75d2b3b5b367 |
children | 4553e28eb4f5 |
files | src/lib-storage/index/shared/shared-storage.c src/lib-storage/mail-namespace.c src/lib-storage/mail-namespace.h |
diffstat | 3 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/index/shared/shared-storage.c Fri Nov 21 17:21:56 2008 +0200 +++ b/src/lib-storage/index/shared/shared-storage.c Fri Nov 21 17:41:30 2008 +0200 @@ -269,6 +269,7 @@ ns->type = NAMESPACE_SHARED; ns->user = user; ns->prefix = i_strdup(str_c(prefix)); + ns->owner = i_strdup(userdomain); ns->flags = NAMESPACE_FLAG_LIST_PREFIX | NAMESPACE_FLAG_HIDDEN | NAMESPACE_FLAG_AUTOCREATED; ns->sep = _storage->ns->sep;
--- a/src/lib-storage/mail-namespace.c Fri Nov 21 17:21:56 2008 +0200 +++ b/src/lib-storage/mail-namespace.c Fri Nov 21 17:41:30 2008 +0200 @@ -29,6 +29,7 @@ static void mail_namespace_free(struct mail_namespace *ns) { + i_free(ns->owner); i_free(ns->prefix); i_free(ns); } @@ -60,9 +61,10 @@ if (getenv(t_strdup_printf("NAMESPACE_%u_SUBSCRIPTIONS", num)) != NULL) ns->flags |= NAMESPACE_FLAG_SUBSCRIPTIONS; - if (type == NULL || *type == '\0' || strncmp(type, "private", 7) == 0) + if (type == NULL || *type == '\0' || strncmp(type, "private", 7) == 0) { ns->type = NAMESPACE_PRIVATE; - else if (strncmp(type, "shared", 6) == 0) + ns->owner = i_strdup(user->username); + } else if (strncmp(type, "shared", 6) == 0) ns->type = NAMESPACE_SHARED; else if (strncmp(type, "public", 6) == 0) ns->type = NAMESPACE_PUBLIC; @@ -242,6 +244,7 @@ } ns = i_new(struct mail_namespace, 1); + ns->owner = i_strdup(user->username); ns->type = NAMESPACE_PRIVATE; ns->flags = NAMESPACE_FLAG_INBOX | NAMESPACE_FLAG_LIST_PREFIX | NAMESPACE_FLAG_SUBSCRIPTIONS; @@ -277,6 +280,7 @@ ns = i_new(struct mail_namespace, 1); ns->user = user; ns->prefix = i_strdup(""); + ns->owner = i_strdup(user->username); ns->flags = NAMESPACE_FLAG_INBOX | NAMESPACE_FLAG_LIST_PREFIX | NAMESPACE_FLAG_SUBSCRIPTIONS; user->namespaces = ns;
--- a/src/lib-storage/mail-namespace.h Fri Nov 21 17:21:56 2008 +0200 +++ b/src/lib-storage/mail-namespace.h Fri Nov 21 17:41:30 2008 +0200 @@ -38,7 +38,7 @@ char sep, real_sep, sep_str[3]; enum namespace_flags flags; - char *prefix; + char *prefix, *owner; size_t prefix_len; struct mail_user *user;