Reordered the locking and setting of user email addresses to avoid a race condition...

[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 bc471dc1af349b9c28e51296b44038f66a5e985b..94c1406f49c5f08fdcf046ba04db7b385f5ad255 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -490,16 +490,9 @@ void miafvtur_backend(struct ctdluser *usbuf, void *data) {
        }
 
        /* this is the calling mode where we do the processing */
-
        int i;
-       struct ctdluser u;
-
        for (i=0; i<num_m; ++i) {
-               syslog(LOG_DEBUG, "<%s> = <%s>", m[i].name, m[i].emails);
-               if (CtdlGetUser(&u, m[i].name) == 0) {
-                       safestrncpy(u.emailaddrs, m[i].emails, sizeof u.emailaddrs);
-                       CtdlPutUser(&u);
-               }
+               CtdlSetEmailAddressesForUser(m[i].name, m[i].emails);
        }
        free(m);
        num_m = 0;