retval = retval & ~UA_KNOWN & ~UA_GOTOALLOWED;
}
- /* Aides get access to everything */
- if (userbuf->axlevel >= 6) {
+ /* 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_GOTOALLOWED;
- if ((roombuf->QRflags & QR_MAILBOX) == 0) {
- retval = retval | UA_KNOWN;
- }
+ 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 (is_msg_in_mset(vbuf.v_seen, roombuf->QRhighest) == 0) {
retval = retval | UA_HASNEWMSGS;
if (display_result)
cprintf("%d%c%s|%d|%d|%d|%d|%ld|%ld|%d|%d|%d|%d\n",
- OK, CtdlCheckExpress(),
+ CIT_OK, CtdlCheckExpress(),
truncated_roomname,
new_messages, total_messages,
info, CC->quickroom.QRflags,
/* 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);
struct cdbdata *cdbus;
getuser(&CC->usersupp, CC->curr_user);
- if (CtdlAccessCheck(ac_room_aide)) 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);
getroom(&CC->quickroom, CC->quickroom.QRname);
cprintf("%d%c%s|%s|%s|%d|%d|%d\n",
- OK, CtdlCheckExpress(),
+ CIT_OK, CtdlCheckExpress(),
CC->quickroom.QRname,
((CC->quickroom.QRflags & QR_PASSWORDED) ? CC->quickroom.QRpasswd : ""),
((CC->quickroom.QRflags & QR_DIRECTORY) ? CC->quickroom.QRdirname : ""),
}
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);
}
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);
}
}
usbuf.fullname, CC->quickroom.QRname);
aide_message(buf);
}
- cprintf("%d Ok\n", OK);
+ cprintf("%d Ok\n", CIT_OK);
}
/*
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);
}
}
* name accordingly (prepend the user number)
*/
if (new_room_type == 4) {
- MailboxName(qrbuf.QRname, &CC->usersupp, new_room_name);
+ MailboxName(qrbuf.QRname, sizeof qrbuf.QRname, &CC->usersupp, new_room_name);
}
else {
safestrncpy(qrbuf.QRname, new_room_name, sizeof qrbuf.QRname);
}
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;
}
}
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;
}
strcat(aaa, "\n");
aide_message(aaa);
- cprintf("%d '%s' has been created.\n", OK, new_room_name);
+ cprintf("%d '%s' has been created.\n", CIT_OK, new_room_name);
}
if (CtdlAccessCheck(ac_room_aide)) return;
if (atoi(ok) == 0) {
- cprintf("%d Ok.\n", OK);
+ cprintf("%d Ok.\n", CIT_OK);
return;
}
assoc_file_name(infofilename, sizeof infofilename, &CC->quickroom, "info");
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);
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);
}
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);
}
}
extract(flbuf.f_name, argbuf, 1);
lputfloor(&flbuf, floor_num);
- cprintf("%d Ok\n", OK);
+ cprintf("%d Ok\n", CIT_OK);
}