cmd_invt_kick() is normally permitted when the room namespace matches the user number...

[citadel.git] / citadel / user_ops.c

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 2f23c3875cc6e710acd8c0ae4247f68bd5961a2b..989ce41b9ddfdd8c4d953b6a2d1fa4dbcf8d1986 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -739,7 +739,7 @@ void do_login(void)
        CtdlCreateRoom(MAILROOM, 4, "", 0, 1, 0, VIEW_MAILBOX);
        CtdlCreateRoom(SENTITEMS, 4, "", 0, 1, 0, VIEW_MAILBOX);
        CtdlCreateRoom(USERTRASHROOM, 4, "", 0, 1, 0, VIEW_MAILBOX);
-       /* CtdlCreateRoom(USERDRAFTROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); temporarily disabled for 7.60 */
+       CtdlCreateRoom(USERDRAFTROOM, 4, "", 0, 1, 0, VIEW_MAILBOX);
 
        /* Run any startup routines registered by loadable modules */
        PerformSessionHooks(EVT_LOGIN);
@@ -1557,8 +1557,9 @@ void cmd_invt_kick(char *iuser, int op) {
         * These commands are only allowed by aides, room aides,
         * and room namespace owners
         */
-       if (is_room_aide()
-          || (atol(CC->room.QRname) == CC->user.usernum) ) {
+       if (is_room_aide()) {
+               /* access granted */
+       } else if ( ((atol(CC->room.QRname) == CC->user.usernum) ) && (CC->user.usernum != 0) ) {
                /* access granted */
        } else {
                /* access denied */