194c194
< +++ cyrus-imapd-2.2.6.rmquota+deletemailbox.uncompiled/imap/mboxlist.c	2004-06-20 14:57:09.000000000 +0300
---
> +++ cyrus-imapd-2.2.6.rmquota+deletemailbox.uncompiled/imap/mboxlist.c	2004-07-05 18:13:36.000000000 +0300
235c235
< @@ -1015,13 +1022,40 @@
---
> @@ -1015,13 +1022,44 @@
267,268c267,272
< +            mboxlist_findall(NULL, pattern, isadmin, NULL,
< +                    NULL, child_cb, (void *) &has_children);
---
> +            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, 0 ))
> +		    has_children = 1;
272c276
< +        if(!keepQuota || !has_children)
---
> +        if(!keepQuota || !has_children )
278c282
< @@ -2341,6 +2375,7 @@
---
> @@ -2341,6 +2379,7 @@
286c290
< @@ -2359,17 +2394,21 @@
---
> @@ -2359,17 +2398,21 @@
310c314
< @@ -2386,13 +2425,45 @@
---
> @@ -2386,13 +2429,45 @@
362c366
< @@ -2490,6 +2561,7 @@
---
> @@ -2490,6 +2565,7 @@
370c374
< @@ -2507,27 +2579,24 @@
---
> @@ -2507,27 +2583,24 @@
416c420
< @@ -2537,18 +2606,24 @@
---
> @@ -2537,18 +2610,24 @@