xxx

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 21a967ec86dc85f9bcf4909482f5c9caf143758c..c1387c2c093b1e8bf0241268a3e46e991baf3de3 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1696,6 +1696,7 @@ int CtdlOutputMsg(long msg_num,           /* message number (local) to fetch */
        }
 
        r = check_cached_msglist(msg_num);
+<<<<<<< HEAD
 <<<<<<< HEAD
        if (r != om_ok) {
                syslog(LOG_DEBUG, "Denying access to message %ld - not yet listed\n", msg_num);
@@ -1712,11 +1713,16 @@ int CtdlOutputMsg(long msg_num,         /* message number (local) to fetch */
                return(r);
                }
 =======
+=======
+>>>>>>> parent of 4ec6a9d... Updating cmd_euid() to use the CtdlForEachMessage() API fixes the security check in blog view and saves some code
        if (r == om_ok) {
                syslog(LOG_DEBUG, "\033[32m PASS \033[0m\n");
        }
        else {
                syslog(LOG_DEBUG, "\033[31m FAIL \033[0m\n");
+<<<<<<< HEAD
+>>>>>>> parent of 4ec6a9d... Updating cmd_euid() to use the CtdlForEachMessage() API fixes the security check in blog view and saves some code
+=======
 >>>>>>> parent of 4ec6a9d... Updating cmd_euid() to use the CtdlForEachMessage() API fixes the security check in blog view and saves some code
        }
        /* FIXME after testing, this is where we deny access */