Projects
Kolab:3.4
cyrus-imapd
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 50
View file
cyrus-imapd-2.5-acl-change-notifications.patch
Changed
@@ -1,35 +1,34 @@ -diff --git a/imap/mboxevent.c b/imap/mboxevent.c -index 5941c45..e5fb29a 100644 ---- a/imap/mboxevent.c -+++ b/imap/mboxevent.c -@@ -73,7 +73,7 @@ - EVENT_MESSAGE_TRASH) +diff -ur cyrus-imapd-2.5.orig/imap/mboxevent.c cyrus-imapd-2.5/imap/mboxevent.c +--- cyrus-imapd-2.5.orig/imap/mboxevent.c 2014-01-17 15:43:56.000000000 +0100 ++++ cyrus-imapd-2.5/imap/mboxevent.c 2014-03-06 12:36:31.355620912 +0100 +@@ -77,7 +77,7 @@ #define MAILBOX_EVENTS (EVENT_MAILBOX_CREATE|EVENT_MAILBOX_DELETE|\ -- EVENT_MAILBOX_RENAME) -+ EVENT_MAILBOX_RENAME|EVENT_ACL_CHANGE) + EVENT_MAILBOX_RENAME|EVENT_MAILBOX_SUBSCRIBE|\ +- EVENT_MAILBOX_UNSUBSCRIBE) ++ EVENT_MAILBOX_UNSUBSCRIBE|EVENT_ACL_CHANGE) - #define SUBS_EVENTS (EVENT_MAILBOX_SUBSCRIBE|EVENT_MAILBOX_UNSUBSCRIBE) + #define QUOTA_EVENTS (EVENT_QUOTA_EXCEED|EVENT_QUOTA_WITHIN|EVENT_QUOTA_CHANGE) -@@ -124,6 +124,8 @@ static struct mboxevent event_template = - { EVENT_PID, "pid", EVENT_PARAM_INT, 0, 0 }, - { EVENT_USER, "user", EVENT_PARAM_STRING, 0, 0 }, - { EVENT_MESSAGE_SIZE, "messageSize", EVENT_PARAM_INT, 0, 0 }, +@@ -124,6 +124,8 @@ + { EVENT_CONVEXISTS, "vnd.fastmail.convExists", EVENT_PARAM_INT, 0, 0 }, + { EVENT_CONVUNSEEN, "vnd.fastmail.convUnseen", EVENT_PARAM_INT, 0, 0 }, + { EVENT_UIDNEXT, "uidnext", EVENT_PARAM_INT, 0, 0 }, + { EVENT_ACL_SUBJECT, "aclSubject", EVENT_PARAM_STRING, 0, 0 }, + { EVENT_ACL_RIGHTS, "aclRights", EVENT_PARAM_STRING, 0, 0 }, - /* always at end to let the parser to easily truncate this part */ - { EVENT_ENVELOPE, "vnd.cmu.envelope", EVENT_PARAM_STRING, 0, 0 }, - { EVENT_BODYSTRUCTURE, "bodyStructure", EVENT_PARAM_STRING, 0, 0 }, -@@ -174,7 +176,7 @@ EXPORTED void mboxevent_init(void) + { EVENT_UIDSET, "uidset", EVENT_PARAM_STRING, 0, 0 }, + { EVENT_MIDSET, "vnd.cmu.midset", EVENT_PARAM_STRING, 0, 0 }, + { EVENT_FLAG_NAMES, "flagNames", EVENT_PARAM_STRING, 0, 0 }, +@@ -186,7 +188,7 @@ enabled_events |= FLAGS_EVENTS; if (groups & IMAP_ENUM_EVENT_GROUPS_ACCESS) - enabled_events |= (EVENT_LOGIN|EVENT_LOGOUT); + enabled_events |= (EVENT_LOGIN|EVENT_LOGOUT|EVENT_ACL_CHANGE); - if (groups & IMAP_ENUM_EVENT_GROUPS_SUBSCRIPTION) - enabled_events |= SUBS_EVENTS; -@@ -381,6 +383,10 @@ static int mboxevent_expected_param(enum event_type type, enum event_param param + if (groups & IMAP_ENUM_EVENT_GROUPS_MAILBOX) + enabled_events |= MAILBOX_EVENTS; +@@ -411,6 +413,10 @@ return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_SERVICE; case EVENT_TIMESTAMP: return extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_TIMESTAMP; @@ -40,29 +39,7 @@ case EVENT_UIDNEXT: if (!(extra_params & IMAP_ENUM_EVENT_EXTRA_PARAMS_UIDNEXT)) return 0; -@@ -639,8 +645,9 @@ EXPORTED void mboxevent_set_access(struct mboxevent *event, - if (userid && mboxevent_expected_param(event->type, EVENT_USER)) { - /* translate any separators in user */ - userbuf = xstrdup(userid); -- mboxname_hiersep_toexternal(&namespace, userbuf, -- config_virtdomains ? strcspn(userbuf, "@") : 0); -+ if (userbuf != NULL) -+ mboxname_hiersep_toexternal(&namespace, userbuf, -+ config_virtdomains ? strcspn(userbuf, "@") : 0); - FILL_STRING_PARAM(event, EVENT_USER, userbuf); - } - } -@@ -837,7 +844,8 @@ void mboxevent_extract_quota(struct mboxevent *event, const struct quota *quota, - /* translate any separators in user */ - userbuf = (char *)mboxname_to_userid(quota->root); - if (userbuf != NULL) -- mboxname_hiersep_toexternal(&namespace, userbuf, -+ if (userbuf != NULL) -+ mboxname_hiersep_toexternal(&namespace, userbuf, - config_virtdomains ? strcspn(userbuf, "@") : 0); - - memset(&imapurl, 0, sizeof(struct imapurl)); -@@ -867,6 +875,16 @@ EXPORTED void mboxevent_set_numunseen(struct mboxevent *event, +@@ -943,6 +949,16 @@ EXPORTED void mboxevent_extract_mailbox(struct mboxevent *event, struct mailbox *mailbox) @@ -79,17 +56,7 @@ { struct imapurl imapurl; char url[MAX_MAILBOX_PATH+1]; -@@ -957,7 +975,8 @@ void mboxevent_extract_old_mailbox(struct mboxevent *event, - /* translate any separators in user */ - userbuf = (char *)mboxname_to_userid(mailbox->name); - if (userbuf != NULL) -- mboxname_hiersep_toexternal(&namespace, userbuf, -+ if (userbuf != NULL) -+ mboxname_hiersep_toexternal(&namespace, userbuf, - config_virtdomains ? strcspn(userbuf, "@") : 0); - - memset(&imapurl, 0, sizeof(struct imapurl)); -@@ -1013,6 +1032,8 @@ static const char *event_to_name(enum event_type type) +@@ -1119,6 +1135,8 @@ return "MailboxSubscribe"; case EVENT_MAILBOX_UNSUBSCRIBE: return "MailboxUnSubscribe"; @@ -98,7 +65,7 @@ default: fatal("Unknown message event", EC_SOFTWARE); } -@@ -1212,6 +1233,12 @@ EXPORTED void mboxevent_set_access(struct mboxevent *event __attribute__((unused +@@ -1322,6 +1340,12 @@ { } @@ -111,28 +78,22 @@ EXPORTED void mboxevent_extract_record(struct mboxevent *event __attribute__((unused)), struct mailbox *mailbox __attribute__((unused)), struct index_record *record __attribute__((unused))) -diff --git a/imap/mboxevent.h b/imap/mboxevent.h -index 833b8da..8e5d1f8 100644 ---- a/imap/mboxevent.h -+++ b/imap/mboxevent.h -@@ -79,13 +79,14 @@ enum event_type { - EVENT_MAILBOX_DELETE = (1<<16), +Only in cyrus-imapd-2.5/imap: mboxevent.c.orig +Only in cyrus-imapd-2.5/imap: mboxevent.c.rej +diff -ur cyrus-imapd-2.5.orig/imap/mboxevent.h cyrus-imapd-2.5/imap/mboxevent.h +--- cyrus-imapd-2.5.orig/imap/mboxevent.h 2014-01-17 15:43:56.000000000 +0100 ++++ cyrus-imapd-2.5/imap/mboxevent.h 2014-03-06 12:38:43.101620707 +0100 +@@ -80,7 +80,8 @@ EVENT_MAILBOX_RENAME = (1<<17), EVENT_MAILBOX_SUBSCRIBE = (1<<18), -- EVENT_MAILBOX_UNSUBSCRIBE = (1<<19) -+ EVENT_MAILBOX_UNSUBSCRIBE = (1<<19), -+ EVENT_ACL_CHANGE = (1<<20) + EVENT_MAILBOX_UNSUBSCRIBE = (1<<19), +- EVENT_CALENDAR = (1<<20) ++ EVENT_CALENDAR = (1<<20), ++ EVENT_ACL_CHANGE = (1<<21) }; - /* The number representing the last available position in - * event_param, which should always be messageContent. - */ --#define MAX_PARAM 23 -+#define MAX_PARAM 26 - /* - * event parameters defined in RFC 5423 - Internet Message Store Events -@@ -110,6 +111,8 @@ enum event_param { +@@ -108,6 +109,8 @@ EVENT_UIDNEXT, EVENT_UIDSET, EVENT_MIDSET, @@ -141,7 +102,7 @@ EVENT_FLAG_NAMES, EVENT_PID, EVENT_USER, -@@ -212,6 +215,13 @@ void mboxevent_add_flag(struct mboxevent *event, const char *flag); +@@ -219,6 +222,13 @@ void mboxevent_set_access(struct mboxevent *event, const char *serveraddr, const char *clientaddr, const char *userid, const char *mailboxname); @@ -155,11 +116,12 @@ /* * Extract data from the given record to fill these event parameters : * - uidset from UID -diff --git a/imap/mboxlist.c b/imap/mboxlist.c -index ff73f9d..403aeb9 100644 ---- a/imap/mboxlist.c -+++ b/imap/mboxlist.c -@@ -1824,6 +1824,15 @@ EXPORTED int mboxlist_setacl(struct namespace *namespace, const char *name, +Only in cyrus-imapd-2.5/imap: mboxevent.h.orig +Only in cyrus-imapd-2.5/imap: mboxevent.h.rej +diff -ur cyrus-imapd-2.5.orig/imap/mboxlist.c cyrus-imapd-2.5/imap/mboxlist.c +--- cyrus-imapd-2.5.orig/imap/mboxlist.c 2014-01-17 15:43:56.000000000 +0100 ++++ cyrus-imapd-2.5/imap/mboxlist.c 2014-03-06 12:35:43.266620528 +0100 +@@ -1841,6 +1841,15 @@ name, cyrusdb_strerror(r)); r = IMAP_IOERROR; } @@ -175,3 +137,4 @@ } /* 4. Change backup copy (cyrus.header) */ +Only in cyrus-imapd-2.5/imap: mboxlist.c.orig
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.