File working-diff.patch of Package cyrus-imapd

File working-diff.patch of Package cyrus-imapd (Revision be6cc2e4a3efe75b17939c46ef36d0b9)

Currently displaying revision be6cc2e4a3efe75b17939c46ef36d0b9 , Show latest

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);
 
-	mboxevent_set_access(mboxevent, NULL, NULL, userid, name);
+	mboxevent_set_access(mboxevent, NULL, NULL, userid, name, 1);
 	mboxevent_notify(mboxevent);
 	mboxevent_free(&mboxevent);
     }
diff --git a/imap/pop3d.c b/imap/pop3d.c
index 06f9e67..c3d0db5 100644
--- a/imap/pop3d.c
+++ b/imap/pop3d.c
@@ -591,7 +591,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,
-			     NULL, popd_userid, NULL);
+			     NULL, popd_userid, NULL, 1);
 
 	mboxevent_notify(mboxevent);
 	mboxevent_free(&mboxevent);
@@ -1779,7 +1779,7 @@ int openinbox(void)
     /* 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);
diff --git a/lib/cyrusdb_skiplist.c b/lib/cyrusdb_skiplist.c
index 18d3ca3..fc540e0 100644
--- a/lib/cyrusdb_skiplist.c
+++ b/lib/cyrusdb_skiplist.c
@@ -399,7 +399,7 @@ static unsigned RECSIZE_safe(struct dbengine *db, const char *ptr)
     case ADD:
 	level = LEVEL_safe(db, ptr);
 	if (!level) {
-	    syslog(LOG_ERR, "IOERROR: skiplist RECSIZE not safe %s, offset %u",
+	    syslog(LOG_ERR, "IOERROR: skiplist2 RECSIZE_safe not safe %s, offset %u",
 		   db->fname, (unsigned)(ptr - db->map_base));
 	    return 0;
 	}
@@ -413,20 +413,50 @@ static unsigned RECSIZE_safe(struct dbengine *db, const char *ptr)
 	break;
 
     case DELETE:
-	if (!is_safe(db, ptr+8)) {
-	    syslog(LOG_ERR, "IOERROR: skiplist RECSIZE not safe %s, offset %u",
-		   db->fname, (unsigned)(ptr - db->map_base));
-	    return 0;
-	}
 	ret += 8;
 	break;
 
     case COMMIT:
-	if (!is_safe(db, ptr+4)) {
-	    syslog(LOG_ERR, "IOERROR: skiplist RECSIZE not safe %s, offset %u",
-		   db->fname, (unsigned)(ptr - db->map_base));
-	    return 0;
-	}
+	ret += 4;
+	break;
+    }
+
+    return ret;
+}
+
+/* how many levels does this record have? */
+static unsigned LEVEL(const char *ptr)
+{
+    const uint32_t *p, *q;
+
+    assert(TYPE(ptr) == DUMMY || TYPE(ptr) == INORDER || TYPE(ptr) == ADD);
+    p = q = (uint32_t *) FIRSTPTR(ptr);
+    while (*p != (uint32_t)-1) p++;
+    return (p - q);
+}
+
+/* how big is this record? */
+static unsigned RECSIZE(const char *ptr)
+{
+    int ret = 0;
+    switch (TYPE(ptr)) {
+    case DUMMY:
+    case INORDER:
+    case ADD:
+	ret += 4;			/* tag */
+	ret += 4;			/* keylen */
+	ret += ROUNDUP(KEYLEN(ptr));    /* key */
+	ret += 4;			/* datalen */
+	ret += ROUNDUP(DATALEN(ptr));   /* data */
+	ret += 4 * LEVEL(ptr);	        /* pointers */
+	ret += 4;			/* padding */
+	break;
+
+    case DELETE:
+	ret += 8;
+	break;
+
+    case COMMIT:
 	ret += 4;
 	break;
     }
@@ -494,12 +524,7 @@ static int newtxn(struct dbengine *db, struct txn **tidptr)
 }
 
 
-static unsigned PADDING_safe(struct dbengine *db, const char *ptr)
-{
-    unsigned size = RECSIZE_safe(db, ptr);
-    if (!size) return 0;
-    return ntohl(*((uint32_t *)((ptr) + size - 4)));
-}
+#define PADDING(ptr) (ntohl(*((uint32_t *)((ptr) + RECSIZE(ptr) - 4))))
 
 /* given an open, mapped db, read in the header information */
 static int read_header(struct dbengine *db)
@@ -570,9 +595,9 @@ static int read_header(struct dbengine *db)
 	       db->fname);
 	r = CYRUSDB_IOERROR;
     }
-    if (!r && LEVEL_safe(db, dptr) != db->maxlevel) {
+    if (!r && LEVEL(dptr) != db->maxlevel) {
 	syslog(LOG_ERR, "DBERROR: %s: DUMMY level(%d) != db->maxlevel(%d)",
-	       db->fname, LEVEL_safe(db, dptr), db->maxlevel);
+	       db->fname, LEVEL(dptr), db->maxlevel);
 	r = CYRUSDB_IOERROR;
     }
 
@@ -1281,7 +1306,7 @@ static int mystore(struct dbengine *db,
 	    return CYRUSDB_EXISTS;
 	} else {
 	    /* replace with an equal height node */
-	    lvl = LEVEL_safe(db, ptr);
+	    lvl = LEVEL(ptr);
 
 	    /* log a removal */
 	    WRITEV_ADD_TO_IOVEC(iov, num_iov, (char *) &delrectype, 4);
@@ -1575,8 +1600,8 @@ static int myabort(struct dbengine *db, struct txn *tid)
 
 	/* find the last log entry */
 	for (offset = tid->logstart, ptr = db->map_base + offset; 
-	     offset + RECSIZE_safe(db, ptr) != (uint32_t) tid->logend;
-	     offset += RECSIZE_safe(db, ptr), ptr = db->map_base + offset) ;
+	     offset + RECSIZE(ptr) != (uint32_t) tid->logend;
+	     offset += RECSIZE(ptr), ptr = db->map_base + offset) ;
 	
 	offset = ptr - db->map_base;
 
@@ -1613,7 +1638,7 @@ static int myabort(struct dbengine *db, struct txn *tid)
 	    /* re-add this record.  it can't exist right now. */
 	    netnewoffset = *((uint32_t *)(ptr + 4));
 	    q = db->map_base + ntohl(netnewoffset);
-	    lvl = LEVEL_safe(db, q);
+	    lvl = LEVEL(q);
 	    (void) find_node(db, KEY(q), KEYLEN(q), updateoffsets);
 	    for (i = 0; i < lvl; i++) {
 		/* the current pointers FROM this node are correct,
@@ -1628,7 +1653,7 @@ static int myabort(struct dbengine *db, struct txn *tid)
 	}
 
 	/* remove looking at this */
-	tid->logend -= RECSIZE_safe(db, ptr);
+	tid->logend -= RECSIZE(ptr);
     }
 
     /* truncate the file to remove log entries */
@@ -1742,13 +1767,13 @@ static int mycheckpoint(struct dbengine *db)
 	uint32_t netnewoffset;
 
 	ptr = db->map_base + offset;
-	lvl = LEVEL_safe(db, ptr);
+	lvl = LEVEL(ptr);
 	db->listsize++;
 
 	num_iov = 0;
 	WRITEV_ADD_TO_IOVEC(iov, num_iov, (char *) &iorectype, 4);
 	/* copy all but the rectype from the record */
-	WRITEV_ADD_TO_IOVEC(iov, num_iov, (char *) ptr + 4, RECSIZE_safe(db, ptr) - 4);
+	WRITEV_ADD_TO_IOVEC(iov, num_iov, (char *) ptr + 4, RECSIZE(ptr) - 4);
 
 	newoffset = lseek(db->fd, 0, SEEK_END);
 	netnewoffset = htonl(newoffset);
@@ -1915,9 +1940,9 @@ static int dump(struct dbengine *db, int detail __attribute__((unused)))
 	case INORDER:
 	case ADD:
 	    printf("kl=%d dl=%d lvl=%d\n",
-		   KEYLEN(ptr), DATALEN(ptr), LEVEL_safe(db, ptr));
+		   KEYLEN(ptr), DATALEN(ptr), LEVEL(ptr));
 	    printf("\t");
-	    for (i = 0; i < LEVEL_safe(db, ptr); i++) {
+	    for (i = 0; i < LEVEL(ptr); i++) {
 		printf("%04X ", FORWARD(ptr, i));
 	    }
 	    printf("\n");
@@ -1932,7 +1957,7 @@ static int dump(struct dbengine *db, int detail __attribute__((unused)))
 	    break;
 	}
 
-	ptr += RECSIZE_safe(db, ptr);
+	ptr += RECSIZE(ptr);
     }
 
     unlock(db);
@@ -1961,7 +1986,7 @@ static int myconsistent(struct dbengine *db, struct txn *tid, int locked)
 
 	ptr = db->map_base + offset;
 
-	for (i = 0; i < LEVEL_safe(db, ptr); i++) {
+	for (i = 0; i < LEVEL(ptr); i++) {
 	    offset = FORWARD(ptr, i);
 
 	    if (offset > db->map_size) {
@@ -2005,11 +2030,9 @@ static int myconsistent(struct dbengine *db, struct txn *tid, int locked)
 static int recovery(struct dbengine *db, int flags)
 {
     const char *ptr, *keyptr;
-    unsigned filesize = db->map_size;
     unsigned updateoffsets[SKIPLIST_MAXLEVEL+1];
     uint32_t offset, offsetnet, myoff = 0;
-    int r = 0;
-    int need_checkpoint = libcyrus_config_getswitch(CYRUSOPT_SKIPLIST_ALWAYS_CHECKPOINT);
+    int r = 0, need_checkpoint = 0;
     time_t start = time(NULL);
     unsigned i;
 
@@ -2063,11 +2086,11 @@ static int recovery(struct dbengine *db, int flags)
     }
 
     /* pointers for db->maxlevel */
-    if (!r && LEVEL_safe(db, ptr) != db->maxlevel) {
+    if (!r && LEVEL(ptr) != db->maxlevel) {
 	r = CYRUSDB_IOERROR;
 	syslog(LOG_ERR, 
 	       "DBERROR: skiplist recovery %s: dummy node level: %d != %d",
-	       db->fname, LEVEL_safe(db, ptr), db->maxlevel);
+	       db->fname, LEVEL(ptr), db->maxlevel);
     }
     
     for (i = 0; i < db->maxlevel; i++) {
@@ -2078,7 +2101,7 @@ static int recovery(struct dbengine *db, int flags)
     
     /* reset the data that was written INORDER by the last checkpoint */
     offset = DUMMY_OFFSET(db) + DUMMY_SIZE(db);
-    while (!r && (offset < filesize)
+    while (!r && (offset < db->map_size)
 	      && TYPE(db->map_base + offset) == INORDER) {
 	ptr = db->map_base + offset;
 	offsetnet = htonl(offset);
@@ -2088,9 +2111,9 @@ static int recovery(struct dbengine *db, int flags)
 	/* xxx check \0 fill on key */
 
 	/* xxx check \0 fill on data */
-
+	    
 	/* update previous pointers, record these for updating */
-	for (i = 0; !r && i < LEVEL_safe(db, ptr); i++) {
+	for (i = 0; !r && i < LEVEL(ptr); i++) {
 	    r = lseek(db->fd, updateoffsets[i], SEEK_SET);
 	    if (r < 0) {
 		syslog(LOG_ERR, "DBERROR: lseek %s: %m", db->fname);
@@ -2113,23 +2136,15 @@ static int recovery(struct dbengine *db, int flags)
 	    updateoffsets[i] = offset + (PTR(ptr, i) - ptr);
 	}
 
-	if (!r) {
-	    unsigned size = RECSIZE_safe(db, ptr);
-	    if (!size) {
-		syslog(LOG_ERR, "skiplist recovery %s: damaged record at %u, truncating here",
-		       db->fname, offset);
-		filesize = offset;
-		break;
-	    }
-
-	    if (PADDING_safe(db, ptr) != (uint32_t) -1) {
-		syslog(LOG_ERR, "DBERROR: %s: offset %04X padding not -1",
-		       db->fname, offset);
-		filesize = offset;
-		break;
-	    }
+	/* check padding */
+	if (!r && PADDING(ptr) != (uint32_t) -1) {
+	    syslog(LOG_ERR, "DBERROR: %s: offset %04X padding not -1",
+		   db->fname, offset);
+	    r = CYRUSDB_IOERROR;
+	}
 
-	    offset += size;
+	if (!r) {
+	    offset += RECSIZE(ptr);
 	}
     }
 
@@ -2164,7 +2179,7 @@ static int recovery(struct dbengine *db, int flags)
     }
 
     /* replay the log */
-    while (!r && offset < filesize) {
+    while (!r && offset < db->map_size) {
 	const char *p, *q;
 
 	/* refresh map, so we see the writes we've just done */
@@ -2176,7 +2191,7 @@ static int recovery(struct dbengine *db, int flags)
 	/* bugs in recovery truncates could have left some bogus zeros here */
 	if (TYPE(ptr) == 0) {
 	    int orig = offset;
-	    while (TYPE(ptr) == 0 && offset < filesize) {
+	    while (TYPE(ptr) == 0 && offset < db->map_size) {
 		offset += 4;
 		ptr = db->map_base + offset;
 	    }
@@ -2189,7 +2204,7 @@ static int recovery(struct dbengine *db, int flags)
 
 	/* if this is a commit, we've processed everything in this txn */
 	if (TYPE(ptr) == COMMIT) {
-	    offset += RECSIZE_safe(db, ptr);
+	    offset += RECSIZE(ptr);
 	    continue;
 	}
 
@@ -2203,7 +2218,7 @@ static int recovery(struct dbengine *db, int flags)
 	}
 
 	/* look ahead for a commit */
-	q = db->map_base + filesize;
+	q = db->map_base + db->map_size;
 	p = ptr;
 	for (;;) {
             if (RECSIZE_safe(db, p) <= 0) {
@@ -2215,7 +2230,7 @@ static int recovery(struct dbengine *db, int flags)
                 p = q;
                 break;
             }
-	    p += RECSIZE_safe(db, p);
+	    p += RECSIZE(p);
 	    if (p >= q) break;
 	    if (TYPE(p) == COMMIT) break;
 	}
@@ -2224,7 +2239,16 @@ static int recovery(struct dbengine *db, int flags)
 		   "skiplist recovery %s: found partial txn, not replaying",
 		   db->fname);
 
-	    filesize = offset;
+	    /* no commit, we should truncate */
+	    if (ftruncate(db->fd, offset) < 0) {
+		syslog(LOG_ERR, 
+		       "DBERROR: skiplist recovery %s: ftruncate: %m",
+		       db->fname);
+		r = CYRUSDB_IOERROR;
+	    }
+
+	    /* set the map size back as well */
+	    db->map_size = offset;
 
 	    break;
 	}
@@ -2290,7 +2314,7 @@ static int recovery(struct dbengine *db, int flags)
 	    }
 	    offsetnet = htonl(offset);
 
-	    lvl = LEVEL_safe(db, ptr);
+	    lvl = LEVEL(ptr);
 	    if (lvl > SKIPLIST_MAXLEVEL) {
 		syslog(LOG_ERR,
 		       "DBERROR: skiplist recovery %s: node claims level %d (greater than max %d)",
@@ -2299,15 +2323,15 @@ static int recovery(struct dbengine *db, int flags)
 	    } else {
 		/* NOTE - in the bogus case where a record with the same key already
 		 * exists, there are three possible cases:
-		 * lvl == LEVEL_safe(db, keyptr)
+		 * lvl == LEVEL(keyptr)
 		 *    * trivial: all to me, all mine to keyptr's FORWARD
-		 * lvl > LEVEL_safe(db, keyptr)	 -
+		 * lvl > LEVEL(keyptr)	 -
 		 *    * all updateoffsets values should point to me
-		 *    * up until LEVEL_safe(db, keyptr) set to keyptr's next values
+		 *    * up until LEVEL(keyptr) set to keyptr's next values
 		 *      (updateoffsets[i] should be keyptr in these cases)
 		 *      then point all my higher pointers are updateoffsets[i]'s
 		 *      FORWARD instead.
-		 * lvl < LEVEL_safe(db, keyptr)
+		 * lvl < LEVEL(keyptr)
 		 *    * updateoffsets values up to lvl should point to me
 		 *    * all mine should point to keyptr's next values
 		 *    * from lvl up, all updateoffsets[i] should point to
@@ -2319,7 +2343,7 @@ static int recovery(struct dbengine *db, int flags)
 		 */
 		for (i = 0; i < lvl; i++) {
 		    /* set our next pointers */
-		    if (keyptr && i < LEVEL_safe(db, keyptr)) {
+		    if (keyptr && i < LEVEL(keyptr)) {
                         /* need to replace the matching record key */
 			newoffsets[i] = 
 			    htonl(FORWARD(keyptr, i));
@@ -2338,9 +2362,9 @@ static int recovery(struct dbengine *db, int flags)
 		lseek(db->fd, FIRSTPTR(ptr) - db->map_base, SEEK_SET);
 		retry_write(db->fd, (char *) newoffsets, 4 * lvl);
                 
-		if (keyptr && lvl < LEVEL_safe(db, keyptr)) {
+		if (keyptr && lvl < LEVEL(keyptr)) {
 		    uint32_t newoffsetnet;
-		    for (i = lvl; i < LEVEL_safe(db, keyptr); i++) {
+		    for (i = lvl; i < LEVEL(keyptr); i++) {
 			newoffsetnet = htonl(FORWARD(keyptr, i));
 			/* replace 'updateoffsets' to point onwards */
 			lseek(db->fd, 
@@ -2356,22 +2380,21 @@ static int recovery(struct dbengine *db, int flags)
 	}
 
 	/* move to next record */
-	unsigned size = RECSIZE_safe(db, ptr);
-	if (!size) break;
-	offset += size;
+	offset += RECSIZE(ptr);
     }
 
-    /* didn't read the exact end?  We should truncate */
-    if (offset < db->map_size) {
-	if (ftruncate(db->fd, offset) < 0) {
-	    syslog(LOG_ERR,
-		   "DBERROR: skiplist recovery %s: ftruncate: %m",
-		   db->fname);
-	    r = CYRUSDB_IOERROR;
-	}
+    if (libcyrus_config_getswitch(CYRUSOPT_SKIPLIST_ALWAYS_CHECKPOINT)) {
+	/* refresh map, so we see the writes we've just done */
+	map_refresh(db->fd, 0, &db->map_base, &db->map_len, db->map_size,
+		    db->fname, 0);
 
-	/* set the map size back as well */
-	db->map_size = offset;
+	r = mycheckpoint(db);
+
+	if (r || !(flags & RECOVERY_CALLER_LOCKED)) {
+	    unlock(db);
+	}
+    
+	return r;
     }
 
     /* fsync the recovered database */
@@ -2404,16 +2427,13 @@ static int recovery(struct dbengine *db, int flags)
     }
 
     if (!r && need_checkpoint) {
-	/* refresh map, so we see the writes we've just done */
-	map_refresh(db->fd, 0, &db->map_base, &db->map_len, db->map_size,
-		    db->fname, 0);
 	r = mycheckpoint(db);
     }
 
-    if (r || !(flags & RECOVERY_CALLER_LOCKED)) {
+    if(r || !(flags & RECOVERY_CALLER_LOCKED)) {
 	unlock(db);
     }
-
+    
     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 }