* During startup, display the version string from the Berkeley DB library.

* When deleting a mailbox, don't reveal the namespace prefix to the user.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 2bd81036ca5fe748229add35923575263b250430..edd198b25e7df82e4718893683c6118815af26ee 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 605.26  2003/03/22 05:38:23  ajc
+ * During startup, display the version string from the Berkeley DB library.
+ * When deleting a mailbox, don't reveal the namespace prefix to the user.
+
  Revision 605.25  2003/03/20 08:37:04  error
  * connection_died(): Don't crash before printing message, crash afterward.
    (Bugzilla id 111)
@@ -4584,4 +4588,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/database_sleepycat.c b/citadel/database_sleepycat.c
index 5df1e6e3c7a9b21760624e17f9f66e3473e5943f..b24379ce05ee7d44191c6ac03d4e9731b72518c4 100644 (file)
--- a/citadel/database_sleepycat.c
+++ b/citadel/database_sleepycat.c
@@ -279,6 +279,7 @@ void open_databases(void)
        u_int32_t flags = 0;
 
        lprintf(9, "cdb_*: open_databases() starting\n");
+       lprintf(5, "%s\n", db_version(NULL, NULL, NULL));
 #ifdef HAVE_ZLIB
        lprintf(5, "zlib compression version %s\n", zlibVersion());
 #endif

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index a2ef5da7bea1c9b81d0bd6ef6191706e8196c9eb..b61aebf4f7b32696366ec60d7a4a426aba4979f2 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -1508,8 +1508,8 @@ int CtdlDoIHavePermissionToDeleteThisRoom(struct quickroom *qr) {
  */
 void cmd_kill(char *argbuf)
 {
-       char aaa[100];
        char deleted_room_name[ROOMNAMELEN];
+       char msg[SIZ];
        int kill_ok;
 
        kill_ok = extract_int(argbuf, 0);
@@ -1519,14 +1519,23 @@ void cmd_kill(char *argbuf)
                return;
        }
        if (kill_ok) {
-               strcpy(deleted_room_name, CC->quickroom.QRname);
-               delete_room(&CC->quickroom);    /* Do the dirty work */
-               usergoto(config.c_baseroom, 0, 0, NULL, NULL); /* Return to the Lobby */
+               if (CC->quickroom.QRflags & QR_MAILBOX) {
+                       strcpy(deleted_room_name, &CC->quickroom.QRname[11]);
+               }
+               else {
+                       strcpy(deleted_room_name, CC->quickroom.QRname);
+               }
+
+               /* Do the dirty work */
+               delete_room(&CC->quickroom);
+
+               /* Return to the Lobby */
+               usergoto(config.c_baseroom, 0, 0, NULL, NULL);
 
                /* tell the world what we did */
-               snprintf(aaa, sizeof aaa, "%s> killed by %s\n",
+               snprintf(msg, sizeof msg, "%s> killed by %s\n",
                         deleted_room_name, CC->curr_user);
-               aide_message(aaa);
+               aide_message(msg);
                cprintf("%d '%s' deleted.\n", CIT_OK, deleted_room_name);
        } else {
                cprintf("%d ok to delete.\n", CIT_OK);