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=846a693e5ca2b2ebbc19022b2cc721535c96037c;hb=41544d6edeaaee1d6563b3e30e0ec2c29d5cca41;hp=59089d295fbfbfd738b801ab8bcde093fadb2748;hpb=c71df26b9d35c07eb9c1322a7e83caa86337ad82;p=citadel.git

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index 59089d295..846a693e5 100644
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -63,21 +63,14 @@
 int oldver = 0;
 
 /*
- * Fix up the name for Citadel user 0 and try to remove any extra users with number 0
+ * Try to remove any extra users with number 0
  */
 void fix_sys_user_name(void)
 {
 	struct ctdluser usbuf;
 	char usernamekey[USERNAME_SIZE];
 
-	/** If we have a user called Citadel rename them to SYS_Citadel */
-	if (CtdlGetUser(&usbuf, "Citadel") == 0)
-	{
-		rename_user("Citadel", "SYS_Citadel");
-	}
-
-	while (CtdlGetUserByNumber(&usbuf, 0) == 0)
-	{
+	while (CtdlGetUserByNumber(&usbuf, 0) == 0) {
 		/* delete user with number 0 and no name */
 		if (IsEmptyStr(usbuf.fullname)) {
 			cdb_delete(CDB_USERS, "", 0);
@@ -89,18 +82,10 @@ void fix_sys_user_name(void)
 		}
 	}
 
-	/* Make sure user SYS_* is user 0 */
-	while (CtdlGetUserByNumber(&usbuf, -1) == 0)
-	{
-		if (strncmp(usbuf.fullname, "SYS_", 4))
-		{	/* Delete any user 0 that doesn't start with SYS_ */
-			makeuserkey(usernamekey, usbuf.fullname, cutusername(usbuf.fullname));
-			cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
-		}
-		else {
-			usbuf.usernum = 0;
-			CtdlPutUser(&usbuf);
-		}
+	/* Delete any "user 0" accounts */
+	while (CtdlGetUserByNumber(&usbuf, -1) == 0) {
+		makeuserkey(usernamekey, usbuf.fullname, cutusername(usbuf.fullname));
+		cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
 	}
 }
 
@@ -587,14 +572,13 @@ CTDL_MODULE_UPGRADE(upgrade)
 	return "upgrade";
 }
 
+
 CTDL_MODULE_INIT(upgrade)
 {
-	if(!threading)
-	{
-		move_inet_addrs_from_vcards_to_user_records();
+	if (!threading) {
 		post_startup_upgrades();
 	}
-	
+
 	/* return our module name for the log */
         return "upgrade";
 }