* Changed the format of the euidindex record to contain the record's key.

[citadel.git] / citadel / serv_upgrade.c

diff --git a/citadel/serv_upgrade.c b/citadel/serv_upgrade.c
index 79b0d9c13f54254fe9cb5b0e0e9e42c96eb67641..f9fa6fab79965ac2203a9757606031bd69ab6834 100644 (file)
--- a/citadel/serv_upgrade.c
+++ b/citadel/serv_upgrade.c
@@ -43,6 +43,7 @@
 #include "msgbase.h"
 #include "tools.h"
 #include "serv_upgrade.h"
+#include "euidindex.h"
 
 
 
@@ -102,7 +103,7 @@ void bump_mailbox_generation_numbers(void) {
 
 
 /* 
- * Back end processing function for convert_bbsuid_to_minusone()
+ * Back end processing function for convert_ctdluid_to_minusone()
  */
 void cbtm_backend(struct ctdluser *usbuf, void *data) {
        static struct UserProcList *uplist = NULL;
@@ -128,7 +129,7 @@ void cbtm_backend(struct ctdluser *usbuf, void *data) {
 
                if (lgetuser(&us, uplist->user) == 0) {
                        lprintf(CTDL_DEBUG, "Processing <%s>...\n", uplist->user);
-                       if (us.uid == BBSUID) {
+                       if (us.uid == CTDLUID) {
                                us.uid = (-1);
                        }
                        lputuser(&us);
@@ -141,9 +142,9 @@ void cbtm_backend(struct ctdluser *usbuf, void *data) {
 }
 
 /*
- * quick fix to change all BBSUID users to (-1)
+ * quick fix to change all CTDLUID users to (-1)
  */
-void convert_bbsuid_to_minusone(void) {
+void convert_ctdluid_to_minusone(void) {
        lprintf(CTDL_WARNING, "Applying uid changes\n");
        ForEachUser(cbtm_backend, NULL);
        cbtm_backend(NULL, NULL);
@@ -172,6 +173,14 @@ void update_config(void) {
                strcpy(config.c_ip_addr, "0.0.0.0");
        }
 
+       if (CitControl.version < 650) {
+               config.c_enable_fulltext = 0;
+       }
+
+       if (CitControl.version < 652) {
+               config.c_auto_cull = 1;
+       }
+
        put_config();
 }
 
@@ -206,7 +215,10 @@ void check_server_upgrades(void) {
                bump_mailbox_generation_numbers();
        }
        if ((CitControl.version > 000) && (CitControl.version < 608)) {
-               convert_bbsuid_to_minusone();
+               convert_ctdluid_to_minusone();
+       }
+       if ((CitControl.version > 000) && (CitControl.version < 658)) {
+               rebuild_euid_index();
        }
 
        CitControl.version = REV_LEVEL;