fix

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index fd5abcb416e7d602965dfd3a61392d5b1f5a80e0..45483dab8f728566e82d4c395d737c575b28af7a 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -767,6 +767,11 @@ void save_message(char *mtmp,      /* file containing proper message */
        /* read in the quickroom record, obtaining a lock... */
        lgetroom(&CC->quickroom, actual_rm);
 
+       /* Fix an obscure bug */
+       if (!strcasecmp(CC->quickroom.QRname, AIDEROOM)) {
+               CC->quickroom.QRflags = CC->quickroom.QRflags & ~QR_MAILBOX;
+               }
+
        /* Add the message pointer to the room */
        AddMessageToRoom(&CC->quickroom, newmsgid);
 

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 13022f258fb18b438b791a8d78e22ca0d6c0bad1..a2137a63efb78bc12d50fef07e7751f36c3c4346 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -38,9 +38,13 @@ int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *userbuf) {
                        }
                }
 
+       /* Locate any applicable user/room relationships */
+       CtdlGetRelationship(&vbuf, userbuf, roombuf);
+
        /* Force the properties of the Aide room */
        /* FIX FIX FIX ... this doesn't work */
        if (!strcasecmp(roombuf->QRname, AIDEROOM)) {
+       lprintf(9, "Room <%s> is special!\n", roombuf->QRname);
                if (userbuf->axlevel >= 6) {
                        retval = UA_KNOWN | UA_GOTOALLOWED;
                        }
@@ -50,9 +54,6 @@ int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *userbuf) {
                goto NEWMSG;
                }
 
-       /* Locate any applicable user/room relationships */
-       CtdlGetRelationship(&vbuf, userbuf, roombuf);
-
        /* For mailboxes, we skip all the access stuff (and we've
         * already checked by this point that the mailbox belongs
         * to the user)