Removed an old crufty upgrade routing -- minimum upgradable version is now 5.91

[citadel.git] / citadel / modules / upgrade / serv_upgrade.c

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index eadfefb3086a18af2c5d989626f14c10423682e8..53f737b676d0b6fbf8c3277303747d23de17deb1 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -94,60 +94,6 @@ void fix_sys_user_name(void)
 }
 
 
-/* 
- * Back end processing function for cmd_bmbx
- */
-void cmd_bmbx_backend(struct ctdlroom *qrbuf, void *data) {
-       static struct RoomProcList *rplist = NULL;
-       struct RoomProcList *ptr;
-       struct ctdlroom qr;
-
-       /* Lazy programming here.  Call this function as a CtdlForEachRoom backend
-        * in order to queue up the room names, or call it with a null room
-        * to make it do the processing.
-        */
-       if (qrbuf != NULL) {
-               ptr = (struct RoomProcList *) malloc(sizeof (struct RoomProcList));
-               if (ptr == NULL) return;
-
-               safestrncpy(ptr->name, qrbuf->QRname, sizeof ptr->name);
-               ptr->next = rplist;
-               rplist = ptr;
-               return;
-       }
-
-       while (rplist != NULL) {
-
-               if (CtdlGetRoomLock(&qr, rplist->name) == 0) {
-                       syslog(LOG_DEBUG, "Processing <%s>...", rplist->name);
-                       if ( (qr.QRflags & QR_MAILBOX) == 0) {
-                               syslog(LOG_DEBUG, "  -- not a mailbox");
-                       }
-                       else {
-
-                               qr.QRgen = time(NULL);
-                               syslog(LOG_DEBUG, "  -- fixed!");
-                       }
-                       CtdlPutRoomLock(&qr);
-               }
-
-               ptr = rplist;
-               rplist = rplist->next;
-               free(ptr);
-       }
-}
-
-/*
- * quick fix to bump mailbox generation numbers
- */
-void bump_mailbox_generation_numbers(void) {
-       syslog(LOG_WARNING, "Applying security fix to mailbox rooms");
-       CtdlForEachRoom(cmd_bmbx_backend, NULL);
-       cmd_bmbx_backend(NULL, NULL);
-       return;
-}
-
-
 /* 
  * Back end processing function for convert_ctdluid_to_minusone()
  */
@@ -261,7 +207,7 @@ void guess_time_zone(void) {
  */
 void update_config(void) {
 
-       int oldver = CitControl.MM_hosted_upgrade_level;
+       int oldver = CtdlGetConfigInt("MM_hosted_upgrade_level");
 
        if (oldver < 606) {
                CtdlSetConfigInt("c_rfc822_strict_from", 0);
@@ -310,13 +256,12 @@ void update_config(void) {
  */
 void check_server_upgrades(void) {
 
-       get_control();
        syslog(LOG_INFO, "Existing database version on disk is %d.%02d",
-               (CitControl.MM_hosted_upgrade_level / 100),
-               (CitControl.MM_hosted_upgrade_level % 100)
+               (CtdlGetConfigInt("MM_hosted_upgrade_level") / 100),
+               (CtdlGetConfigInt("MM_hosted_upgrade_level") % 100)
        );
 
-       if (CitControl.MM_hosted_upgrade_level < REV_LEVEL) {
+       if (CtdlGetConfigInt("MM_hosted_upgrade_level") < REV_LEVEL) {
                syslog(LOG_WARNING,
                        "Server hosted updates need to be processed at this time.  Please wait..."
                );
@@ -327,29 +272,26 @@ void check_server_upgrades(void) {
 
        update_config();
 
-       if ((CitControl.MM_hosted_upgrade_level > 000) && (CitControl.MM_hosted_upgrade_level < 555)) {
+       if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 591)) {
                syslog(LOG_EMERG, "This database is too old to be upgraded.  Citadel server will exit.");
                exit(EXIT_FAILURE);
        }
-       if ((CitControl.MM_hosted_upgrade_level > 000) && (CitControl.MM_hosted_upgrade_level < 591)) {
-               bump_mailbox_generation_numbers();
-       }
-       if ((CitControl.MM_hosted_upgrade_level > 000) && (CitControl.MM_hosted_upgrade_level < 608)) {
+       if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 608)) {
                convert_ctdluid_to_minusone();
        }
-       if ((CitControl.MM_hosted_upgrade_level > 000) && (CitControl.MM_hosted_upgrade_level < 659)) {
+       if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 659)) {
                rebuild_euid_index();
        }
-       if (CitControl.MM_hosted_upgrade_level < 735) {
+       if (CtdlGetConfigInt("MM_hosted_upgrade_level") < 735) {
                fix_sys_user_name();
        }
-       if (CitControl.MM_hosted_upgrade_level < 736) {
+       if (CtdlGetConfigInt("MM_hosted_upgrade_level") < 736) {
                rebuild_usersbynumber();
        }
-       if (CitControl.MM_hosted_upgrade_level < 790) {
+       if (CtdlGetConfigInt("MM_hosted_upgrade_level") < 790) {
                remove_thread_users();
        }
-       if (CitControl.MM_hosted_upgrade_level < 810) {
+       if (CtdlGetConfigInt("MM_hosted_upgrade_level") < 810) {
                struct ctdlroom QRoom;
                if (!CtdlGetRoom(&QRoom, SMTP_SPOOLOUT_ROOM)) {
                        QRoom.QRdefaultview = VIEW_QUEUE;
@@ -361,7 +303,7 @@ void check_server_upgrades(void) {
                }
        }
 
-       CitControl.MM_hosted_upgrade_level = REV_LEVEL;
+       CtdlSetConfigInt("MM_hosted_upgrade_level", REV_LEVEL);
 
        /*
         * Negative values for maxsessions are not allowed.
@@ -378,8 +320,6 @@ void check_server_upgrades(void) {
                CtdlSetConfigInt("c_ep_mode", EXPIRE_MANUAL);
                CtdlSetConfigInt("c_ep_value", 0);
        }
-
-       put_control();
 }