* Access control change: do not treat mailboxes as guessname rooms for Aides.

[citadel.git] / citadel / room_ops.c

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index ba41b87bd2c02652bc0f9a4a1fe4947b4f9d1217..59eb43f179c335f7ef3b510ef9c5aa74765b8bd0 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -129,16 +129,11 @@ int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *userbuf)
        }
 
        /* Aides get access to everything */
-       if (userbuf->axlevel >= 6) {
+       if ( (userbuf->axlevel >= 6)
+          && ((roombuf->QRflags & QR_MAILBOX) == 0) ) {
                if (vbuf.v_flags & V_FORGET) {
                        retval = retval | UA_GOTOALLOWED;
                }
-               else {
-                       retval = retval | UA_GOTOALLOWED;
-                       if ((roombuf->QRflags & QR_MAILBOX) == 0) {
-                               retval = retval | UA_KNOWN;
-                       }
-               }
        }
 
 NEWMSG:        /* By the way, we also check for the presence of new messages */