]> code.citadel.org Git - citadel.git/blobdiff - citadel/room_ops.c
* compatibility with Berkeley DB < 3.3
[citadel.git] / citadel / room_ops.c
index 7883268f5fbb65a39ab1245f6c392b62b48c5a93..613c4dfada08e1cfd249f0a0f4d934f8df2621b9 100644 (file)
@@ -1,15 +1,37 @@
-/* $Id$ */
+/* 
+ * $Id$
+ * 
+ * Server functions which perform operations on room objects.
+ *
+ */
+
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <string.h>
-#include <time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
 #include <limits.h>
 #include <errno.h>
 #include "citadel.h"
 #include "server.h"
+#include "dynloader.h"
 #include "database.h"
 #include "config.h"
 #include "room_ops.h"
 #include "support.h"
 #include "user_ops.h"
 #include "msgbase.h"
-#include "serv_chat.h"
 #include "citserver.h"
 #include "control.h"
 #include "tools.h"
 
+struct floor *floorcache[MAXFLOORS];
+
 /*
  * Generic routine for determining user access to rooms
  */
@@ -34,12 +57,7 @@ int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *userbuf)
        if (((CC->internal_pgm)) && (roombuf->QRflags & QR_INUSE)) {
                return (UA_KNOWN | UA_GOTOALLOWED);
        }
-       /* For mailbox rooms, only allow access to the owner */
-       if (roombuf->QRflags & QR_MAILBOX) {
-               if (userbuf->usernum != atol(roombuf->QRname)) {
-                       return (retval);
-               }
-       }
+
        /* Locate any applicable user/room relationships */
        CtdlGetRelationship(&vbuf, userbuf, roombuf);
 
@@ -52,26 +70,23 @@ int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *userbuf)
                }
                goto NEWMSG;
        }
-       /* For mailboxes, we skip all the access stuff (and we've
-        * already checked by this point that the mailbox belongs
-        * to the user)
-        */
-       if (roombuf->QRflags & QR_MAILBOX) {
-               retval = UA_KNOWN | UA_GOTOALLOWED;
-               goto NEWMSG;
-       }
+
        /* If this is a public room, it's accessible... */
-       if ((roombuf->QRflags & QR_PRIVATE) == 0) {
+       if ( ((roombuf->QRflags & QR_PRIVATE) == 0) 
+          && ((roombuf->QRflags & QR_MAILBOX) == 0) ) {
                retval = retval | UA_KNOWN | UA_GOTOALLOWED;
        }
+
        /* If this is a preferred users only room, check access level */
        if (roombuf->QRflags & QR_PREFONLY) {
                if (userbuf->axlevel < 5) {
                        retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED;
                }
        }
+
        /* For private rooms, check the generation number matchups */
-       if (roombuf->QRflags & QR_PRIVATE) {
+       if ( (roombuf->QRflags & QR_PRIVATE) 
+          && ((roombuf->QRflags & QR_MAILBOX) == 0) ) {
 
                /* An explicit match means the user belongs in this room */
                if (vbuf.v_flags & V_ACCESS) {
@@ -86,24 +101,60 @@ int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *userbuf)
                        retval = retval | UA_GOTOALLOWED;
                }
        }
+
+       /* For mailbox rooms, also check the generation number matchups */
+       if (roombuf->QRflags & QR_MAILBOX) {
+               if (userbuf->usernum == atol(roombuf->QRname)) {
+                       retval = retval | UA_KNOWN | UA_GOTOALLOWED;
+               }
+               /* An explicit match means the user belongs in this room */
+               if (vbuf.v_flags & V_ACCESS) {
+                       retval = retval | UA_KNOWN | UA_GOTOALLOWED;
+               }
+       }
+
        /* Check to see if the user has forgotten this room */
        if (vbuf.v_flags & V_FORGET) {
                retval = retval & ~UA_KNOWN;
-               retval = retval | UA_ZAPPED;
+               if ( ( ((roombuf->QRflags & QR_PRIVATE) == 0) 
+                     && ((roombuf->QRflags & QR_MAILBOX) == 0) )
+                  || ( (roombuf->QRflags & QR_MAILBOX) 
+                     && (atol(roombuf->QRname) == CC->usersupp.usernum))) {
+                       retval = retval | UA_ZAPPED;
+               }
        }
        /* If user is explicitly locked out of this room, deny everything */
        if (vbuf.v_flags & V_LOCKOUT) {
                retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED;
        }
-       /* Aides get access to everything */
-       if (userbuf->axlevel >= 6) {
-               retval = retval | UA_KNOWN | UA_GOTOALLOWED;
-               retval = retval & ~UA_ZAPPED;
+
+       /* Aides get access to all private rooms */
+       if ( (userbuf->axlevel >= 6)
+          && ((roombuf->QRflags & QR_MAILBOX) == 0) ) {
+               if (vbuf.v_flags & V_FORGET) {
+                       retval = retval | UA_GOTOALLOWED;
+               }
+               else {
+                       retval = retval | UA_KNOWN | UA_GOTOALLOWED;
+               }
+       }
+
+       /* On some systems, Aides can gain access to mailboxes as well */
+       if ( (config.c_aide_mailboxes)
+          && (userbuf->axlevel >= 6)
+          && (roombuf->QRflags & QR_MAILBOX) ) {
+               retval = retval | UA_GOTOALLOWED;
        }
-      NEWMSG:                  /* By the way, we also check for the presence of new messages */
-       if ((roombuf->QRhighest) > (vbuf.v_lastseen)) {
+
+NEWMSG:        /* By the way, we also check for the presence of new messages */
+       if (is_msg_in_mset(vbuf.v_seen, roombuf->QRhighest) == 0) {
                retval = retval | UA_HASNEWMSGS;
        }
+
+       /* System rooms never show up in the list. */
+       if (roombuf->QRflags2 & QR2_SYSTEM) {
+               retval = retval & ~UA_KNOWN;
+       }
        return (retval);
 }
 
@@ -146,8 +197,9 @@ int getroom(struct quickroom *qrbuf, char *room_name)
 
        /* If that didn't work, try the user's personal namespace */
        if (cdbqr == NULL) {
-               sprintf(personal_lowercase_name, "%010ld.%s",
-                       CC->usersupp.usernum, lowercase_name);
+               snprintf(personal_lowercase_name,
+                        sizeof personal_lowercase_name, "%010ld.%s",
+                        CC->usersupp.usernum, lowercase_name);
                cdbqr = cdb_fetch(CDB_QUICKROOM,
                                  personal_lowercase_name,
                                  strlen(personal_lowercase_name));
@@ -171,8 +223,10 @@ int getroom(struct quickroom *qrbuf, char *room_name)
  */
 int lgetroom(struct quickroom *qrbuf, char *room_name)
 {
-       begin_critical_section(S_QUICKROOM);
-       return (getroom(qrbuf, room_name));
+       register int retval;
+       retval = getroom(qrbuf, room_name);
+       if (retval == 0) begin_critical_section(S_QUICKROOM);
+       return(retval);
 }
 
 
@@ -266,6 +320,32 @@ void lgetfloor(struct floor *flbuf, int floor_num)
 }
 
 
+/*
+ * cgetfloor()  -  Get floor record from *cache* (loads from disk if needed)
+ *    
+ * This is strictly a performance hack.
+ */
+struct floor *cgetfloor(int floor_num) {
+       static int initialized = 0;
+       int i;
+
+       if (initialized == 0) {
+               for (i=0; i<MAXFLOORS; ++i) {
+                       floorcache[floor_num] = NULL;
+               }
+       initialized = 1;
+       }
+       
+       if (floorcache[floor_num] == NULL) {
+               floorcache[floor_num] = mallok(sizeof(struct floor));
+               getfloor(floorcache[floor_num], floor_num);
+       }
+
+       return(floorcache[floor_num]);
+}
+
+
+
 /*
  * putfloor()  -  store floor data on disk
  */
@@ -273,6 +353,12 @@ void putfloor(struct floor *flbuf, int floor_num)
 {
        cdb_store(CDB_FLOORTAB, &floor_num, sizeof(int),
                  flbuf, sizeof(struct floor));
+
+       /* If we've cached this, clear it out, 'cuz it's WRONG now! */
+       if (floorcache[floor_num] != NULL) {
+               phree(floorcache[floor_num]);
+               floorcache[floor_num] = NULL;
+       }
 }
 
 
@@ -314,15 +400,21 @@ void ForEachRoom(void (*CallBack) (struct quickroom *EachRoom, void *out_data),
 
 /*
  * delete_msglist()  -  delete room message pointers
- * FIX - this really should check first to make sure there's actually a
- *       msglist to delete.  As things stand now, calling this function on
- *       a room which has never been posted in will result in a message
- *       like "gdbm: illegal data" (no big deal, but could use fixing).
  */
 void delete_msglist(struct quickroom *whichroom)
 {
+        struct cdbdata *cdbml;
+
+       /* Make sure the msglist we're deleting actually exists, otherwise
+        * gdbm will complain when we try to delete an invalid record
+        */
+        cdbml = cdb_fetch(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long));
+        if (cdbml != NULL) {
+               cdb_free(cdbml);
 
-       cdb_delete(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long));
+               /* Go ahead and delete it */
+               cdb_delete(CDB_MSGLISTS, &whichroom->QRnumber, sizeof(long));
+       }
 }
 
 
@@ -396,8 +488,9 @@ void list_roomname(struct quickroom *qrbuf)
 {
        char truncated_roomname[ROOMNAMELEN];
 
-       /* For mailbox rooms, chop off the owner prefix */
-       if (qrbuf->QRflags & QR_MAILBOX) {
+       /* For my own mailbox rooms, chop off the owner prefix */
+       if ( (qrbuf->QRflags & QR_MAILBOX)
+            && (atol(qrbuf->QRname) == CC->usersupp.usernum) ) {
                strcpy(truncated_roomname, qrbuf->QRname);
                strcpy(truncated_roomname, &truncated_roomname[11]);
                cprintf("%s", truncated_roomname);
@@ -436,10 +529,8 @@ void cmd_lrms(char *argbuf)
        if (strlen(argbuf) > 0)
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
@@ -473,10 +564,8 @@ void cmd_lkra(char *argbuf)
        if (strlen(argbuf) > 0)
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
@@ -512,10 +601,8 @@ void cmd_lkrn(char *argbuf)
        if (strlen(argbuf) > 0)
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
@@ -551,10 +638,8 @@ void cmd_lkro(char *argbuf)
        if (strlen(argbuf) > 0)
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
@@ -590,10 +675,8 @@ void cmd_lzrm(char *argbuf)
        if (strlen(argbuf) > 0)
                FloorBeingSearched = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        if (getuser(&CC->usersupp, CC->curr_user)) {
                cprintf("%d Can't locate user!\n", ERROR + INTERNAL_ERROR);
                return;
@@ -606,7 +689,7 @@ void cmd_lzrm(char *argbuf)
 
 
 
-void usergoto(char *where, int display_result)
+void usergoto(char *where, int display_result, int *retmsgs, int *retnew)
 {
        int a;
        int new_messages = 0;
@@ -654,7 +737,7 @@ void usergoto(char *where, int display_result)
        if (num_msgs > 0) for (a = 0; a < num_msgs; ++a) {
                if (msglist[a] > 0L) {
                        ++total_messages;
-                       if (msglist[a] > vbuf.v_lastseen) {
+                       if (is_msg_in_mset(vbuf.v_seen, msglist[a]) == 0) {
                                ++new_messages;
                        }
                }
@@ -674,13 +757,19 @@ void usergoto(char *where, int display_result)
                raideflag = 0;
 
        strcpy(truncated_roomname, CC->quickroom.QRname);
-       if (CC->quickroom.QRflags & QR_MAILBOX) {
+       if ( (CC->quickroom.QRflags & QR_MAILBOX)
+          && (atol(CC->quickroom.QRname) == CC->usersupp.usernum) ) {
                strcpy(truncated_roomname, &truncated_roomname[11]);
        }
 
+       if (retmsgs != NULL) *retmsgs = total_messages;
+       if (retnew != NULL) *retnew = new_messages;
+       lprintf(9, "<%s> %d new of %d total messages\n",
+               CC->quickroom.QRname, new_messages, total_messages);
+
        if (display_result)
                cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d\n",
-                       OK, check_express(),
+                       CIT_OK, CtdlCheckExpress(),
                        truncated_roomname,
                        new_messages, total_messages,
                        info, CC->quickroom.QRflags,
@@ -701,14 +790,11 @@ void cmd_goto(char *gargs)
        int c;
        int ok = 0;
        int ra;
-       char augmented_roomname[256];
-       char towhere[256];
-       char password[256];
+       char augmented_roomname[SIZ];
+       char towhere[SIZ];
+       char password[SIZ];
 
-       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
-               cprintf("%d not logged in\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
 
        extract(towhere, gargs, 0);
        extract(password, gargs, 1);
@@ -730,7 +816,8 @@ void cmd_goto(char *gargs)
 
        /* Then try a mailbox name match */
        if (c != 0) {
-               MailboxName(augmented_roomname, &CC->usersupp, towhere);
+               MailboxName(augmented_roomname, sizeof augmented_roomname,
+                           &CC->usersupp, towhere);
                c = getroom(&QRscratch, augmented_roomname);
                if (c == 0)
                        strcpy(towhere, augmented_roomname);
@@ -741,7 +828,7 @@ void cmd_goto(char *gargs)
 
                /* let internal programs go directly to any room */
                if (CC->internal_pgm) {
-                       usergoto(towhere, 1);
+                       usergoto(towhere, 1, NULL, NULL);
                        return;
                }
 
@@ -749,13 +836,19 @@ void cmd_goto(char *gargs)
                ra = CtdlRoomAccess(&QRscratch, &CC->usersupp);
 
                /* normal clients have to pass through security */
-               if (ra & UA_GOTOALLOWED)
+               if (ra & UA_GOTOALLOWED) {
                        ok = 1;
+               }
 
                if (ok == 1) {
-                       if ((QRscratch.QRflags & QR_PASSWORDED) &&
+                       if ((QRscratch.QRflags & QR_MAILBOX) &&
+                           ((ra & UA_GOTOALLOWED))) {
+                               usergoto(towhere, 1, NULL, NULL);
+                               return;
+                       } else if ((QRscratch.QRflags & QR_PASSWORDED) &&
                            ((ra & UA_KNOWN) == 0) &&
-                           (strcasecmp(QRscratch.QRpasswd, password))
+                           (strcasecmp(QRscratch.QRpasswd, password)) &&
+                           (CC->usersupp.axlevel < 6)
                            ) {
                                cprintf("%d wrong or missing passwd\n",
                                        ERROR + PASSWORD_REQUIRED);
@@ -763,10 +856,13 @@ void cmd_goto(char *gargs)
                        } else if ((QRscratch.QRflags & QR_PRIVATE) &&
                                   ((QRscratch.QRflags & QR_PASSWORDED) == 0) &&
                                   ((QRscratch.QRflags & QR_GUESSNAME) == 0) &&
-                                  ((ra & UA_KNOWN) == 0)) {
+                                  ((ra & UA_KNOWN) == 0) &&
+                                  (CC->usersupp.axlevel < 6)
+                                  ) {
+                               lprintf(9, "Failed to acquire private room\n");
                                goto NOPE;
                        } else {
-                               usergoto(towhere, 1);
+                               usergoto(towhere, 1, NULL, NULL);
                                return;
                        }
                }
@@ -781,17 +877,23 @@ void cmd_whok(void)
        struct usersupp temp;
        struct cdbdata *cdbus;
 
-       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
        getuser(&CC->usersupp, CC->curr_user);
 
-       if ((!is_room_aide()) && (!(CC->internal_pgm))) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
+       /*
+        * This command is only allowed by aides, room aides,
+        * and room namespace owners
+        */
+       if (is_room_aide()
+          || (atol(CC->quickroom.QRname) == CC->usersupp.usernum) ) {
+               /* access granted */
        }
+       else {
+               /* access denied */
+                cprintf("%d Higher access or room ownership required.\n",
+                        ERROR + HIGHER_ACCESS_REQUIRED);
+                return;
+        }
+
        cprintf("%d Who knows room:\n", LISTING_FOLLOWS);
        cdb_rewind(CDB_USERSUPP);
        while (cdbus = cdb_next_item(CDB_USERSUPP), cdbus != NULL) {
@@ -813,16 +915,14 @@ void cmd_whok(void)
  */
 void cmd_rdir(void)
 {
-       char buf[256];
-       char flnm[256];
-       char comment[256];
+       char buf[SIZ];
+       char flnm[SIZ];
+       char comment[SIZ];
        FILE *ls, *fd;
        struct stat statbuf;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+       
        getroom(&CC->quickroom, CC->quickroom.QRname);
        getuser(&CC->usersupp, CC->curr_user);
 
@@ -839,25 +939,25 @@ void cmd_rdir(void)
        cprintf("%d %s|%s/files/%s\n",
        LISTING_FOLLOWS, config.c_fqdn, BBSDIR, CC->quickroom.QRdirname);
 
-        sprintf(buf, "ls %s/files/%s  >%s 2> /dev/null",
+        snprintf(buf, sizeof buf, "ls %s/files/%s  >%s 2> /dev/null",
                 BBSDIR, CC->quickroom.QRdirname, CC->temp);
         system(buf);
 
-       sprintf(buf, "%s/files/%s/filedir", BBSDIR, CC->quickroom.QRdirname);
+       snprintf(buf, sizeof buf, "%s/files/%s/filedir", BBSDIR, CC->quickroom.QRdirname);
        fd = fopen(buf, "r");
        if (fd == NULL)
                fd = fopen("/dev/null", "r");
 
        ls = fopen(CC->temp, "r");
-       while (fgets(flnm, 256, ls) != NULL) {
+       while (fgets(flnm, sizeof flnm, ls) != NULL) {
                flnm[strlen(flnm) - 1] = 0;
                if (strcasecmp(flnm, "filedir")) {
-                       sprintf(buf, "%s/files/%s/%s",
+                       snprintf(buf, sizeof buf, "%s/files/%s/%s",
                                BBSDIR, CC->quickroom.QRdirname, flnm);
                        stat(buf, &statbuf);
                        strcpy(comment, "");
                        fseek(fd, 0L, 0);
-                       while ((fgets(buf, 256, fd) != NULL)
+                       while ((fgets(buf, sizeof buf, fd) != NULL)
                               && (strlen(comment) == 0)) {
                                buf[strlen(buf) - 1] = 0;
                                if ((!strncasecmp(buf, flnm, strlen(flnm)))
@@ -866,7 +966,7 @@ void cmd_rdir(void)
                                            &buf[strlen(flnm) + 1],
                                            sizeof comment);
                        }
-                       cprintf("%s|%ld|%s\n", flnm, statbuf.st_size, comment);
+                       cprintf("%s|%ld|%s\n", flnm, (long)statbuf.st_size, comment);
                }
        }
        fclose(ls);
@@ -881,22 +981,18 @@ void cmd_rdir(void)
  */
 void cmd_getr(void)
 {
-       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if ((!is_room_aide()) && (!(CC->internal_pgm))) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+       if (CtdlAccessCheck(ac_room_aide)) return;
+
+       /********
        if (is_noneditable(&CC->quickroom)) {
                cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
                return;
        }
+       ************/
+
        getroom(&CC->quickroom, CC->quickroom.QRname);
        cprintf("%d%c%s|%s|%s|%d|%d|%d\n",
-               OK, check_express(),
+               CIT_OK, CtdlCheckExpress(),
                CC->quickroom.QRname,
                ((CC->quickroom.QRflags & QR_PASSWORDED) ? CC->quickroom.QRpasswd : ""),
                ((CC->quickroom.QRflags & QR_DIRECTORY) ? CC->quickroom.QRdirname : ""),
@@ -911,28 +1007,30 @@ void cmd_getr(void)
  */
 void cmd_setr(char *args)
 {
-       char buf[256];
+       char buf[SIZ];
+       struct floor *fl;
        struct floor flbuf;
        char old_name[ROOMNAMELEN];
        int old_floor;
        int new_order = 0;
+       int ne = 0;
+
+       if (CtdlAccessCheck(ac_room_aide)) return;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
        if (is_noneditable(&CC->quickroom)) {
+               ne = 1;
+       }
+
+       /***
                cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
                return;
        }
+       ***/
+
+
        if (num_parms(args) >= 6) {
-               getfloor(&flbuf, extract_int(args, 5));
-               if ((flbuf.f_flags & F_INUSE) == 0) {
+               fl = cgetfloor(extract_int(args, 5));
+               if ((fl->f_flags & F_INUSE) == 0) {
                        cprintf("%d Invalid floor number.\n",
                                ERROR + INVALID_FLOOR_OPERATION);
                        return;
@@ -946,10 +1044,16 @@ void cmd_setr(char *args)
                        new_order = 127;
        }
        lgetroom(&CC->quickroom, CC->quickroom.QRname);
+
+       /* Non-editable base rooms can't be renamed */
        strcpy(old_name, CC->quickroom.QRname);
-       extract(buf, args, 0);
-       buf[ROOMNAMELEN] = 0;
-       safestrncpy(CC->quickroom.QRname, buf, sizeof CC->quickroom.QRname);
+       if (!ne) {
+               extract(buf, args, 0);
+               buf[ROOMNAMELEN] = 0;
+               safestrncpy(CC->quickroom.QRname, buf,
+                       sizeof CC->quickroom.QRname);
+       }
+
        extract(buf, args, 1);
        buf[10] = 0;
        safestrncpy(CC->quickroom.QRpasswd, buf, sizeof CC->quickroom.QRpasswd);
@@ -998,14 +1102,14 @@ void cmd_setr(char *args)
 
        /* create a room directory if necessary */
        if (CC->quickroom.QRflags & QR_DIRECTORY) {
-               sprintf(buf,
+               snprintf(buf, sizeof buf,
                    "mkdir ./files/%s </dev/null >/dev/null 2>/dev/null",
                        CC->quickroom.QRdirname);
                system(buf);
        }
-       sprintf(buf, "%s> edited by %s\n", CC->quickroom.QRname, CC->curr_user);
+       snprintf(buf, sizeof buf, "%s> edited by %s\n", CC->quickroom.QRname, CC->curr_user);
        aide_message(buf);
-       cprintf("%d Ok\n", OK);
+       cprintf("%d Ok\n", CIT_OK);
 }
 
 
@@ -1017,18 +1121,16 @@ void cmd_geta(void)
 {
        struct usersupp usbuf;
 
-       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
+
        if (is_noneditable(&CC->quickroom)) {
                cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
                return;
        }
        if (getuserbynumber(&usbuf, CC->quickroom.QRroomaide) == 0) {
-               cprintf("%d %s\n", OK, usbuf.fullname);
+               cprintf("%d %s\n", CIT_OK, usbuf.fullname);
        } else {
-               cprintf("%d \n", OK);
+               cprintf("%d \n", CIT_OK);
        }
 }
 
@@ -1040,18 +1142,11 @@ void cmd_seta(char *new_ra)
 {
        struct usersupp usbuf;
        long newu;
-       char buf[256];
+       char buf[SIZ];
        int post_notice;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+       if (CtdlAccessCheck(ac_room_aide)) return;
+
        if (getuser(&usbuf, new_ra) != 0) {
                newu = (-1L);
        } else {
@@ -1071,19 +1166,20 @@ void cmd_seta(char *new_ra)
         * the room table, otherwise it would deadlock!
         */
        if (post_notice == 1) {
-               sprintf(buf, "%s is now room aide for %s>\n",
+               snprintf(buf, sizeof buf, "%s is now room aide for %s>\n",
                        usbuf.fullname, CC->quickroom.QRname);
                aide_message(buf);
        }
-       cprintf("%d Ok\n", OK);
+       cprintf("%d Ok\n", CIT_OK);
 }
 
 /*
  * Generate an associated file name for a room
  */
-void assoc_file_name(char *buf, struct quickroom *qrbuf, char *prefix)
+void assoc_file_name(char *buf, size_t n,
+                    struct quickroom *qrbuf, const char *prefix)
 {
-       sprintf(buf, "./%s/%ld", prefix, qrbuf->QRnumber);
+       snprintf(buf, n, "./%s/%ld", prefix, qrbuf->QRnumber);
 }
 
 /* 
@@ -1092,10 +1188,10 @@ void assoc_file_name(char *buf, struct quickroom *qrbuf, char *prefix)
 void cmd_rinf(void)
 {
        char filename[128];
-       char buf[256];
+       char buf[SIZ];
        FILE *info_fp;
 
-       assoc_file_name(filename, &CC->quickroom, "info");
+       assoc_file_name(filename, sizeof filename, &CC->quickroom, "info");
        info_fp = fopen(filename, "r");
 
        if (info_fp == NULL) {
@@ -1103,7 +1199,7 @@ void cmd_rinf(void)
                return;
        }
        cprintf("%d Info:\n", LISTING_FOLLOWS);
-       while (fgets(buf, 256, info_fp) != NULL) {
+       while (fgets(buf, sizeof buf, info_fp) != NULL) {
                if (strlen(buf) > 0)
                        buf[strlen(buf) - 1] = 0;
                cprintf("%s\n", buf);
@@ -1123,17 +1219,21 @@ void delete_room(struct quickroom *qrbuf)
        lprintf(9, "Deleting room <%s>\n", qrbuf->QRname);
 
        /* Delete the info file */
-       assoc_file_name(filename, qrbuf, "info");
+       assoc_file_name(filename, sizeof filename, qrbuf, "info");
        unlink(filename);
 
        /* Delete the image file */
-       assoc_file_name(filename, qrbuf, "images");
+       assoc_file_name(filename, sizeof filename, qrbuf, "images");
+       unlink(filename);
+
+       /* Delete the room's network config file */
+       assoc_file_name(filename, sizeof filename, qrbuf, "netconfigs");
        unlink(filename);
 
        /* Delete the messages in the room
         * (Careful: this opens an S_QUICKROOM critical section!)
         */
-       CtdlDeleteMessages(qrbuf->QRname, 0L, NULL);
+       CtdlDeleteMessages(qrbuf->QRname, 0L, "");
 
        /* Flag the room record as not in use */
        lgetroom(qrbuf, qrbuf->QRname);
@@ -1150,6 +1250,49 @@ void delete_room(struct quickroom *qrbuf)
 }
 
 
+
+/*
+ * Check access control for deleting a room
+ */
+int CtdlDoIHavePermissionToDeleteThisRoom(struct quickroom *qr) {
+
+       if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
+               return(0);
+       }
+
+       if (is_noneditable(qr)) {
+               return(0);
+       }
+
+       /*
+        * For mailboxes, check stuff
+        */
+       if (qr->QRflags & QR_MAILBOX) {
+
+               if (strlen(qr->QRname) < 12) return(0); /* bad name */
+
+               if (atol(qr->QRname) != CC->usersupp.usernum) {
+                       return(0);      /* not my room */
+               }
+
+               /* Can't delete your Mail> room */
+               if (!strcasecmp(&qr->QRname[12], MAILROOM)) return(0);
+
+               /* Otherwise it's ok */
+               return(1);
+       }
+
+       /*
+        * For normal rooms, just check for aide or room aide status.
+        */
+       else {
+               return(is_room_aide());
+       }
+
+       /* Should never get to this point, but to keep the compiler quiet... */
+       return(0);
+}
+
 /*
  * aide command: kill the current room
  */
@@ -1161,31 +1304,22 @@ void cmd_kill(char *argbuf)
 
        kill_ok = extract_int(argbuf, 0);
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
-       if (is_noneditable(&CC->quickroom)) {
-               cprintf("%d Can't edit this room.\n", ERROR + NOT_HERE);
+       if (CtdlDoIHavePermissionToDeleteThisRoom(&CC->quickroom) == 0) {
+               cprintf("%d Can't delete this room.\n", ERROR + NOT_HERE);
                return;
        }
        if (kill_ok) {
                strcpy(deleted_room_name, CC->quickroom.QRname);
                delete_room(&CC->quickroom);    /* Do the dirty work */
-               usergoto(BASEROOM, 0);  /* Return to the Lobby */
+               usergoto(BASEROOM, 0, NULL, NULL); /* Return to the Lobby */
 
                /* tell the world what we did */
-               sprintf(aaa, "%s> killed by %s\n",
-                       deleted_room_name, CC->curr_user);
+               snprintf(aaa, sizeof aaa, "%s> killed by %s\n",
+                        deleted_room_name, CC->curr_user);
                aide_message(aaa);
-               cprintf("%d '%s' deleted.\n", OK, deleted_room_name);
+               cprintf("%d '%s' deleted.\n", CIT_OK, deleted_room_name);
        } else {
-               cprintf("%d ok to delete.\n", OK);
+               cprintf("%d ok to delete.\n", CIT_OK);
        }
 }
 
@@ -1193,35 +1327,49 @@ void cmd_kill(char *argbuf)
 /*
  * Internal code to create a new room (returns room flags)
  *
- * Room types:  0=public, 1=guessname, 2=passworded, 3=inv-only, 4=mailbox
+ * Room types:  0=public, 1=guessname, 2=passworded, 3=inv-only,
+ *              4=mailbox, 5=mailbox, but caller supplies namespace
  */
 unsigned create_room(char *new_room_name,
                     int new_room_type,
                     char *new_room_pass,
-                    int new_room_floor)
+                    int new_room_floor,
+                    int really_create)
 {
 
        struct quickroom qrbuf;
        struct floor flbuf;
        struct visit vbuf;
 
-       if (getroom(&qrbuf, new_room_name) == 0)
+       lprintf(9, "create_room(%s)\n", new_room_name);
+       if (getroom(&qrbuf, new_room_name) == 0) {
+               lprintf(9, "%s already exists.\n", new_room_name);
                return (0);     /* already exists */
+       }
+
 
        memset(&qrbuf, 0, sizeof(struct quickroom));
-       safestrncpy(qrbuf.QRname, new_room_name, sizeof qrbuf.QRname);
        safestrncpy(qrbuf.QRpasswd, new_room_pass, sizeof qrbuf.QRpasswd);
        qrbuf.QRflags = QR_INUSE;
-       qrbuf.QRnumber = get_new_room_number();
        if (new_room_type > 0)
                qrbuf.QRflags = (qrbuf.QRflags | QR_PRIVATE);
        if (new_room_type == 1)
                qrbuf.QRflags = (qrbuf.QRflags | QR_GUESSNAME);
        if (new_room_type == 2)
                qrbuf.QRflags = (qrbuf.QRflags | QR_PASSWORDED);
-       if (new_room_type == 4)
+       if ( (new_room_type == 4) || (new_room_type == 5) )
                qrbuf.QRflags = (qrbuf.QRflags | QR_MAILBOX);
 
+       /* If the user is requesting a personal room, set up the room
+        * name accordingly (prepend the user number)
+        */
+       if (new_room_type == 4) {
+               MailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->usersupp, new_room_name);
+       }
+       else {
+               safestrncpy(qrbuf.QRname, new_room_name, sizeof qrbuf.QRname);
+       }
+
        /* If the room is private, and the system administrator has elected
         * to automatically grant room aide privileges, do so now; otherwise,
         * set the room aide to undefined.
@@ -1232,6 +1380,13 @@ unsigned create_room(char *new_room_name,
                qrbuf.QRroomaide = (-1L);
        }
 
+       /* 
+        * If the caller is only interested in testing whether this will work,
+        * return now without creating the room.
+        */
+       if (!really_create) return (qrbuf.QRflags);
+
+       qrbuf.QRnumber = get_new_room_number();
        qrbuf.QRhighest = 0L;   /* No messages in this room yet */
        time(&qrbuf.QRgen);     /* Use a timestamp as the generation number */
        qrbuf.QRfloor = new_room_floor;
@@ -1263,14 +1418,13 @@ unsigned create_room(char *new_room_name,
 void cmd_cre8(char *args)
 {
        int cre8_ok;
-       char new_room_name[256];
+       char new_room_name[SIZ];
        int new_room_type;
-       char new_room_pass[256];
+       char new_room_pass[SIZ];
        int new_room_floor;
-       char aaa[256];
+       char aaa[SIZ];
        unsigned newflags;
-       struct quickroom qrbuf;
-       struct floor flbuf;
+       struct floor *fl;
 
        cre8_ok = extract_int(args, 0);
        extract(new_room_name, args, 1);
@@ -1292,8 +1446,8 @@ void cmd_cre8(char *args)
        }
 
        if (num_parms(args) >= 5) {
-               getfloor(&flbuf, extract_int(args, 4));
-               if ((flbuf.f_flags & F_INUSE) == 0) {
+               fl = cgetfloor(extract_int(args, 4));
+               if ((fl->f_flags & F_INUSE) == 0) {
                        cprintf("%d Invalid floor number.\n",
                                ERROR + INVALID_FLOOR_OPERATION);
                        return;
@@ -1302,10 +1456,7 @@ void cmd_cre8(char *args)
                }
        }
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
+       if (CtdlAccessCheck(ac_logged_in)) return;
 
        if (CC->usersupp.axlevel < config.c_createax) {
                cprintf("%d You need higher access to create rooms.\n",
@@ -1314,7 +1465,7 @@ void cmd_cre8(char *args)
        }
 
        if ((strlen(new_room_name) == 0) && (cre8_ok == 0)) {
-               cprintf("%d Ok to create rooms.\n", OK);
+               cprintf("%d Ok to create rooms.\n", CIT_OK);
                return;
        }
 
@@ -1323,29 +1474,24 @@ void cmd_cre8(char *args)
                return;
        }
 
-       /* If the user is requesting a personal room, set up the room
-        * name accordingly (prepend the user number)
-        */
-       if (new_room_type == 4) {
-               sprintf(aaa, "%010ld.%s",
-                       CC->usersupp.usernum, new_room_name);
-               strcpy(new_room_name, aaa);
-       }
-
        /* Check to make sure the requested room name doesn't already exist */
-       if (getroom(&qrbuf, new_room_name) == 0) {
+       newflags = create_room(new_room_name,
+                          new_room_type, new_room_pass, new_room_floor, 0);
+       if (newflags == 0) {
                cprintf("%d '%s' already exists.\n",
-                       ERROR + ALREADY_EXISTS, qrbuf.QRname);
+                       ERROR + ALREADY_EXISTS, new_room_name);
                return;
        }
 
        if (cre8_ok == 0) {
-               cprintf("%d OK to create '%s'\n", OK, new_room_name);
+               cprintf("%d OK to create '%s'\n", CIT_OK, new_room_name);
                return;
        }
 
+       /* If we reach this point, the room needs to be created. */
+
        newflags = create_room(new_room_name,
-                          new_room_type, new_room_pass, new_room_floor);
+                          new_room_type, new_room_pass, new_room_floor, 1);
 
        /* post a message in Aide> describing the new room */
        safestrncpy(aaa, new_room_name, sizeof aaa);
@@ -1364,7 +1510,7 @@ void cmd_cre8(char *args)
        strcat(aaa, "\n");
        aide_message(aaa);
 
-       cprintf("%d '%s' has been created.\n", OK, qrbuf.QRname);
+       cprintf("%d '%s' has been created.\n", CIT_OK, new_room_name);
 }
 
 
@@ -1372,23 +1518,16 @@ void cmd_cre8(char *args)
 void cmd_einf(char *ok)
 {                              /* enter info file for current room */
        FILE *fp;
-       char infofilename[256];
-       char buf[256];
+       char infofilename[SIZ];
+       char buf[SIZ];
+
+       if (CtdlAccessCheck(ac_room_aide)) return;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (!is_room_aide()) {
-               cprintf("%d Higher access required.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
        if (atoi(ok) == 0) {
-               cprintf("%d Ok.\n", OK);
+               cprintf("%d Ok.\n", CIT_OK);
                return;
        }
-       assoc_file_name(infofilename, &CC->quickroom, "info");
+       assoc_file_name(infofilename, sizeof infofilename, &CC->quickroom, "info");
        lprintf(9, "opening\n");
        fp = fopen(infofilename, "w");
        lprintf(9, "checking\n");
@@ -1421,15 +1560,7 @@ void cmd_lflr(void)
        int a;
        struct floor flbuf;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       /* if (getuser(&CC->usersupp,CC->curr_user)) {
-          cprintf("%d Can't locate user!\n",ERROR+INTERNAL_ERROR);
-          return;
-          }
-        */
+       if (CtdlAccessCheck(ac_logged_in)) return;
 
        cprintf("%d Known floors:\n", LISTING_FOLLOWS);
 
@@ -1452,7 +1583,7 @@ void cmd_lflr(void)
  */
 void cmd_cflr(char *argbuf)
 {
-       char new_floor_name[256];
+       char new_floor_name[SIZ];
        struct floor flbuf;
        int cflr_ok;
        int free_slot = (-1);
@@ -1462,15 +1593,8 @@ void cmd_cflr(char *argbuf)
        cflr_ok = extract_int(argbuf, 1);
 
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (CC->usersupp.axlevel < 6) {
-               cprintf("%d You need higher access to create rooms.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+       if (CtdlAccessCheck(ac_aide)) return;
+
        for (a = 0; a < MAXFLOORS; ++a) {
                getfloor(&flbuf, a);
 
@@ -1495,7 +1619,7 @@ void cmd_cflr(char *argbuf)
                return;
        }
        if (cflr_ok == 0) {
-               cprintf("%d ok to create...\n", OK);
+               cprintf("%d ok to create...\n", CIT_OK);
                return;
        }
        lgetfloor(&flbuf, free_slot);
@@ -1503,7 +1627,7 @@ void cmd_cflr(char *argbuf)
        flbuf.f_ref_count = 0;
        safestrncpy(flbuf.f_name, new_floor_name, sizeof flbuf.f_name);
        lputfloor(&flbuf, free_slot);
-       cprintf("%d %d\n", OK, free_slot);
+       cprintf("%d %d\n", CIT_OK, free_slot);
 }
 
 
@@ -1521,16 +1645,8 @@ void cmd_kflr(char *argbuf)
        floor_to_delete = extract_int(argbuf, 0);
        kflr_ok = extract_int(argbuf, 1);
 
+       if (CtdlAccessCheck(ac_aide)) return;
 
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (CC->usersupp.axlevel < 6) {
-               cprintf("%d You need higher access to delete floors.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
        lgetfloor(&flbuf, floor_to_delete);
 
        delete_ok = 1;
@@ -1546,9 +1662,9 @@ void cmd_kflr(char *argbuf)
                        delete_ok = 0;
                } else {
                        if (kflr_ok == 1) {
-                               cprintf("%d Ok\n", OK);
+                               cprintf("%d Ok\n", CIT_OK);
                        } else {
-                               cprintf("%d Ok to delete...\n", OK);
+                               cprintf("%d Ok to delete...\n", CIT_OK);
                        }
 
                }
@@ -1574,15 +1690,9 @@ void cmd_eflr(char *argbuf)
                cprintf("%d Usage error.\n", ERROR);
                return;
        }
-       if (!(CC->logged_in)) {
-               cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
-               return;
-       }
-       if (CC->usersupp.axlevel < 6) {
-               cprintf("%d You need higher access to edit floors.\n",
-                       ERROR + HIGHER_ACCESS_REQUIRED);
-               return;
-       }
+
+       if (CtdlAccessCheck(ac_aide)) return;
+
        floor_num = extract_int(argbuf, 0);
        lgetfloor(&flbuf, floor_num);
        if ((flbuf.f_flags & F_INUSE) == 0) {
@@ -1595,5 +1705,5 @@ void cmd_eflr(char *argbuf)
                extract(flbuf.f_name, argbuf, 1);
        lputfloor(&flbuf, floor_num);
 
-       cprintf("%d Ok\n", OK);
+       cprintf("%d Ok\n", CIT_OK);
 }