Create CDB_CONFIG database. Renamed some members of CitControl.

[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 085f5f046d1ebca105e936a0ab0ef61e237cf79a..1ce073f78b911b8572e42f8de8504ec40265537c 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -1,7 +1,7 @@
 /*
  * Transparently handle the upgrading of server data formats.
  *
- * Copyright (c) 1987-2014 by the citadel.org team
+ * Copyright (c) 1987-2015 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 3.
@@ -262,36 +262,36 @@ void guess_time_zone(void) {
 void update_config(void) {
        get_config();
 
-       if (CitControl.version < 606) {
+       if (CitControl.MM_hosted_upgrade_level < 606) {
                config.c_rfc822_strict_from = 0;
        }
 
-       if (CitControl.version < 609) {
+       if (CitControl.MM_hosted_upgrade_level < 609) {
                config.c_purge_hour = 3;
        }
 
-       if (CitControl.version < 615) {
+       if (CitControl.MM_hosted_upgrade_level < 615) {
                config.c_ldap_port = 389;
        }
 
-       if (CitControl.version < 623) {
+       if (CitControl.MM_hosted_upgrade_level < 623) {
                strcpy(config.c_ip_addr, "*");
        }
 
-       if (CitControl.version < 650) {
+       if (CitControl.MM_hosted_upgrade_level < 650) {
                config.c_enable_fulltext = 1;
        }
 
-       if (CitControl.version < 652) {
+       if (CitControl.MM_hosted_upgrade_level < 652) {
                config.c_auto_cull = 1;
        }
 
-       if (CitControl.version < 725) {
+       if (CitControl.MM_hosted_upgrade_level < 725) {
                config.c_xmpp_c2s_port = 5222;
                config.c_xmpp_s2s_port = 5269;
        }
 
-       if (CitControl.version < 830) {
+       if (CitControl.MM_hosted_upgrade_level < 830) {
                config.c_nntp_port = 119;
                config.c_nntps_port = 563;
        }
@@ -313,11 +313,11 @@ void check_server_upgrades(void) {
 
        get_control();
        syslog(LOG_INFO, "Existing database version on disk is %d.%02d",
-               (CitControl.version / 100),
-               (CitControl.version % 100)
+               (CitControl.MM_hosted_upgrade_level / 100),
+               (CitControl.MM_hosted_upgrade_level % 100)
        );
 
-       if (CitControl.version < REV_LEVEL) {
+       if (CitControl.MM_hosted_upgrade_level < REV_LEVEL) {
                syslog(LOG_WARNING,
                        "Server hosted updates need to be processed at this time.  Please wait..."
                );
@@ -328,29 +328,29 @@ void check_server_upgrades(void) {
 
        update_config();
 
-       if ((CitControl.version > 000) && (CitControl.version < 555)) {
+       if ((CitControl.MM_hosted_upgrade_level > 000) && (CitControl.MM_hosted_upgrade_level < 555)) {
                syslog(LOG_EMERG, "This database is too old to be upgraded.  Citadel server will exit.");
                exit(EXIT_FAILURE);
        }
-       if ((CitControl.version > 000) && (CitControl.version < 591)) {
+       if ((CitControl.MM_hosted_upgrade_level > 000) && (CitControl.MM_hosted_upgrade_level < 591)) {
                bump_mailbox_generation_numbers();
        }
-       if ((CitControl.version > 000) && (CitControl.version < 608)) {
+       if ((CitControl.MM_hosted_upgrade_level > 000) && (CitControl.MM_hosted_upgrade_level < 608)) {
                convert_ctdluid_to_minusone();
        }
-       if ((CitControl.version > 000) && (CitControl.version < 659)) {
+       if ((CitControl.MM_hosted_upgrade_level > 000) && (CitControl.MM_hosted_upgrade_level < 659)) {
                rebuild_euid_index();
        }
-       if (CitControl.version < 735) {
+       if (CitControl.MM_hosted_upgrade_level < 735) {
                fix_sys_user_name();
        }
-       if (CitControl.version < 736) {
+       if (CitControl.MM_hosted_upgrade_level < 736) {
                rebuild_usersbynumber();
        }
-       if (CitControl.version < 790) {
+       if (CitControl.MM_hosted_upgrade_level < 790) {
                remove_thread_users();
        }
-       if (CitControl.version < 810) {
+       if (CitControl.MM_hosted_upgrade_level < 810) {
                struct ctdlroom QRoom;
                if (!CtdlGetRoom(&QRoom, SMTP_SPOOLOUT_ROOM)) {
                        QRoom.QRdefaultview = VIEW_QUEUE;
@@ -362,7 +362,7 @@ void check_server_upgrades(void) {
                }
        }
 
-       CitControl.version = REV_LEVEL;
+       CitControl.MM_hosted_upgrade_level = REV_LEVEL;
 
        /*
         * Negative values for maxsessions are not allowed.