cache: Don't deadlock rbtree module if the cache entry isn't found and the cache...

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index a6661bd392fb398645b4a8b7a8b7752049bfd78d..efdf9b81790f60975e97feb4092e8bc83659a6dc 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -861,11 +861,9 @@ xlat_action_t cache_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
        case RLM_MODULE_OK:             /* found */
                break;
 
-       case RLM_MODULE_NOTFOUND:       /* not found */
-               return XLAT_ACTION_FAIL;
-
        default:
                talloc_free(target);
+               cache_release(inst, request, &handle);
                return XLAT_ACTION_FAIL;
        }
 

diff --git a/src/tests/modules/cache_rbtree/cache-xlat.unlang b/src/tests/modules/cache_rbtree/cache-xlat.unlang
index cb1aa27ebab768d05e41ed193c6af92a4cdfca41..95b3f1c55135119039e24e801325807a04a976c4 100644 (file)
--- a/src/tests/modules/cache_rbtree/cache-xlat.unlang
+++ b/src/tests/modules/cache_rbtree/cache-xlat.unlang
@@ -21,4 +21,12 @@ if (&Tmp-String-3 != "") {
         test_fail
 }
 
-test_pass
\ No newline at end of file
+# Regression test for deadlock on notfound
+&Tmp-String-0 := 'testkey0'
+
+&Tmp-String-3 := "%(cache:request.Tmp-String-4)"
+
+# Would previously deadlock
+&Tmp-String-4 := "%(cache:request.Tmp-String-4)"
+
+test_pass