* 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 ae050c41466d99aa60a3118ba8b51bbf0f20bf8a..b0581f9ec0a21b24b44e55dcc4a7d7710055df0f 100644 (file)
--- 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 a39adfa404503116209ba0b6a110391da5319c9d..8daee0677f03f5430ee0a031cfaa03255e351cd6 100644 (file)
--- 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)