From: Art Cancro <ajc@citadel.org>
Date: Sat, 16 Oct 1999 05:30:17 +0000 (+0000)
Subject: * Changes to message replication code.  Don't do server-side hooks during
X-Git-Tag: v7.86~7500
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=878f28d552fd8ac2a8ad233e80f757e2de86cdc4;p=citadel.git

* Changes to message replication code.  Don't do server-side hooks during
  an ENT3 command.  Also fixed a bug in cmd_whok() that caused crashes
  after a file format change.
---

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index ae050c414..b0581f9ec 100644
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,9 @@
 $Log$
+Revision 1.385  1999/10/16 05:30:17  ajc
+* Changes to message replication code.  Don't do server-side hooks during
+  an ENT3 command.  Also fixed a bug in cmd_whok() that caused crashes
+  after a file format change.
+
 Revision 1.384  1999/10/14 03:04:16  ajc
 * Finished the netproc side of Z (zap/supersede) processing for replication
 
@@ -1311,3 +1316,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 	* Initial CVS import 
+
diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index a39adfa40..8daee0677 100644
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -838,8 +838,8 @@ void cmd_whok(void)
 	cprintf("%d Who knows room:\n", LISTING_FOLLOWS);
 	cdb_rewind(CDB_USERSUPP);
 	while (cdbus = cdb_next_item(CDB_USERSUPP), cdbus != NULL) {
-		memset(&temp, 0, sizeof(struct usersupp));
-		memcpy(&temp, cdbus->ptr, cdbus->len);
+		memset(&temp, 0, sizeof temp);
+		memcpy(&temp, cdbus->ptr, sizeof temp);
 		cdb_free(cdbus);
 
 		if ((CC->quickroom.QRflags & QR_INUSE)