X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fctdlproto%2Fserv_user.c;h=5f8e9791bfdbcf5dca73f6db6556a22a1e2c49fb;hb=fcec795dc7d0d125028ca1bd3a5f35b3f97b265f;hp=1c8dbf8803f8c720da6255453bf35897cda1cdd6;hpb=5980aee9dfad00802b4e59fd8bd44ef197adf2b1;p=citadel.git

diff --git a/citadel/modules/ctdlproto/serv_user.c b/citadel/modules/ctdlproto/serv_user.c
index 1c8dbf880..5f8e9791b 100644
--- a/citadel/modules/ctdlproto/serv_user.c
+++ b/citadel/modules/ctdlproto/serv_user.c
@@ -701,7 +701,6 @@ void cmd_asea(char *cmdbuf)
 	char buf[SIZ];
 	char whodat[64];
 	char new_emailaddrs[512] = { 0 } ;
-	int i;
 
 	if (CtdlAccessCheck(ac_aide)) return;
 
@@ -729,25 +728,8 @@ void cmd_asea(char *cmdbuf)
 		}
 	}
 
-	if (CtdlGetUserLock(&usbuf, requested_user) != 0) {	// We are relying on the fact that the DirectoryIndex functions don't lock.
-		return;						// Silently fail here if we can't acquire a lock on the user record.
-	}
-
-	/* Delete all of the existing directory index records for the user (easier this way) */
-	for (i=0; i<num_tokens(usbuf.emailaddrs, '|'); ++i) {
-		extract_token(buf, usbuf.emailaddrs, i, '|', sizeof buf);
-		CtdlDirectoryDelUser(buf, requested_user);
-	}
-
-	strcpy(usbuf.emailaddrs, new_emailaddrs);		// make it official.
 
-	/* Index all of the new email addresses (they've already been sanitized) */
-	for (i=0; i<num_tokens(usbuf.emailaddrs, '|'); ++i) {
-		extract_token(buf, usbuf.emailaddrs, i, '|', sizeof buf);
-		CtdlDirectoryAddUser(buf, requested_user);
-	}
-
-	CtdlPutUserLock(&usbuf);
+	CtdlSetEmailAddressesForUser(requested_user, new_emailaddrs);
 }