From: Art Cancro <ajc@citadel.org>
Date: Fri, 22 Jan 2016 22:49:06 +0000 (-0500)
Subject: Removed an old crufty upgrade routing -- minimum upgradable version is now 5.91
X-Git-Tag: Release_902~71
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=50e6ab485155e645f0999f7c79397a696a230e35

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

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 79f06a60a..c81f016ab 100644
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -194,11 +194,14 @@ RoomProcList *CreateRoomProcListEntry(struct ctdlroom *qrbuf, OneRoomNetCfg *One
 	struct RoomProcList *ptr;
 
 	ptr = (struct RoomProcList *) malloc(sizeof (struct RoomProcList));
-	if (ptr == NULL) return NULL;
+	if (ptr == NULL) {
+		return NULL;
+	}
 
 	ptr->namelen = strlen(qrbuf->QRname);
-	if (ptr->namelen > ROOMNAMELEN)
+	if (ptr->namelen > ROOMNAMELEN) {
 		ptr->namelen = ROOMNAMELEN - 1;
+	}
 
 	memcpy (ptr->name, qrbuf->QRname, ptr->namelen);
 	ptr->name[ptr->namelen] = '\0';
@@ -411,7 +414,7 @@ void network_do_queue(void)
 		free(pMapStr);
 	}
 
-	/* combine singe message files into one spool entry per remote node. */
+	/* combine single message files into one spool entry per remote node. */
 	network_consolidate_spoolout(working_ignetcfg, the_netmap);
 
 	/* shut down. */
@@ -426,8 +429,6 @@ void network_do_queue(void)
 		last_run = time(NULL);
 	}
 	destroy_network_queue_room(RL.rplist);
-	// SaveChangedConfigs();	// FIXME FOOFOO SAVE CHANGED THIS AACACACACCKK
-
 }
 
 
diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index 06eb8bcae..53f737b67 100644
--- 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()
  */
@@ -326,13 +272,10 @@ void check_server_upgrades(void) {
 
 	update_config();
 
-	if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("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 ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 591)) {
-		bump_mailbox_generation_numbers();
-	}
 	if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 608)) {
 		convert_ctdluid_to_minusone();
 	}