merge from fc5:
Wed Apr 04 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.8-2 - fixed mboxlist backup rotation (#197054) little cleanup
This commit is contained in:
Tomas Janousek
parent
9280aa8f9c
commit
7f66dab2be
@ -1,2 +1,3 @@
|
|||||||
cyrus_sharedbackup-0.1.tar.gz
|
cyrus_sharedbackup-0.1.tar.gz
|
||||||
cyrus-imapd-2.3.8.tar.gz
|
cyrus-imapd-2.3.8.tar.gz
|
||||||
|
cyrus-imapd-2.3.8.tar.gz.sig
|
||||||
|
|||||||
@ -1,181 +0,0 @@
|
|||||||
diff -Naur cyrus-imapd-2.3.3/README.autosievefolder cyrus-imapd-2.3.3-autosieve.uncompiled/README.autosievefolder
|
|
||||||
--- cyrus-imapd-2.3.3/README.autosievefolder 1970-01-01 02:00:00.000000000 +0200
|
|
||||||
+++ cyrus-imapd-2.3.3-autosieve.uncompiled/README.autosievefolder 2006-03-01 16:57:26.000000000 +0200
|
|
||||||
@@ -0,0 +1,42 @@
|
|
||||||
+Cyrus IMAP autosievefolder patch
|
|
||||||
+----------------------------------
|
|
||||||
+
|
|
||||||
+NOTE : This patch has been created at the University of Athens. For more info, as well
|
|
||||||
+as more patches on Cyrus IMAPD server, please visit http://email.uoa.gr
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ When the lmtpd daemon receives an email message prior to delivering it to the
|
|
||||||
+INBOX folder of the user, checks if the user has specified sieve filters. If the
|
|
||||||
+user has specified sieve filters the filters are evaluated. If the message matches
|
|
||||||
+any of the filters the action that is specified in the filter is executed. If the action
|
|
||||||
+is FileInto it is stored in the subfolder specified in the filter. If the
|
|
||||||
+subfolder doesn't exist then the message is sent to the INBOX folder of the user.
|
|
||||||
+
|
|
||||||
+ With this patch if the folder doesn't exist AND the name of the subfolder is
|
|
||||||
+specified in the autosievefolders option, OR the anysievefolder is set to
|
|
||||||
+yes in the cyrus-imap configuration file then the subfolder is created and the mail
|
|
||||||
+is stored there.
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+Check the following options of the imapd.conf file
|
|
||||||
+==================================================
|
|
||||||
+
|
|
||||||
+* anysievefolder : It must be "yes" in order to permit the autocreation of any
|
|
||||||
+INBOX subfolder requested by a sieve filter, through the "fileinto" action. (default = no)
|
|
||||||
+* autosievefolders : It is a "|" separated list of subfolders of INBOX that will be
|
|
||||||
+automatically created, if requested by a sieve filter, through the "fileinto"
|
|
||||||
+action. (default = null)
|
|
||||||
+ i.e. autosievefolders: Junk | Spam
|
|
||||||
+
|
|
||||||
+WARNING: anysievefolder, takes precedence over autosievefolders . Which means that if
|
|
||||||
+anysievefolder is set to "yes", cyrus will create any INBOX subfolder requested, no-matter what the value of autosievefolders is.
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+Things to be done
|
|
||||||
+=================
|
|
||||||
+
|
|
||||||
+1. Support cyrus wildcards in the autosievefolders option.
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+For more information and updates please visit http://email.uoa.gr/projects/cyrus/autosievefolder
|
|
||||||
+
|
|
||||||
diff -Naur cyrus-imapd-2.3.3/imap/lmtp_sieve.c cyrus-imapd-2.3.3-autosieve.uncompiled/imap/lmtp_sieve.c
|
|
||||||
--- cyrus-imapd-2.3.3/imap/lmtp_sieve.c 2005-11-21 18:26:54.000000000 +0200
|
|
||||||
+++ cyrus-imapd-2.3.3-autosieve.uncompiled/imap/lmtp_sieve.c 2006-03-01 16:57:26.000000000 +0200
|
|
||||||
@@ -86,6 +86,9 @@
|
|
||||||
struct auth_state *authstate;
|
|
||||||
} script_data_t;
|
|
||||||
|
|
||||||
+static int autosieve_subfolder(char *userid, struct auth_state *auth_state,
|
|
||||||
+ char *subfolder, struct namespace *namespace);
|
|
||||||
+
|
|
||||||
static char *make_sieve_db(const char *user)
|
|
||||||
{
|
|
||||||
static char buf[MAX_MAILBOX_PATH+1];
|
|
||||||
@@ -487,7 +490,20 @@
|
|
||||||
sd->username, mdata->notifyheader,
|
|
||||||
namebuf, quotaoverride, 0);
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+
|
|
||||||
+ if (ret == IMAP_MAILBOX_NONEXISTENT) {
|
|
||||||
+ /* if "plus" folder under INBOX, then try to create it */
|
|
||||||
+ ret = autosieve_subfolder((char *) sd->username, sd->authstate, namebuf, mdata->namespace);
|
|
||||||
+
|
|
||||||
+ /* Try to deliver the mail again. */
|
|
||||||
+ if (!ret)
|
|
||||||
+ ret = deliver_mailbox(md->f, mdata->content, mdata->stage, md->size,
|
|
||||||
+ fc->imapflags->flag, fc->imapflags->nflags,
|
|
||||||
+ (char *) sd->username, sd->authstate, md->id,
|
|
||||||
+ sd->username, mdata->notifyheader,
|
|
||||||
+ namebuf, quotaoverride, 0);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (!ret) {
|
|
||||||
snmp_increment(SIEVE_FILEINTO, 1);
|
|
||||||
return SIEVE_OK;
|
|
||||||
@@ -939,3 +955,80 @@
|
|
||||||
we'll do normal delivery */
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#define SEP '|'
|
|
||||||
+
|
|
||||||
+static int autosieve_subfolder(char *userid, struct auth_state *auth_state,
|
|
||||||
+ char *subfolder, struct namespace *namespace)
|
|
||||||
+{
|
|
||||||
+ char option_name_external[MAX_MAILBOX_NAME + 1];
|
|
||||||
+ char option_name_internal[MAX_MAILBOX_NAME + 1];
|
|
||||||
+ const char *subf ;
|
|
||||||
+ char *p, *q, *next_subf;
|
|
||||||
+ int len, r = 0;
|
|
||||||
+ int createsievefolder = 0;
|
|
||||||
+
|
|
||||||
+ /* Check if subfolder or userid are NULL */
|
|
||||||
+ if(userid == NULL || subfolder == NULL)
|
|
||||||
+ return IMAP_MAILBOX_NONEXISTENT;
|
|
||||||
+
|
|
||||||
+ syslog(LOG_DEBUG, "autosievefolder: autosieve_subfolder() was called for user %s, folder %s",
|
|
||||||
+ userid, subfolder);
|
|
||||||
+
|
|
||||||
+ if (config_getswitch(IMAPOPT_ANYSIEVEFOLDER)) {
|
|
||||||
+ createsievefolder = 1;
|
|
||||||
+ } else if ((subf = config_getstring(IMAPOPT_AUTOSIEVEFOLDERS)) != NULL) {
|
|
||||||
+ /* Roll through subf */
|
|
||||||
+ next_subf = (char *) subf;
|
|
||||||
+ while (*next_subf) {
|
|
||||||
+ for (p = next_subf ; isspace((int) *p) || *p == SEP ; p++);
|
|
||||||
+ for (next_subf = p ; *next_subf && *next_subf != SEP ; next_subf++);
|
|
||||||
+ for (q = next_subf ; q > p && (isspace((int) *q) || *q == SEP || !*q); q--);
|
|
||||||
+
|
|
||||||
+ if (!*p) continue;
|
|
||||||
+
|
|
||||||
+ len = q - p + 1;
|
|
||||||
+ /*
|
|
||||||
+ * This is a preliminary length check based on the assumption
|
|
||||||
+ * that the *final* internal format will be something
|
|
||||||
+ * like user.userid.subfolder(s).
|
|
||||||
+ */
|
|
||||||
+ if (len > sizeof(option_name_external) - strlen(userid) - 5)
|
|
||||||
+ return IMAP_MAILBOX_BADNAME;
|
|
||||||
+
|
|
||||||
+ strlcpy(option_name_external, namespace->prefix[NAMESPACE_INBOX], sizeof(option_name_external));
|
|
||||||
+ strncat(option_name_external, p, len);
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Transform the option folder name to internal namespace and compare it
|
|
||||||
+ * with what must be created.
|
|
||||||
+ */
|
|
||||||
+ r = namespace->mboxname_tointernal(namespace, option_name_external, userid, option_name_internal);
|
|
||||||
+ if (r) continue;
|
|
||||||
+
|
|
||||||
+ if (!strcmp(option_name_internal, subfolder)) {
|
|
||||||
+ createsievefolder = 1;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (createsievefolder) {
|
|
||||||
+ /* Folder is already in internal namespace format */
|
|
||||||
+ r = mboxlist_createmailbox(subfolder, MAILBOX_FORMAT_NORMAL, NULL,
|
|
||||||
+ 1, userid, auth_state, 0, 0, 0);
|
|
||||||
+ if (!r) {
|
|
||||||
+ mboxlist_changesub(subfolder, userid, auth_state, 1, 1);
|
|
||||||
+ syslog(LOG_DEBUG, "autosievefolder: User %s, folder %s creation succeeded",
|
|
||||||
+ userid, subfolder);
|
|
||||||
+ return 0;
|
|
||||||
+ } else {
|
|
||||||
+ syslog(LOG_ERR, "autosievefolder: User %s, folder %s creation failed. %s",
|
|
||||||
+ userid, subfolder,error_message(r));
|
|
||||||
+ return r;
|
|
||||||
+ }
|
|
||||||
+ } else
|
|
||||||
+ return IMAP_MAILBOX_NONEXISTENT;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
diff -Naur cyrus-imapd-2.3.3/lib/imapoptions cyrus-imapd-2.3.3-autosieve.uncompiled/lib/imapoptions
|
|
||||||
--- cyrus-imapd-2.3.3/lib/imapoptions 2006-02-01 21:44:06.000000000 +0200
|
|
||||||
+++ cyrus-imapd-2.3.3-autosieve.uncompiled/lib/imapoptions 2006-03-01 16:57:26.000000000 +0200
|
|
||||||
@@ -863,6 +863,15 @@
|
|
||||||
/* If enabled, lmtpd will look for Sieve scripts in user's home
|
|
||||||
directories: ~user/.sieve. */
|
|
||||||
|
|
||||||
+{ "anysievefolder", 0, SWITCH }
|
|
||||||
+/* It must be "yes" in order to permit the autocreation of any INBOX subfolder
|
|
||||||
+ requested by a sieve filter, through the "fileinto" action. (default = no) */
|
|
||||||
+
|
|
||||||
+{ "autosievefolders", NULL, STRING }
|
|
||||||
+/* It is a "|" separated list of subfolders of INBOX that will be automatically created,
|
|
||||||
+ if requested by a sieve filter, through the "fileinto" action. (default = null)
|
|
||||||
+ i.e. autosievefolders: Junk | Spam */
|
|
||||||
+
|
|
||||||
{ "singleinstancestore", 1, SWITCH }
|
|
||||||
/* If enabled, imapd, lmtpd and nntpd attempt to only write one copy
|
|
||||||
of a message per partition and create hard links, resulting in a
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,537 +0,0 @@
|
|||||||
--- cyrus-imapd-2.3.7/imap/ctl_cyrusdb.c.rmquota 2005-02-16 22:06:18.000000000 +0100
|
|
||||||
+++ cyrus-imapd-2.3.7/imap/ctl_cyrusdb.c 2006-07-23 12:52:14.000000000 +0200
|
|
||||||
@@ -133,7 +133,7 @@
|
|
||||||
/* if it is MBTYPE_RESERVED, unset it & call mboxlist_delete */
|
|
||||||
if(!r && (mbtype & MBTYPE_RESERVE)) {
|
|
||||||
if(!r) {
|
|
||||||
- r = mboxlist_deletemailbox(name, 1, NULL, NULL, 0, 0, 1);
|
|
||||||
+ r = mboxlist_deletemailbox(name, 1, NULL, NULL, 0, 0, 1, 1);
|
|
||||||
if(r) {
|
|
||||||
/* log the error */
|
|
||||||
syslog(LOG_ERR,
|
|
||||||
--- cyrus-imapd-2.3.7/imap/ctl_mboxlist.c.rmquota 2006-04-06 17:42:10.000000000 +0200
|
|
||||||
+++ cyrus-imapd-2.3.7/imap/ctl_mboxlist.c 2006-07-23 12:52:14.000000000 +0200
|
|
||||||
@@ -457,7 +457,7 @@
|
|
||||||
|
|
||||||
wipe_head = wipe_head->next;
|
|
||||||
|
|
||||||
- ret = mboxlist_deletemailbox(me->mailbox, 1, "", NULL, 0, 1, 1);
|
|
||||||
+ ret = mboxlist_deletemailbox(me->mailbox, 1, "", NULL, 0, 1, 1, 1);
|
|
||||||
if(ret) {
|
|
||||||
fprintf(stderr, "couldn't delete defunct mailbox %s\n",
|
|
||||||
me->mailbox);
|
|
||||||
--- cyrus-imapd-2.3.7/imap/imapd.c.rmquota 2006-07-23 12:52:14.000000000 +0200
|
|
||||||
+++ cyrus-imapd-2.3.7/imap/imapd.c 2006-07-23 12:55:14.000000000 +0200
|
|
||||||
@@ -4985,7 +4985,7 @@
|
|
||||||
|
|
||||||
r = mboxlist_deletemailbox(name, imapd_userisadmin,
|
|
||||||
imapd_userid, imapd_authstate,
|
|
||||||
- 0, 0, 0);
|
|
||||||
+ 0, 0, 0, 1);
|
|
||||||
|
|
||||||
if (!r) sync_log_mailbox(name);
|
|
||||||
|
|
||||||
@@ -5009,6 +5009,12 @@
|
|
||||||
char *p;
|
|
||||||
int domainlen = 0;
|
|
||||||
int sync_lockfd = (-1);
|
|
||||||
+ int keepQuota = 1;
|
|
||||||
+
|
|
||||||
+ if(name && *name == '+') {
|
|
||||||
+ keepQuota = 0;
|
|
||||||
+ name++;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
|
|
||||||
imapd_userid, mailboxname);
|
|
||||||
@@ -5067,7 +5073,7 @@
|
|
||||||
|
|
||||||
r = mboxlist_deletemailbox(mailboxname, imapd_userisadmin,
|
|
||||||
imapd_userid, imapd_authstate, 1-force,
|
|
||||||
- localonly, 0);
|
|
||||||
+ localonly, 0, keepQuota);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* was it a top-level user mailbox? */
|
|
||||||
@@ -6426,6 +6432,7 @@
|
|
||||||
{
|
|
||||||
int newquota = -1;
|
|
||||||
int badresource = 0;
|
|
||||||
+ int rmquota = 0;
|
|
||||||
int c;
|
|
||||||
int force = 0;
|
|
||||||
static struct buf arg;
|
|
||||||
@@ -6442,7 +6449,8 @@
|
|
||||||
if (c != ')' || arg.s[0] != '\0') {
|
|
||||||
for (;;) {
|
|
||||||
if (c != ' ') goto badlist;
|
|
||||||
- if (strcasecmp(arg.s, "storage") != 0) badresource = 1;
|
|
||||||
+ if (strcasecmp(arg.s, "remove") == 0) rmquota = 1;
|
|
||||||
+ else if (strcasecmp(arg.s, "storage") != 0) badresource = 1;
|
|
||||||
c = getword(imapd_in, &arg);
|
|
||||||
if (c != ' ' && c != ')') goto badlist;
|
|
||||||
if (arg.s[0] == '\0') goto badlist;
|
|
||||||
@@ -6511,7 +6519,10 @@
|
|
||||||
|
|
||||||
/* local mailbox */
|
|
||||||
if (!r || (r == IMAP_MAILBOX_NONEXISTENT)) {
|
|
||||||
- r = mboxlist_setquota(mailboxname, newquota, force);
|
|
||||||
+ if (!rmquota)
|
|
||||||
+ r = mboxlist_setquota(mailboxname, newquota, force);
|
|
||||||
+ else
|
|
||||||
+ r = mboxlist_unsetquota(mailboxname);
|
|
||||||
}
|
|
||||||
|
|
||||||
imapd_check(NULL, 0, 0);
|
|
||||||
@@ -8224,7 +8235,7 @@
|
|
||||||
/* note also that we need to remember to let proxyadmins do this */
|
|
||||||
r = mboxlist_deletemailbox(mailboxname,
|
|
||||||
imapd_userisadmin || imapd_userisproxyadmin,
|
|
||||||
- imapd_userid, imapd_authstate, 0, 1, 0);
|
|
||||||
+ imapd_userid, imapd_authstate, 0, 1, 0, 1);
|
|
||||||
if(r) syslog(LOG_ERR,
|
|
||||||
"Could not delete local mailbox during move of %s",
|
|
||||||
mailboxname);
|
|
||||||
--- cyrus-imapd-2.3.7/imap/mailbox.c.rmquota 2006-06-02 20:55:06.000000000 +0200
|
|
||||||
+++ cyrus-imapd-2.3.7/imap/mailbox.c 2006-07-23 12:52:14.000000000 +0200
|
|
||||||
@@ -2689,27 +2689,7 @@
|
|
||||||
|
|
||||||
seen_delete_mailbox(mailbox);
|
|
||||||
|
|
||||||
- if (delete_quota_root && !rquota) {
|
|
||||||
- quota_delete(&mailbox->quota, &tid);
|
|
||||||
- free(mailbox->quota.root);
|
|
||||||
- mailbox->quota.root = NULL;
|
|
||||||
- } else if (!rquota) {
|
|
||||||
- /* Free any quota being used by this mailbox */
|
|
||||||
- if (mailbox->quota.used >= mailbox->quota_mailbox_used) {
|
|
||||||
- mailbox->quota.used -= mailbox->quota_mailbox_used;
|
|
||||||
- }
|
|
||||||
- else {
|
|
||||||
- mailbox->quota.used = 0;
|
|
||||||
- }
|
|
||||||
- r = quota_write(&mailbox->quota, &tid);
|
|
||||||
- if (r) {
|
|
||||||
- syslog(LOG_ERR,
|
|
||||||
- "LOSTQUOTA: unable to record free of " UQUOTA_T_FMT " bytes in quota %s",
|
|
||||||
- mailbox->quota_mailbox_used, mailbox->quota.root);
|
|
||||||
- }
|
|
||||||
- else
|
|
||||||
- quota_commit(&tid);
|
|
||||||
- }
|
|
||||||
+ mailbox_updatequota(mailbox,NULL);
|
|
||||||
|
|
||||||
/* remove data (message file) directory */
|
|
||||||
path = mailbox->path;
|
|
||||||
@@ -3331,3 +3311,49 @@
|
|
||||||
if (*p == '.') *p = '/';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/* This function is used to update the quota. Can be used to replace
|
|
||||||
+ * identical parts of the code, and can be quite handy some times
|
|
||||||
+ * The tid is used in order to make possible to make the quota update
|
|
||||||
+ * being a part of a bigger transaction to the quota db */
|
|
||||||
+int mailbox_updatequota(struct mailbox *mailbox, struct txn **tid)
|
|
||||||
+{
|
|
||||||
+ int r = 0, havetid = 0;
|
|
||||||
+ struct txn **ltid = NULL;
|
|
||||||
+
|
|
||||||
+ if(tid) {
|
|
||||||
+ ltid = tid;
|
|
||||||
+ havetid = 1;
|
|
||||||
+ }
|
|
||||||
+ /* Ensure that we are locked */
|
|
||||||
+ if(!mailbox->header_lock_count) return IMAP_INTERNAL;
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ if(mailbox->quota.root) {
|
|
||||||
+ r = quota_read(&mailbox->quota, ltid, 1);
|
|
||||||
+ if( r == 0 ) {
|
|
||||||
+ if (mailbox->quota.used >= mailbox->quota_mailbox_used) {
|
|
||||||
+ mailbox->quota.used -= mailbox->quota_mailbox_used;
|
|
||||||
+ }
|
|
||||||
+ else {
|
|
||||||
+ mailbox->quota.used = 0;
|
|
||||||
+ }
|
|
||||||
+ r = quota_write(&mailbox->quota, ltid);
|
|
||||||
+ if (r) {
|
|
||||||
+ syslog(LOG_ERR,
|
|
||||||
+ "LOSTQUOTA: unable to record free of %lu bytes in quota %s",
|
|
||||||
+ mailbox->quota_mailbox_used, mailbox->quota.root);
|
|
||||||
+ }
|
|
||||||
+ else if(!havetid)
|
|
||||||
+ quota_commit(tid);
|
|
||||||
+ }
|
|
||||||
+ /* It is not a big mistake not to have quota .. just remove from the mailbox */
|
|
||||||
+ else if ( r == IMAP_QUOTAROOT_NONEXISTENT) {
|
|
||||||
+ free(mailbox->quota.root);
|
|
||||||
+ r = 0;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return r;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
--- cyrus-imapd-2.3.7/imap/mailbox.h.rmquota 2006-06-02 18:41:57.000000000 +0200
|
|
||||||
+++ cyrus-imapd-2.3.7/imap/mailbox.h 2006-07-23 12:52:14.000000000 +0200
|
|
||||||
@@ -364,6 +364,8 @@
|
|
||||||
struct mailbox *mailboxp);
|
|
||||||
extern int mailbox_delete(struct mailbox *mailbox, int delete_quota_root);
|
|
||||||
|
|
||||||
+extern int mailbox_updatequota(struct mailbox *mailbox, struct txn **tid);
|
|
||||||
+
|
|
||||||
extern int mailbox_rename_copy(struct mailbox *oldmailbox,
|
|
||||||
const char *newname, char *newpartition,
|
|
||||||
bit32 *olduidvalidityp, bit32 *newuidvalidityp,
|
|
||||||
--- cyrus-imapd-2.3.7/imap/mboxlist.c.rmquota 2006-07-23 12:52:14.000000000 +0200
|
|
||||||
+++ cyrus-imapd-2.3.7/imap/mboxlist.c 2006-07-23 12:52:14.000000000 +0200
|
|
||||||
@@ -99,6 +99,11 @@
|
|
||||||
static int mboxlist_opensubs();
|
|
||||||
static void mboxlist_closesubs();
|
|
||||||
|
|
||||||
+static int child_cb(char *name,
|
|
||||||
+ int matchlen __attribute__((unused)),
|
|
||||||
+ int maycreate __attribute__((unused)),
|
|
||||||
+ void *rock);
|
|
||||||
+
|
|
||||||
static int mboxlist_rmquota(const char *name, int matchlen, int maycreate,
|
|
||||||
void *rock);
|
|
||||||
static int mboxlist_changequota(const char *name, int matchlen, int maycreate,
|
|
||||||
@@ -113,6 +118,7 @@
|
|
||||||
|
|
||||||
struct change_rock {
|
|
||||||
struct quota *quota;
|
|
||||||
+ struct quota *oldquota;
|
|
||||||
struct txn **tid;
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -911,9 +917,9 @@
|
|
||||||
*/
|
|
||||||
int mboxlist_deletemailbox(const char *name, int isadmin, char *userid,
|
|
||||||
struct auth_state *auth_state, int checkacl,
|
|
||||||
- int local_only, int force)
|
|
||||||
+ int local_only, int force, int keepQuota)
|
|
||||||
{
|
|
||||||
- int r;
|
|
||||||
+ int r, has_children = 0;
|
|
||||||
char *acl;
|
|
||||||
long access;
|
|
||||||
struct mailbox mailbox;
|
|
||||||
@@ -924,6 +930,7 @@
|
|
||||||
int mbtype;
|
|
||||||
const char *p;
|
|
||||||
mupdate_handle *mupdate_h = NULL;
|
|
||||||
+ char *quotaroot = NULL;
|
|
||||||
|
|
||||||
if(!isadmin && force) return IMAP_PERMISSION_DENIED;
|
|
||||||
|
|
||||||
@@ -1036,13 +1043,44 @@
|
|
||||||
|
|
||||||
if ((r && !force) || isremote) goto done;
|
|
||||||
|
|
||||||
- if (!r || force) r = mailbox_delete(&mailbox, deletequotaroot);
|
|
||||||
+ if (!r || force) {
|
|
||||||
+ /* first we have to keep the previous quota root in order to delete it */
|
|
||||||
+ if(mailbox.quota.root)
|
|
||||||
+ quotaroot = xstrdup(mailbox.quota.root);
|
|
||||||
+ r = mailbox_delete(&mailbox, deletequotaroot);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
/*
|
|
||||||
* See if we have to remove mailbox's quota root
|
|
||||||
*/
|
|
||||||
- if (!r && mailbox.quota.root != NULL) {
|
|
||||||
+ if (!r && quotaroot != NULL) {
|
|
||||||
/* xxx look for any other mailboxes in this quotaroot */
|
|
||||||
+ /* If we have not asked to remove the quota (default behaviour), we check
|
|
||||||
+ * whether there are any subfolders beneeth the quota root. If there aren't
|
|
||||||
+ * any subfolders the reasonable thing is to delete the quota */
|
|
||||||
+ if(keepQuota) {
|
|
||||||
+ char pattern[MAX_MAILBOX_PATH+1];
|
|
||||||
+ strlcpy(pattern, quotaroot, sizeof(pattern));
|
|
||||||
+ if (config_virtdomains && name[strlen(name)-1] == '!') {
|
|
||||||
+ strlcat(pattern, "*", sizeof(pattern));
|
|
||||||
+ }
|
|
||||||
+ else {
|
|
||||||
+ strlcat(pattern, ".*", sizeof(pattern));
|
|
||||||
+ }
|
|
||||||
+ /* find if there are subfolders. Then we want to
|
|
||||||
+ * keep the existing quota */
|
|
||||||
+ mboxlist_findall(NULL, pattern, isadmin, userid,
|
|
||||||
+ auth_state, child_cb, (void *) &has_children);
|
|
||||||
+
|
|
||||||
+ if(!has_children)
|
|
||||||
+ if(!mboxlist_mylookup(quotaroot, NULL, NULL, NULL, NULL, NULL, NULL, 0 ))
|
|
||||||
+ has_children = 1;
|
|
||||||
+ }
|
|
||||||
+ /* If we want to remove the quota explicitely or the quota root folder has no subfolders
|
|
||||||
+ * we execute the rmquota patch */
|
|
||||||
+ if(!keepQuota || !has_children )
|
|
||||||
+ mboxlist_unsetquota(quotaroot);
|
|
||||||
+ free(quotaroot);
|
|
||||||
}
|
|
||||||
|
|
||||||
done:
|
|
||||||
@@ -2498,6 +2536,7 @@
|
|
||||||
if (r) return r;
|
|
||||||
|
|
||||||
crock.quota = "a;
|
|
||||||
+ crock.oldquota = NULL;
|
|
||||||
crock.tid = &tid;
|
|
||||||
/* top level mailbox */
|
|
||||||
if(have_mailbox)
|
|
||||||
@@ -2516,17 +2555,21 @@
|
|
||||||
*/
|
|
||||||
int mboxlist_unsetquota(const char *root)
|
|
||||||
{
|
|
||||||
+ char newquota[MAX_MAILBOX_PATH+1];
|
|
||||||
char pattern[MAX_MAILBOX_PATH+1];
|
|
||||||
struct quota quota;
|
|
||||||
- int r=0;
|
|
||||||
+ struct change_rock crock;
|
|
||||||
+ int r=0, k=0;
|
|
||||||
|
|
||||||
if (!root[0] || root[0] == '.' || strchr(root, '/')
|
|
||||||
|| strchr(root, '*') || strchr(root, '%') || strchr(root, '?')) {
|
|
||||||
return IMAP_MAILBOX_BADNAME;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ crock.tid=NULL;
|
|
||||||
|
|
||||||
quota.root = (char *) root;
|
|
||||||
- r = quota_read("a, NULL, 0);
|
|
||||||
+ r = quota_read("a, crock.tid, 0);
|
|
||||||
if (r == IMAP_QUOTAROOT_NONEXISTENT) {
|
|
||||||
/* already unset */
|
|
||||||
return 0;
|
|
||||||
@@ -2543,13 +2586,45 @@
|
|
||||||
}
|
|
||||||
else
|
|
||||||
strlcat(pattern, ".*", sizeof(pattern));
|
|
||||||
-
|
|
||||||
- /* top level mailbox */
|
|
||||||
- mboxlist_rmquota(root, 0, 0, (void *)root);
|
|
||||||
- /* submailboxes - we're using internal names here */
|
|
||||||
- mboxlist_findall(NULL, pattern, 1, 0, 0, mboxlist_rmquota, (void *)root);
|
|
||||||
|
|
||||||
- r = quota_delete("a, NULL);
|
|
||||||
+ r = quota_delete("a, crock.tid);
|
|
||||||
+
|
|
||||||
+ /* If we cannot delete the quota then abort the operation */
|
|
||||||
+ if(!r) {
|
|
||||||
+ /* quota_findroot performs several checks that we can
|
|
||||||
+ * assume that are already done, and don't have to perform
|
|
||||||
+ * them again. One of them is that it returns 1 only if
|
|
||||||
+ * quotaroot exists.
|
|
||||||
+ */
|
|
||||||
+ if(quota_findroot(newquota, sizeof(newquota), root)) {
|
|
||||||
+ struct quota rootquota;
|
|
||||||
+ rootquota.root = newquota;
|
|
||||||
+ k = quota_read(&rootquota, crock.tid, 0);
|
|
||||||
+ if (!k) {
|
|
||||||
+ crock.quota = &rootquota;
|
|
||||||
+ crock.oldquota = "a;
|
|
||||||
+ /* top level mailbox */
|
|
||||||
+ k = mboxlist_changequota(root, 0, 0, &crock);
|
|
||||||
+ }
|
|
||||||
+ /* submailboxes - we're using internal names here */
|
|
||||||
+ if (!k)
|
|
||||||
+ k = mboxlist_findall(NULL, pattern, 1, 0, 0, mboxlist_changequota, &crock);
|
|
||||||
+ if(!k)
|
|
||||||
+ k = quota_write(&rootquota, crock.tid);
|
|
||||||
+
|
|
||||||
+ }
|
|
||||||
+ else {
|
|
||||||
+ /* top level mailbox */
|
|
||||||
+ mboxlist_rmquota(root, 0, 0, (void *)root);
|
|
||||||
+ /* submailboxes - we're using internal names here */
|
|
||||||
+ mboxlist_findall(NULL, pattern, 1, 0, 0, mboxlist_rmquota, (void *)root);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if(!r && !k)
|
|
||||||
+ quota_commit(crock.tid);
|
|
||||||
+ else
|
|
||||||
+ quota_abort(crock.tid);
|
|
||||||
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
@@ -2647,6 +2722,7 @@
|
|
||||||
struct mailbox mailbox;
|
|
||||||
struct change_rock *crock = (struct change_rock *) rock;
|
|
||||||
struct quota *mboxlist_newquota = crock->quota;
|
|
||||||
+ struct quota *mboxlist_oldquota = crock->oldquota;
|
|
||||||
struct txn **tid = crock->tid;
|
|
||||||
|
|
||||||
assert(rock != NULL);
|
|
||||||
@@ -2664,27 +2740,24 @@
|
|
||||||
if (r) goto error;
|
|
||||||
|
|
||||||
if (mailbox.quota.root) {
|
|
||||||
- if (strlen(mailbox.quota.root) >= strlen(mboxlist_newquota->root)) {
|
|
||||||
- /* Part of a child quota root */
|
|
||||||
- mailbox_close(&mailbox);
|
|
||||||
- return 0;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- r = quota_read(&mailbox.quota, tid, 1);
|
|
||||||
- if (r) goto error;
|
|
||||||
- if (mailbox.quota.used >= mailbox.quota_mailbox_used) {
|
|
||||||
- mailbox.quota.used -= mailbox.quota_mailbox_used;
|
|
||||||
+ if(mboxlist_oldquota) {
|
|
||||||
+ if (strlen(mailbox.quota.root) > strlen(mboxlist_oldquota->root)) {
|
|
||||||
+ /* Part of a child quota root */
|
|
||||||
+ mailbox_close(&mailbox);
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
- mailbox.quota.used = 0;
|
|
||||||
- }
|
|
||||||
- r = quota_write(&mailbox.quota, tid);
|
|
||||||
- if (r) {
|
|
||||||
- syslog(LOG_ERR,
|
|
||||||
- "LOSTQUOTA: unable to record free of " UQUOTA_T_FMT " bytes in quota %s",
|
|
||||||
- mailbox.quota_mailbox_used, mailbox.quota.root);
|
|
||||||
+ if (strlen(mailbox.quota.root) >= strlen(mboxlist_newquota->root)) {
|
|
||||||
+ /* Part of a child quota root */
|
|
||||||
+ mailbox_close(&mailbox);
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
- free(mailbox.quota.root);
|
|
||||||
+
|
|
||||||
+ r = mailbox_updatequota(&mailbox,tid);
|
|
||||||
+ if (r)
|
|
||||||
+ goto error;
|
|
||||||
}
|
|
||||||
|
|
||||||
mailbox.quota.root = xstrdup(mboxlist_newquota->root);
|
|
||||||
@@ -2694,18 +2767,24 @@
|
|
||||||
mboxlist_newquota->used += mailbox.quota_mailbox_used;
|
|
||||||
mailbox_close(&mailbox);
|
|
||||||
return 0;
|
|
||||||
-
|
|
||||||
+
|
|
||||||
error:
|
|
||||||
mailbox_close(&mailbox);
|
|
||||||
+ syslog(LOG_ERR, "LOSTQUOTA: unable to change quota root for %s to %s: %s. \
|
|
||||||
+ Command aborted. Run reconstruct to make sure mailboxes \
|
|
||||||
+ are in consistent state",
|
|
||||||
+ name, mboxlist_newquota->root, error_message(r));
|
|
||||||
+ return 1;
|
|
||||||
error_noclose:
|
|
||||||
syslog(LOG_ERR, "LOSTQUOTA: unable to change quota root for %s to %s: %s",
|
|
||||||
- name, mboxlist_newquota->root, error_message(r));
|
|
||||||
+ name, mboxlist_newquota->root, error_message(r));
|
|
||||||
|
|
||||||
/* Note, we're a callback, and it's not a huge tragedy if we
|
|
||||||
* fail, so we don't ever return a failure */
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+
|
|
||||||
/* must be called after cyrus_init */
|
|
||||||
void mboxlist_init(int myflags)
|
|
||||||
{
|
|
||||||
--- cyrus-imapd-2.3.7/imap/mboxlist.h.rmquota 2006-07-23 12:52:14.000000000 +0200
|
|
||||||
+++ cyrus-imapd-2.3.7/imap/mboxlist.h 2006-07-23 12:52:14.000000000 +0200
|
|
||||||
@@ -125,7 +125,7 @@
|
|
||||||
* the planet */
|
|
||||||
int mboxlist_deletemailbox(const char *name, int isadmin, char *userid,
|
|
||||||
struct auth_state *auth_state, int checkacl,
|
|
||||||
- int local_only, int force);
|
|
||||||
+ int local_only, int force, int keepQuota);
|
|
||||||
|
|
||||||
/* Rename/move a mailbox (hierarchical) */
|
|
||||||
int mboxlist_renamemailbox(char *oldname, char *newname, char *partition,
|
|
||||||
--- cyrus-imapd-2.3.7/imap/mupdate.c.rmquota 2006-03-15 19:56:31.000000000 +0100
|
|
||||||
+++ cyrus-imapd-2.3.7/imap/mupdate.c 2006-07-23 12:52:14.000000000 +0200
|
|
||||||
@@ -2297,7 +2297,7 @@
|
|
||||||
remote_boxes.head = r->next;
|
|
||||||
} else if (ret < 0) {
|
|
||||||
/* Local without corresponding remote, delete it */
|
|
||||||
- mboxlist_deletemailbox(l->mailbox, 1, "", NULL, 0, 0, 0);
|
|
||||||
+ mboxlist_deletemailbox(l->mailbox, 1, "", NULL, 0, 0, 0, 1);
|
|
||||||
local_boxes.head = l->next;
|
|
||||||
} else /* (ret > 0) */ {
|
|
||||||
/* Remote without corresponding local, insert it */
|
|
||||||
@@ -2312,7 +2312,7 @@
|
|
||||||
if(l && !r) {
|
|
||||||
/* we have more deletes to do */
|
|
||||||
while(l) {
|
|
||||||
- mboxlist_deletemailbox(l->mailbox, 1, "", NULL, 0, 0, 0);
|
|
||||||
+ mboxlist_deletemailbox(l->mailbox, 1, "", NULL, 0, 0, 0, 1);
|
|
||||||
local_boxes.head = l->next;
|
|
||||||
l = local_boxes.head;
|
|
||||||
}
|
|
||||||
--- cyrus-imapd-2.3.7/imap/nntpd.c.rmquota 2006-05-26 17:50:07.000000000 +0200
|
|
||||||
+++ cyrus-imapd-2.3.7/imap/nntpd.c 2006-07-23 12:52:14.000000000 +0200
|
|
||||||
@@ -3356,7 +3356,7 @@
|
|
||||||
/* XXX should we delete right away, or wait until empty? */
|
|
||||||
|
|
||||||
r = mboxlist_deletemailbox(mailboxname, 0,
|
|
||||||
- newsmaster, newsmaster_authstate, 1, 0, 0);
|
|
||||||
+ newsmaster, newsmaster_authstate, 1, 0, 0, 1);
|
|
||||||
|
|
||||||
if (!r) sync_log_mailbox(mailboxname);
|
|
||||||
|
|
||||||
--- cyrus-imapd-2.3.7/imap/sync_reset.c.rmquota 2005-12-13 16:31:10.000000000 +0100
|
|
||||||
+++ cyrus-imapd-2.3.7/imap/sync_reset.c 2006-07-23 12:52:14.000000000 +0200
|
|
||||||
@@ -254,7 +254,7 @@
|
|
||||||
if (r) goto fail;
|
|
||||||
|
|
||||||
for (item = list->head ; item ; item = item->next) {
|
|
||||||
- r=mboxlist_deletemailbox(item->name, 1, NULL, sync_authstate, 1, 0, 0);
|
|
||||||
+ r=mboxlist_deletemailbox(item->name, 1, NULL, sync_authstate, 1, 0, 0, 1);
|
|
||||||
|
|
||||||
if (r) goto fail;
|
|
||||||
}
|
|
||||||
@@ -270,7 +270,7 @@
|
|
||||||
if (r) goto fail;
|
|
||||||
|
|
||||||
for (item = list->head ; item ; item = item->next) {
|
|
||||||
- r=mboxlist_deletemailbox(item->name, 1, NULL, sync_authstate, 1, 0, 0);
|
|
||||||
+ r=mboxlist_deletemailbox(item->name, 1, NULL, sync_authstate, 1, 0, 0, 1);
|
|
||||||
|
|
||||||
if (r) goto fail;
|
|
||||||
}
|
|
||||||
@@ -278,7 +278,7 @@
|
|
||||||
|
|
||||||
/* Nuke inbox (recursive nuke possible?) */
|
|
||||||
snprintf(buf, sizeof(buf)-1, "user.%s", user);
|
|
||||||
- r = mboxlist_deletemailbox(buf, 1, "cyrus", sync_authstate, 1, 0, 0);
|
|
||||||
+ r = mboxlist_deletemailbox(buf, 1, "cyrus", sync_authstate, 1, 0, 0, 1);
|
|
||||||
if (r && (r != IMAP_MAILBOX_NONEXISTENT)) goto fail;
|
|
||||||
|
|
||||||
if ((r=user_deletedata(user, sync_userid, sync_authstate, 1)))
|
|
||||||
--- cyrus-imapd-2.3.7/imap/sync_server.c.rmquota 2006-06-12 20:56:42.000000000 +0200
|
|
||||||
+++ cyrus-imapd-2.3.7/imap/sync_server.c 2006-07-23 12:52:14.000000000 +0200
|
|
||||||
@@ -1576,7 +1576,7 @@
|
|
||||||
|
|
||||||
for (item = list->head ; item ; item = item->next) {
|
|
||||||
r=mboxlist_deletemailbox(item->name, sync_userisadmin, sync_userid,
|
|
||||||
- sync_authstate, 0, 0, 1);
|
|
||||||
+ sync_authstate, 0, 0, 1, 1);
|
|
||||||
|
|
||||||
if (r) goto fail;
|
|
||||||
}
|
|
||||||
@@ -1586,7 +1586,7 @@
|
|
||||||
(sync_namespacep->mboxname_tointernal)(sync_namespacep, "INBOX",
|
|
||||||
user, buf);
|
|
||||||
r = mboxlist_deletemailbox(buf, sync_userisadmin, sync_userid,
|
|
||||||
- sync_authstate, 0, 0, 1);
|
|
||||||
+ sync_authstate, 0, 0, 1, 1);
|
|
||||||
if (r && (r != IMAP_MAILBOX_NONEXISTENT)) goto fail;
|
|
||||||
|
|
||||||
if ((r=user_deletedata(user, sync_userid, sync_authstate, 1)))
|
|
||||||
@@ -2508,7 +2508,7 @@
|
|
||||||
|
|
||||||
/* Delete with admin priveleges */
|
|
||||||
r = mboxlist_deletemailbox(name, sync_userisadmin, sync_userid,
|
|
||||||
- sync_authstate, 0, 0, 1);
|
|
||||||
+ sync_authstate, 0, 0, 1, 1);
|
|
||||||
|
|
||||||
if (r)
|
|
||||||
prot_printf(sync_out, "NO Failed to delete %s: %s\r\n",
|
|
||||||
@ -23,7 +23,7 @@ fi
|
|||||||
[ -x /usr/lib/cyrus-imapd/ctl_mboxlist ] || exit 0
|
[ -x /usr/lib/cyrus-imapd/ctl_mboxlist ] || exit 0
|
||||||
|
|
||||||
# rotate mailbox lists
|
# rotate mailbox lists
|
||||||
seq $[ $ROTATE - 1 ] 1 | while read i; do
|
seq $[ $ROTATE - 1 ] -1 1 | while read i; do
|
||||||
[ -f ${MBOXLIST}.${i}.gz ] && mv -f ${MBOXLIST}.${i}.gz ${MBOXLIST}.$[ $i + 1 ].gz
|
[ -f ${MBOXLIST}.${i}.gz ] && mv -f ${MBOXLIST}.${i}.gz ${MBOXLIST}.$[ $i + 1 ].gz
|
||||||
done
|
done
|
||||||
[ -f ${MBOXLIST}.gz ] && mv -f ${MBOXLIST}.gz ${MBOXLIST}.1.gz
|
[ -f ${MBOXLIST}.gz ] && mv -f ${MBOXLIST}.gz ${MBOXLIST}.1.gz
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
Name: cyrus-imapd
|
Name: cyrus-imapd
|
||||||
Version: 2.3.8
|
Version: 2.3.8
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
# ********************** BUILD TIME OPTIONS START **********************
|
# ********************** BUILD TIME OPTIONS START **********************
|
||||||
|
|
||||||
@ -813,6 +813,9 @@ fi
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Apr 04 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.8-2
|
||||||
|
- fixed mboxlist backup rotation (#197054)
|
||||||
|
|
||||||
* Mon Mar 12 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.8-1
|
* Mon Mar 12 2007 Tomas Janousek <tjanouse@redhat.com> - 2.3.8-1
|
||||||
- update to latest upstream
|
- update to latest upstream
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user