Changed the API for cdb_rewind() / cdb_next_item() to make the caller hold the cursor

[citadel.git] / citadel / server / control.c

diff --git a/citadel/server/control.c b/citadel/server/control.c
index 3db2459c059e131f685fa16399331965452dd892..80c24da55afcca056425c6ea7bf293bf99026745 100644 (file)
--- a/citadel/server/control.c
+++ b/citadel/server/control.c
@@ -155,7 +155,7 @@ void check_control(void) {
 
        if (sanity_diag_mode == 1) {
                syslog(LOG_INFO, "control: sanity check diagnostic mode is active - exiting now");
-               abort();
+               exit(CTDLEXIT_SANITY);
        }
 }
 
@@ -654,8 +654,8 @@ void cmd_conf(char *argbuf) {
                char *value = NULL;
        
                cprintf("%d all configuration variables\n", LISTING_FOLLOWS);
-               cdb_rewind(CDB_CONFIG);
-               while (cdbcfg = cdb_next_item(CDB_CONFIG), cdbcfg != NULL) {
+               void *cur = cdb_rewind(CDB_CONFIG);
+               while (cdbcfg = cdb_next_item(cur, CDB_CONFIG), cdbcfg != NULL) {
                        if (cdbcfg->len < 1020) {
                                keylen = strlen(cdbcfg->ptr);
                                key = cdbcfg->ptr;