Projects
Kolab:3.4
cyrus-imapd
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 129
View file
cyrus-imapd.spec
Changed
@@ -38,13 +38,13 @@ Name: cyrus-imapd Summary: A high-performance mail server with IMAP, POP3, NNTP and SIEVE support Version: 2.5 -Release: 0.2.dev20141122.git790df515%{?dist} +Release: 0.2.dev20141123.git631aa71c%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.cyrusimap.org # Upstream sources -# From 790df515eedd8be0050b14bfb7ab471c6ab9c6d3 +# From 631aa71cf5fe686563ae1d7e740a5cc76d0bf75f Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus/%{_name}-%{real_version}%{?dot_snapshot_version}.tar.gz Source1: cyrus-imapd.imap-2.3.x-conf Source2: cyrus-imapd.cvt_cyrusdb_all @@ -68,7 +68,7 @@ ## Patch0001: cyrus-imapd-2.5-ctl_mboxlist-mbtype.patch -Patch0002: working-diff.patch +Patch0002: cyrus-imapd-2.5-revert-skiplist.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
View file
cyrus-imapd-2.5-default-skiplist.patch
Deleted
@@ -1,89 +0,0 @@ -diff --git a/lib/imapoptions b/lib/imapoptions -index fedc695..597e1c4 100644 ---- a/lib/imapoptions -+++ b/lib/imapoptions -@@ -169,7 +169,7 @@ are listed with ``<none>''. - affect LMTP delivery of messages directly to mailboxes via - plus-addressing. */ - --{ "annotation_db", "twoskip", STRINGLIST("berkeley", "berkeley-hash", "skiplist", "twoskip")} -+{ "annotation_db", "skiplist", STRINGLIST("berkeley", "berkeley-hash", "skiplist", "twoskip")} - /* The cyrusdb backend to use for mailbox annotations. */ - - { "annotation_db_path", NULL, STRING } -@@ -508,7 +508,7 @@ Blank lines and lines beginning with ``#'' are ignored. - specifies the actual key used for iSchedule DKIM signing within the - domain. */ - --{ "duplicate_db", "twoskip", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip")} -+{ "duplicate_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip")} - /* The cyrusdb backend to use for the duplicate delivery suppression - and sieve. */ - -@@ -1013,10 +1013,10 @@ Blank lines and lines beginning with ``#'' are ignored. - { "maxword", 131072, INT } - /* Maximum size of a single word for the parser. Default 128k */ - --{ "mboxkey_db", "twoskip", STRINGLIST("berkeley", "skiplist", "twoskip") } -+{ "mboxkey_db", "skiplist", STRINGLIST("berkeley", "skiplist", "twoskip") } - /* The cyrusdb backend to use for mailbox keys. */ - --{ "mboxlist_db", "twoskip", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql", "twoskip")} -+{ "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql", "twoskip")} - /* The cyrusdb backend to use for the mailbox list. */ - - { "mboxlist_db_path", NULL, STRING } -@@ -1376,7 +1376,7 @@ If all partitions are over that limit, this feature is not used anymore. - /* Unix domain socket that ptloader listens on. - (defaults to configdir/ptclient/ptsock) */ - --{ "ptscache_db", "twoskip", STRINGLIST("berkeley", "berkeley-hash", "skiplist", "twoskip")} -+{ "ptscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-hash", "skiplist", "twoskip")} - /* The cyrusdb backend to use for the pts cache. */ - - { "ptscache_db_path", NULL, STRING } -@@ -1401,7 +1401,7 @@ If all partitions are over that limit, this feature is not used anymore. - /* This specifies the Class Selector or Differentiated Services Code Point - designation on IP headers (in the ToS field). */ - --{ "quota_db", "twoskip", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql", "quotalegacy", "twoskip")} -+{ "quota_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql", "quotalegacy", "twoskip")} - /* The cyrusdb backend to use for quotas. */ - - { "quota_db_path", NULL, STRING } -@@ -1521,7 +1521,7 @@ If all partitions are over that limit, this feature is not used anymore. - recommended for most cases - it's a good compromise which - keeps words separate. */ - --{ "seenstate_db", "twoskip", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "twoskip")} -+{ "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "twoskip")} - /* The cyrusdb backend to use for the seen state. */ - - { "sendmail", "/usr/lib/sendmail", STRING } -@@ -1715,7 +1715,7 @@ product version in the capabilities */ - { "statuscache", 0, SWITCH } - /* Enable/disable the imap status cache. */ - --{ "statuscache_db", "twoskip", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip") } -+{ "statuscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip") } - /* The cyrusdb backend to use for the imap status cache. */ - - { "statuscache_db_path", NULL, STRING } -@@ -1880,7 +1880,7 @@ product version in the capabilities */ - /* File containing the private key belonging to the certificate in - tls_server_cert. */ - --{ "tls_sessions_db", "twoskip", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip")} -+{ "tls_sessions_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip")} - /* The cyrusdb backend to use for the TLS cache. */ - - { "tls_sessions_db_path", NULL, STRING } -@@ -1944,7 +1944,7 @@ product version in the capabilities */ - this user. NOTE: This must be an existing local user name with an - INBOX, NOT an email address! */ - --{ "zoneinfo_db", "twoskip", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "twoskip")} -+{ "zoneinfo_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "twoskip")} - /* The cyrusdb backend to use for zoneinfo. */ - - { "zoneinfo_db_path", NULL, STRING }
View file
cyrus-imapd-2.5-revert-safe-skiplist.patch
Changed
@@ -429,3 +429,92 @@ return r; } +diff --git a/lib/imapoptions b/lib/imapoptions +index fedc695..597e1c4 100644 +--- a/lib/imapoptions ++++ b/lib/imapoptions +@@ -169,7 +169,7 @@ are listed with ``<none>''. + affect LMTP delivery of messages directly to mailboxes via + plus-addressing. */ + +-{ "annotation_db", "twoskip", STRINGLIST("berkeley", "berkeley-hash", "skiplist", "twoskip")} ++{ "annotation_db", "skiplist", STRINGLIST("berkeley", "berkeley-hash", "skiplist", "twoskip")} + /* The cyrusdb backend to use for mailbox annotations. */ + + { "annotation_db_path", NULL, STRING } +@@ -508,7 +508,7 @@ Blank lines and lines beginning with ``#'' are ignored. + specifies the actual key used for iSchedule DKIM signing within the + domain. */ + +-{ "duplicate_db", "twoskip", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip")} ++{ "duplicate_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip")} + /* The cyrusdb backend to use for the duplicate delivery suppression + and sieve. */ + +@@ -1013,10 +1013,10 @@ Blank lines and lines beginning with ``#'' are ignored. + { "maxword", 131072, INT } + /* Maximum size of a single word for the parser. Default 128k */ + +-{ "mboxkey_db", "twoskip", STRINGLIST("berkeley", "skiplist", "twoskip") } ++{ "mboxkey_db", "skiplist", STRINGLIST("berkeley", "skiplist", "twoskip") } + /* The cyrusdb backend to use for mailbox keys. */ + +-{ "mboxlist_db", "twoskip", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql", "twoskip")} ++{ "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql", "twoskip")} + /* The cyrusdb backend to use for the mailbox list. */ + + { "mboxlist_db_path", NULL, STRING } +@@ -1376,7 +1376,7 @@ If all partitions are over that limit, this feature is not used anymore. + /* Unix domain socket that ptloader listens on. + (defaults to configdir/ptclient/ptsock) */ + +-{ "ptscache_db", "twoskip", STRINGLIST("berkeley", "berkeley-hash", "skiplist", "twoskip")} ++{ "ptscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-hash", "skiplist", "twoskip")} + /* The cyrusdb backend to use for the pts cache. */ + + { "ptscache_db_path", NULL, STRING } +@@ -1401,7 +1401,7 @@ If all partitions are over that limit, this feature is not used anymore. + /* This specifies the Class Selector or Differentiated Services Code Point + designation on IP headers (in the ToS field). */ + +-{ "quota_db", "twoskip", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql", "quotalegacy", "twoskip")} ++{ "quota_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql", "quotalegacy", "twoskip")} + /* The cyrusdb backend to use for quotas. */ + + { "quota_db_path", NULL, STRING } +@@ -1521,7 +1521,7 @@ If all partitions are over that limit, this feature is not used anymore. + recommended for most cases - it's a good compromise which + keeps words separate. */ + +-{ "seenstate_db", "twoskip", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "twoskip")} ++{ "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "twoskip")} + /* The cyrusdb backend to use for the seen state. */ + + { "sendmail", "/usr/lib/sendmail", STRING } +@@ -1715,7 +1715,7 @@ product version in the capabilities */ + { "statuscache", 0, SWITCH } + /* Enable/disable the imap status cache. */ + +-{ "statuscache_db", "twoskip", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip") } ++{ "statuscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip") } + /* The cyrusdb backend to use for the imap status cache. */ + + { "statuscache_db_path", NULL, STRING } +@@ -1880,7 +1880,7 @@ product version in the capabilities */ + /* File containing the private key belonging to the certificate in + tls_server_cert. */ + +-{ "tls_sessions_db", "twoskip", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip")} ++{ "tls_sessions_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql", "twoskip")} + /* The cyrusdb backend to use for the TLS cache. */ + + { "tls_sessions_db_path", NULL, STRING } +@@ -1944,7 +1944,7 @@ product version in the capabilities */ + this user. NOTE: This must be an existing local user name with an + INBOX, NOT an email address! */ + +-{ "zoneinfo_db", "twoskip", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "twoskip")} ++{ "zoneinfo_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "twoskip")} + /* The cyrusdb backend to use for zoneinfo. */ + + { "zoneinfo_db_path", NULL, STRING }
View file
working-diff.patch
Deleted
@@ -1,747 +0,0 @@ -diff --git a/imap/append.c b/imap/append.c -index d670d7a..ad94e4d 100644 ---- a/imap/append.c -+++ b/imap/append.c -@@ -1012,7 +1012,7 @@ out: - * present in body structure ? */ - mboxevent_extract_record(mboxevent, mailbox, &record); - mboxevent_extract_mailbox(mboxevent, mailbox); -- mboxevent_set_access(mboxevent, NULL, NULL, as->userid, as->mailbox->name); -+ mboxevent_set_access(mboxevent, NULL, NULL, as->userid, as->mailbox->name, 1); - mboxevent_set_numunseen(mboxevent, mailbox, -1); - - return 0; -@@ -1124,7 +1124,7 @@ out: - * present in body structure */ - mboxevent_extract_record(mboxevent, mailbox, &record); - mboxevent_extract_mailbox(mboxevent, mailbox); -- mboxevent_set_access(mboxevent, NULL, NULL, as->userid, as->mailbox->name); -+ mboxevent_set_access(mboxevent, NULL, NULL, as->userid, as->mailbox->name, 1); - mboxevent_set_numunseen(mboxevent, mailbox, -1); - - return 0; -@@ -1327,7 +1327,7 @@ out: - } - - mboxevent_extract_mailbox(mboxevent, as->mailbox); -- mboxevent_set_access(mboxevent, NULL, NULL, as->userid, as->mailbox->name); -+ mboxevent_set_access(mboxevent, NULL, NULL, as->userid, as->mailbox->name, 0); - mboxevent_set_numunseen(mboxevent, as->mailbox, -1); - - return 0; -diff --git a/imap/imapd.c b/imap/imapd.c -index c83578e..7ae7f5e 100644 ---- a/imap/imapd.c -+++ b/imap/imapd.c -@@ -976,7 +976,7 @@ int service_main(int argc __attribute__((unused)), - /* send a Logout event notification */ - if ((mboxevent = mboxevent_new(EVENT_LOGOUT))) { - mboxevent_set_access(mboxevent, saslprops.iplocalport, -- saslprops.ipremoteport, imapd_userid, NULL); -+ saslprops.ipremoteport, imapd_userid, NULL, 1); - - mboxevent_notify(mboxevent); - mboxevent_free(&mboxevent); -@@ -2312,7 +2312,7 @@ static void authentication_success(void) - /* send a Login event notification */ - if ((mboxevent = mboxevent_new(EVENT_LOGIN))) { - mboxevent_set_access(mboxevent, saslprops.iplocalport, -- saslprops.ipremoteport, imapd_userid, NULL); -+ saslprops.ipremoteport, imapd_userid, NULL, 1); - - mboxevent_notify(mboxevent); - mboxevent_free(&mboxevent); -diff --git a/imap/index.c b/imap/index.c -index bbbdf35..285f921 100644 ---- a/imap/index.c -+++ b/imap/index.c -@@ -419,7 +419,7 @@ EXPORTED int index_expunge(struct index_state *state, char *sequence, - seqset_free(seq); - - mboxevent_extract_mailbox(mboxevent, state->mailbox); -- mboxevent_set_access(mboxevent, NULL, NULL, state->userid, state->mailbox->name); -+ mboxevent_set_access(mboxevent, NULL, NULL, state->userid, state->mailbox->name, 1); - mboxevent_set_numunseen(mboxevent, state->mailbox, state->numunseen); - - /* unlock before responding */ -@@ -1116,7 +1116,7 @@ EXPORTED int index_fetch(struct index_state *state, - } - - mboxevent_extract_mailbox(mboxevent, state->mailbox); -- mboxevent_set_access(mboxevent, NULL, NULL, state->userid, state->mailbox->name); -+ mboxevent_set_access(mboxevent, NULL, NULL, state->userid, state->mailbox->name, 1); - mboxevent_set_numunseen(mboxevent, state->mailbox, - state->numunseen); - } -@@ -1267,10 +1267,10 @@ EXPORTED int index_store(struct index_state *state, char *sequence, - * and FlagsSet events */ - mboxevent_extract_mailbox(flagsset, mailbox); - mboxevent_set_numunseen(flagsset, mailbox, state->numunseen); -- mboxevent_set_access(flagsset, NULL, NULL, state->userid, state->mailbox->name); -+ mboxevent_set_access(flagsset, NULL, NULL, state->userid, state->mailbox->name, 1); - - mboxevent_extract_mailbox(flagsclear, mailbox); -- mboxevent_set_access(flagsclear, NULL, NULL, state->userid, state->mailbox->name); -+ mboxevent_set_access(flagsclear, NULL, NULL, state->userid, state->mailbox->name, 1); - mboxevent_set_numunseen(flagsclear, mailbox, state->numunseen); - - mboxevent_notify(mboxevents); -diff --git a/imap/lmtpd.c b/imap/lmtpd.c -index 8c6635a..0a29663 100644 ---- a/imap/lmtpd.c -+++ b/imap/lmtpd.c -@@ -814,6 +814,9 @@ int deliver_local(deliver_data_t *mydata, const strarray_t *flags, - - *tail = '\0'; - -+ // However, the rest of this stuff knows little about what authn/authz understands -+ mboxname_hiersep_tointernal(&lmtpd_namespace, username, config_virtdomains ? strcspn(username, "@") : 0); -+ - ret = deliver_mailbox(md->f, mydata->content, mydata->stage, - md->size, flags, - (char *) username, authstate, md->id, -@@ -909,6 +912,7 @@ int deliver(message_data_t *msgdata, char *authuser, - } - } - -+ mboxname_hiersep_toexternal(&lmtpd_namespace, userbuf, config_virtdomains ? strcspn(userbuf, "@") : 0); - telemetry_rusage(userbuf); - - msg_setrcpt_status(msgdata, n, r); -diff --git a/imap/mboxevent.c b/imap/mboxevent.c -index d7eb30f..ec26662 100644 ---- a/imap/mboxevent.c -+++ b/imap/mboxevent.c -@@ -618,7 +618,8 @@ void mboxevent_add_flag(struct mboxevent *event, const char *flag) - - EXPORTED void mboxevent_set_access(struct mboxevent *event, - const char *serveraddr, const char *clientaddr, -- const char *userid, const char *mailboxname) -+ const char *userid, const char *mailboxname, -+ const int ext_name) - { - char url[MAX_MAILBOX_PATH+1]; - struct imapurl imapurl; -@@ -673,7 +674,7 @@ 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); -- if (userbuf != NULL) -+ if (userbuf != NULL && ext_name) - mboxname_hiersep_toexternal(&namespace, userbuf, - config_virtdomains ? strcspn(userbuf, "@") : 0); - -@@ -1314,7 +1315,8 @@ EXPORTED void mboxevent_set_access(struct mboxevent *event __attribute__((unused - const char *serveraddr __attribute__((unused)), - const char *clientaddr __attribute__((unused)), - const char *userid __attribute__((unused)), -- const char *mailboxname __attribute__((unused))) -+ const char *mailboxname __attribute__((unused)), -+ const int ext_name __attribute__((unused))) - { - } - -diff --git a/imap/mboxevent.h b/imap/mboxevent.h -index d8096d0..7f8ec94 100644 ---- a/imap/mboxevent.h -+++ b/imap/mboxevent.h -@@ -223,7 +223,7 @@ void mboxevent_add_flag(struct mboxevent *event, const char *flag); - */ - void mboxevent_set_access(struct mboxevent *event, - const char *serveraddr, const char *clientaddr, -- const char *userid, const char *mailboxname); -+ const char *userid, const char *mailboxname, const int ext_name); - - /* - * Shortcut to setting event notification parameters -diff --git a/imap/mboxlist.c b/imap/mboxlist.c -index 59cb5ef..a81d2de 100644 ---- a/imap/mboxlist.c -+++ b/imap/mboxlist.c -@@ -954,7 +954,7 @@ EXPORTED int mboxlist_createmailbox(const char *name, int mbtype, - /* send a MailboxCreate event notification */ - struct mboxevent *mboxevent = mboxevent_new(EVENT_MAILBOX_CREATE); - mboxevent_extract_mailbox(mboxevent, mailbox); -- mboxevent_set_access(mboxevent, NULL, NULL, userid, mailbox->name); -+ mboxevent_set_access(mboxevent, NULL, NULL, userid, mailbox->name, 1); - - mboxevent_notify(mboxevent); - mboxevent_free(&mboxevent); -@@ -1296,7 +1296,7 @@ EXPORTED int mboxlist_deletemailbox(const char *name, int isadmin, - /* only on a real delete do we delete from the remote end as well */ - sync_log_unmailbox(mailbox->name); - mboxevent_extract_mailbox(mboxevent, mailbox); -- mboxevent_set_access(mboxevent, NULL, NULL, userid, mailbox->name); -+ mboxevent_set_access(mboxevent, NULL, NULL, userid, mailbox->name, 1); - - r = mailbox_delete(&mailbox); - /* abort event notification */ -@@ -1554,7 +1554,7 @@ EXPORTED int mboxlist_renamemailbox(const char *oldname, const char *newname, - mboxevent_extract_mailbox(mboxevent, newmailbox); - mboxevent_extract_old_mailbox(mboxevent, oldmailbox); - } -- mboxevent_set_access(mboxevent, NULL, NULL, userid, newmailbox->name); -+ mboxevent_set_access(mboxevent, NULL, NULL, userid, newmailbox->name, 1); - } - - mailbox_rename_cleanup(&oldmailbox, isusermbox); -@@ -1862,7 +1862,7 @@ EXPORTED int mboxlist_setacl(struct namespace *namespace, const char *name, - struct mboxevent *mboxevent = mboxevent_new(EVENT_ACL_CHANGE); - mboxevent_extract_mailbox(mboxevent, mailbox); - mboxevent_set_acl(mboxevent, identifier, rights); -- mboxevent_set_access(mboxevent, NULL, NULL, userid, mailbox->name); -+ mboxevent_set_access(mboxevent, NULL, NULL, userid, mailbox->name, 1); - - mboxevent_notify(mboxevent); - mboxevent_free(&mboxevent); -@@ -3670,7 +3670,7 @@ EXPORTED int mboxlist_changesub(const char *name, const char *userid, - mboxevent = mboxevent_new(add ? EVENT_MAILBOX_SUBSCRIBE : - EVENT_MAILBOX_UNSUBSCRIBE);
View file
cyrus-imapd-2.5.tar.gz/imap/append.c
Changed
@@ -1012,7 +1012,7 @@ * present in body structure ? */ mboxevent_extract_record(mboxevent, mailbox, &record); mboxevent_extract_mailbox(mboxevent, mailbox); - mboxevent_set_access(mboxevent, NULL, NULL, as->userid, as->mailbox->name); + mboxevent_set_access(mboxevent, NULL, NULL, as->userid, as->mailbox->name, 1); mboxevent_set_numunseen(mboxevent, mailbox, -1); return 0; @@ -1124,7 +1124,7 @@ * present in body structure */ mboxevent_extract_record(mboxevent, mailbox, &record); mboxevent_extract_mailbox(mboxevent, mailbox); - mboxevent_set_access(mboxevent, NULL, NULL, as->userid, as->mailbox->name); + mboxevent_set_access(mboxevent, NULL, NULL, as->userid, as->mailbox->name, 1); mboxevent_set_numunseen(mboxevent, mailbox, -1); return 0; @@ -1327,7 +1327,7 @@ } mboxevent_extract_mailbox(mboxevent, as->mailbox); - mboxevent_set_access(mboxevent, NULL, NULL, as->userid, as->mailbox->name); + mboxevent_set_access(mboxevent, NULL, NULL, as->userid, as->mailbox->name, 0); mboxevent_set_numunseen(mboxevent, as->mailbox, -1); return 0;
View file
cyrus-imapd-2.5.tar.gz/imap/imapd.c
Changed
@@ -976,7 +976,7 @@ /* send a Logout event notification */ if ((mboxevent = mboxevent_new(EVENT_LOGOUT))) { mboxevent_set_access(mboxevent, saslprops.iplocalport, - saslprops.ipremoteport, imapd_userid, NULL); + saslprops.ipremoteport, imapd_userid, NULL, 1); mboxevent_notify(mboxevent); mboxevent_free(&mboxevent); @@ -1606,6 +1606,7 @@ // Translate the name to external mboxname_hiersep_toexternal(&imapd_namespace, imapd_userid, config_virtdomains ? strcspn(imapd_userid, "@") : 0); telemetry_rusage(imapd_userid); + mboxname_hiersep_tointernal(&imapd_namespace, imapd_userid, config_virtdomains ? strcspn(imapd_userid, "@") : 0); return; } @@ -2312,7 +2313,7 @@ /* send a Login event notification */ if ((mboxevent = mboxevent_new(EVENT_LOGIN))) { mboxevent_set_access(mboxevent, saslprops.iplocalport, - saslprops.ipremoteport, imapd_userid, NULL); + saslprops.ipremoteport, imapd_userid, NULL, 1); mboxevent_notify(mboxevent); mboxevent_free(&mboxevent);
View file
cyrus-imapd-2.5.tar.gz/imap/index.c
Changed
@@ -419,7 +419,7 @@ seqset_free(seq); mboxevent_extract_mailbox(mboxevent, state->mailbox); - mboxevent_set_access(mboxevent, NULL, NULL, state->userid, state->mailbox->name); + mboxevent_set_access(mboxevent, NULL, NULL, state->userid, state->mailbox->name, 1); mboxevent_set_numunseen(mboxevent, state->mailbox, state->numunseen); /* unlock before responding */ @@ -1116,7 +1116,7 @@ } mboxevent_extract_mailbox(mboxevent, state->mailbox); - mboxevent_set_access(mboxevent, NULL, NULL, state->userid, state->mailbox->name); + mboxevent_set_access(mboxevent, NULL, NULL, state->userid, state->mailbox->name, 1); mboxevent_set_numunseen(mboxevent, state->mailbox, state->numunseen); } @@ -1267,10 +1267,10 @@ * and FlagsSet events */ mboxevent_extract_mailbox(flagsset, mailbox); mboxevent_set_numunseen(flagsset, mailbox, state->numunseen); - mboxevent_set_access(flagsset, NULL, NULL, state->userid, state->mailbox->name); + mboxevent_set_access(flagsset, NULL, NULL, state->userid, state->mailbox->name, 1); mboxevent_extract_mailbox(flagsclear, mailbox); - mboxevent_set_access(flagsclear, NULL, NULL, state->userid, state->mailbox->name); + mboxevent_set_access(flagsclear, NULL, NULL, state->userid, state->mailbox->name, 1); mboxevent_set_numunseen(flagsclear, mailbox, state->numunseen); mboxevent_notify(mboxevents);
View file
cyrus-imapd-2.5.tar.gz/imap/lmtpd.c
Changed
@@ -814,6 +814,9 @@ *tail = '\0'; + // However, the rest of this stuff knows little about what authn/authz understands + mboxname_hiersep_tointernal(&lmtpd_namespace, username, config_virtdomains ? strcspn(username, "@") : 0); + ret = deliver_mailbox(md->f, mydata->content, mydata->stage, md->size, flags, (char *) username, authstate, md->id, @@ -909,6 +912,7 @@ } } + mboxname_hiersep_toexternal(&lmtpd_namespace, userbuf, config_virtdomains ? strcspn(userbuf, "@") : 0); telemetry_rusage(userbuf); msg_setrcpt_status(msgdata, n, r);
View file
cyrus-imapd-2.5.tar.gz/imap/mboxevent.c
Changed
@@ -618,7 +618,8 @@ EXPORTED void mboxevent_set_access(struct mboxevent *event, const char *serveraddr, const char *clientaddr, - const char *userid, const char *mailboxname) + const char *userid, const char *mailboxname, + const int ext_name) { char url[MAX_MAILBOX_PATH+1]; struct imapurl imapurl; @@ -648,7 +649,7 @@ /* translate any separators in user */ userbuf = (char *)mboxname_to_userid(mailboxname); - if (userbuf != NULL) + if (userbuf != NULL && ext_name) mboxname_hiersep_toexternal(&namespace, userbuf, config_virtdomains ? strcspn(userbuf, "@") : 0); @@ -673,7 +674,7 @@ if (userid && mboxevent_expected_param(event->type, EVENT_USER)) { /* translate any separators in user */ userbuf = xstrdup(userid); - if (userbuf != NULL) + if (userbuf != NULL && ext_name) mboxname_hiersep_toexternal(&namespace, userbuf, config_virtdomains ? strcspn(userbuf, "@") : 0); @@ -1314,7 +1315,8 @@ const char *serveraddr __attribute__((unused)), const char *clientaddr __attribute__((unused)), const char *userid __attribute__((unused)), - const char *mailboxname __attribute__((unused))) + const char *mailboxname __attribute__((unused)), + const int ext_name __attribute__((unused))) { }
View file
cyrus-imapd-2.5.tar.gz/imap/mboxevent.h
Changed
@@ -223,7 +223,7 @@ */ void mboxevent_set_access(struct mboxevent *event, const char *serveraddr, const char *clientaddr, - const char *userid, const char *mailboxname); + const char *userid, const char *mailboxname, const int ext_name); /* * Shortcut to setting event notification parameters
View file
cyrus-imapd-2.5.tar.gz/imap/mboxlist.c
Changed
@@ -954,7 +954,7 @@ /* send a MailboxCreate event notification */ struct mboxevent *mboxevent = mboxevent_new(EVENT_MAILBOX_CREATE); mboxevent_extract_mailbox(mboxevent, mailbox); - mboxevent_set_access(mboxevent, NULL, NULL, userid, mailbox->name); + mboxevent_set_access(mboxevent, NULL, NULL, userid, mailbox->name, 1); mboxevent_notify(mboxevent); mboxevent_free(&mboxevent); @@ -1296,7 +1296,7 @@ /* only on a real delete do we delete from the remote end as well */ sync_log_unmailbox(mailbox->name); mboxevent_extract_mailbox(mboxevent, mailbox); - mboxevent_set_access(mboxevent, NULL, NULL, userid, mailbox->name); + mboxevent_set_access(mboxevent, NULL, NULL, userid, mailbox->name, 1); r = mailbox_delete(&mailbox); /* abort event notification */ @@ -1554,7 +1554,7 @@ mboxevent_extract_mailbox(mboxevent, newmailbox); mboxevent_extract_old_mailbox(mboxevent, oldmailbox); } - mboxevent_set_access(mboxevent, NULL, NULL, userid, newmailbox->name); + mboxevent_set_access(mboxevent, NULL, NULL, userid, newmailbox->name, 1); } mailbox_rename_cleanup(&oldmailbox, isusermbox); @@ -1862,7 +1862,7 @@ struct mboxevent *mboxevent = mboxevent_new(EVENT_ACL_CHANGE); mboxevent_extract_mailbox(mboxevent, mailbox); mboxevent_set_acl(mboxevent, identifier, rights); - mboxevent_set_access(mboxevent, NULL, NULL, userid, mailbox->name); + mboxevent_set_access(mboxevent, NULL, NULL, userid, mailbox->name, 1); mboxevent_notify(mboxevent); mboxevent_free(&mboxevent); @@ -3670,7 +3670,7 @@ mboxevent = mboxevent_new(add ? EVENT_MAILBOX_SUBSCRIBE : EVENT_MAILBOX_UNSUBSCRIBE); - mboxevent_set_access(mboxevent, NULL, NULL, userid, name); + mboxevent_set_access(mboxevent, NULL, NULL, userid, name, 1); mboxevent_notify(mboxevent); mboxevent_free(&mboxevent); }
View file
cyrus-imapd-2.5.tar.gz/imap/pop3d.c
Changed
@@ -591,7 +591,7 @@ /* send a Logout event notification */ if ((mboxevent = mboxevent_new(EVENT_LOGOUT))) { mboxevent_set_access(mboxevent, saslprops.iplocalport, - NULL, popd_userid, NULL); + NULL, popd_userid, NULL, 1); mboxevent_notify(mboxevent); mboxevent_free(&mboxevent); @@ -1779,7 +1779,7 @@ /* send a Login event notification */ if ((mboxevent = mboxevent_new(EVENT_LOGIN))) { mboxevent_set_access(mboxevent, saslprops.iplocalport, - saslprops.ipremoteport, popd_userid, NULL); + saslprops.ipremoteport, popd_userid, NULL, 0); mboxevent_notify(mboxevent); mboxevent_free(&mboxevent);
View file
cyrus-imapd.dsc
Changed
@@ -2,7 +2,7 @@ Source: cyrus-imapd Binary: cyrus-imapd Architecture: any -Version: 2.5~dev2014112201-0~kolab1 +Version: 2.5~dev2014112301-0~kolab1 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Paul Klos <kolab@klos2day.nl> Homepage: http://www.cyrusimap.org/
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +cyrus-imapd (2.5~dev2014112301-0~kolab1) unstable; urgency=low + + * New snapshot at 631aa71cf5fe686563ae1d7e740a5cc76d0bf75f + + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Sun, 23 Nov 2014 11:30:13 +0100 + cyrus-imapd (2.5~dev2014112201-0~kolab1) unstable; urgency=low * New snapshot at 790df515eedd8be0050b14bfb7ab471c6ab9c6d3
View file
debian.series
Changed
@@ -1,3 +1,3 @@ cyrus-imapd-2.5-ctl_mboxlist-mbtype.patch -p1 cyrus-imapd-2.5-openssl-stack.patch -p1 -cyrus-imapd-2.5-default-skiplist.patch -p1 +cyrus-imapd-2.5-revert-safe-skiplist.patch -p1
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
.