From: Art Cancro <ajc@citadel.org>
Date: Fri, 28 Jan 2011 16:51:36 +0000 (-0500)
Subject: xxx
X-Git-Tag: v8.01~388
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=88def48c67c3a034b33d9550bf70afa5c4705039;p=citadel.git

xxx
---

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 75dd5288e..390199e66 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1664,6 +1664,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);
@@ -1680,11 +1681,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 */