getuserbyuid() now uses the extauth index, so we can do ldap sync

[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 9ab953a235c5e86c115afe361d0dd1b81535dffe..56ba219df0044f594d7395e0fc3005b3a2fa511b 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -135,6 +135,16 @@ void reindex_uids_backend(struct ctdluser *usbuf, void *data) {
                                us.uid = NATIVE_AUTH_UID;
                        }
                        CtdlPutUserLock(&us);
+                       if ((us.uid > 0) && (us.uid != NATIVE_AUTH_UID)) {              // if non-native auth , index by uid
+
+                               syslog(LOG_DEBUG, "\033[31m attaching %d to %s \033[0m", us.uid , us.fullname);
+
+
+                               StrBuf *claimed_id = NewStrBuf();
+                               StrBufPrintf(claimed_id, "uid:%d", us.uid);
+                               attach_extauth(&us, claimed_id);
+                               FreeStrBuf(&claimed_id);
+                       }
                }
 
                ptr = uplist;
@@ -554,10 +564,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)) {