X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fupgrade%2Fserv_upgrade.c;fp=citadel%2Fmodules%2Fupgrade%2Fserv_upgrade.c;h=365147e582d48fa619ed2cf93a1ebd622e2f7b00;hb=110d19a7389607e9a336456c79c20ba8b916d888;hp=9ab953a235c5e86c115afe361d0dd1b81535dffe;hpb=1cf98031e3530393ec5fb753567bf496c6277ab3;p=citadel.git

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index 9ab953a23..365147e58 100644
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -135,6 +135,12 @@ void reindex_uids_backend(struct ctdluser *usbuf, void *data) {
 				us.uid = NATIVE_AUTH_UID;
 			}
 			CtdlPutUserLock(&us);
+			if (us.uid > 0) {		// if non-native auth , index by uid
+				StrBuf *claimed_id = NewStrBuf();
+				StrBufPrintf(claimed_id, "uid:%d", us.uid);
+				attach_extauth(&us, claimed_id);
+				FreeStrBuf(&claimed_id);
+			}
 		}
 
 		ptr = uplist;
@@ -520,6 +526,11 @@ void check_server_upgrades(void) {
 
 	syslog(LOG_INFO, "Existing database version on disk is %d", CtdlGetConfigInt("MM_hosted_upgrade_level"));
 
+
+
+	reindex_uids();	// FIXME FIXME FIXME remove this line after testing
+
+
 	if (CtdlGetConfigInt("MM_hosted_upgrade_level") < REV_LEVEL) {
 		syslog(LOG_WARNING, "Server hosted updates need to be processed at this time.  Please wait...");
 	}
@@ -554,10 +565,6 @@ void check_server_upgrades(void) {
 			QRoom.QRdefaultview = VIEW_QUEUE;
 			CtdlPutRoom(&QRoom);
 		}
-		if (!CtdlGetRoom(&QRoom, FNBL_QUEUE_ROOM)) {
-			QRoom.QRdefaultview = VIEW_QUEUE;
-			CtdlPutRoom(&QRoom);
-		}
 	}
 
 	if ((CtdlGetConfigInt("MM_hosted_upgrade_level") > 000) && (CtdlGetConfigInt("MM_hosted_upgrade_level") < 902)) {