From 98c30f50d3ad0e7cc81c1f8be43c957d0d0983bf Mon Sep 17 00:00:00 2001
From: Olivier Beytrison <olivier@heliosnet.org>
Date: Thu, 17 Jan 2013 08:12:38 +0100
Subject: [PATCH] wrong logic for cache merge

---
 src/modules/rlm_cache/rlm_cache.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index f02023eb79a..364b50ca6e7 100644
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -346,9 +346,9 @@ static rlm_cache_entry_t *cache_add(rlm_cache_t *inst, REQUEST *request,
 		 *	  - Map src and dst attributes differ
 		 */
 		to_req = NULL;
-		if (!merge || !map->src->da || 
+		if (merge && ( !map->src->da || 
 		    (map->src->list != map->dst->list) ||
-		    (map->src->da != map->dst->da)) {
+		    (map->src->da != map->dst->da))) {
 			context = request;
 			/*
 			 *	It's ok if the list isn't valid here...
-- 
2.47.3