* Site-configurable option "Allow system Aides to gain access to mailboxes"

[citadel.git] / citadel / room_ops.c

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index 990134f28435050f78fcf25c5740d54387d11b3d..af8f6c982fede01655817058f30fb78eecf9ad28 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -128,12 +128,22 @@ int CtdlRoomAccess(struct quickroom *roombuf, struct usersupp *userbuf)
                retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED;
        }
 
-       /* Aides get access to everything */
+       /* 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 */