On Tue, 28 Aug 2007, Ken Murchison wrote:
I just committed Bron's modified version of David's delayed delete patch, with a few small mods of my own. The only externally visible change is I renamed "deleteprefix" to "deletedprefix". I also removed/modified some of the option caching code.
Small bug fix (the p++ line) attached. -- David Carter Email: [EMAIL PROTECTED] University Computing Service, Phone: (01223) 334502 New Museums Site, Pembroke Street, Fax: (01223) 334679 Cambridge UK. CB2 3QH. Index: imap/cyr_expire.c =================================================================== RCS file: /cvs/src/cyrus/imap/cyr_expire.c,v retrieving revision 1.13 diff -u -r1.13 cyr_expire.c --- imap/cyr_expire.c 28 Aug 2007 18:42:27 -0000 1.13 +++ imap/cyr_expire.c 29 Aug 2007 15:39:24 -0000 @@ -291,8 +291,6 @@ void *rock) { struct delete_rock *drock = (struct delete_rock *) rock; - char fnamebuf[MAX_MAILBOX_PATH+1]; - struct stat sbuf; char *p; int i, r, domainlen = 0; struct delete_node *node; @@ -320,6 +318,8 @@ /* Sanity check for 8 hex digits only at the end */ p = strrchr(name, '.'); if (!p) return(0); + p++; + for (i = 0 ; i < 7; i++) { if (!isxdigit(p[i])) return(0); }