X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=7f337d3ab0c3b04e98aaa7f9e2d2fdf85edc9031;hb=4583cc48c475fe3a2a24a72c1c9a54fe5598ca01;hp=3a12fcc0302c39de009bc844beaeb0915667f340;hpb=1b0eb18845a576398b29d4f8675acd4f9026ef46;p=citadel.git diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 3a12fcc03..7f337d3ab 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -654,7 +654,6 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, CC->cached_msglist = msglist; CC->cached_num_msgs = num_msgs; - syslog(LOG_DEBUG, "\033[34m RELOAD \033[0m\n"); } /* @@ -1565,7 +1564,6 @@ int check_cached_msglist(long msgnum) { int max = (CC->cached_num_msgs - 1); while (max >= min) { - syslog(LOG_DEBUG, "\033[35m Checking from %d to %d \033[0m\n", min, max); int middle = min + (max-min) / 2 ; if (msgnum == CC->cached_msglist[middle]) { return om_ok; @@ -1633,13 +1631,25 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ } r = check_cached_msglist(msg_num); - if (r == om_ok) { - syslog(LOG_DEBUG, "\033[32m PASS \033[0m\n"); - } - else { - syslog(LOG_DEBUG, "\033[31m FAIL \033[0m\n"); + if (r != om_ok) { + syslog(LOG_DEBUG, "\033[31m SECURITY CHECK FAIL \033[0m\n"); +/* + * FIXME enable this section when the security check yields no false positives + * + if (do_proto) { + if (r == om_access_denied) { + cprintf("%d Message %ld was not found in this room.\n", + ERROR + MESSAGE_NOT_FOUND, + msg_num + ); + } + else { + cprintf("%d An unknown error has occurred.\n", ERROR); + } + return(r); + } +*/ } - /* FIXME after testing, this is where we deny access */ /* * Fetch the message from disk. If we're in HEADERS_FAST mode,