better debug output and clarifications

diff --git a/src/lib/server/tmpl_eval.c b/src/lib/server/tmpl_eval.c
index d19ff0f96bae0834a160725bcc94906abd9ec367..79d4e5c5f3dab19ed31bee0e7a117270be1b7e83 100644 (file)
--- a/src/lib/server/tmpl_eval.c
+++ b/src/lib/server/tmpl_eval.c
@@ -511,7 +511,10 @@ ssize_t _tmpl_to_atype(TALLOC_CTX *ctx, void *out,
                 *      permitted.
                 */
                slen = xlat_aeval_compiled(tmp_ctx, &str, request, tmpl_xlat(vpt), escape, escape_ctx);
-               if (slen < 0) goto error;
+               if (slen < 0) {
+                       RPEDEBUG("Failed expanding %s", vpt->name);
+                       goto error;
+               }
 
                /*
                 *      The output is a string which might get cast to something later.

diff --git a/src/lib/unlang/xlat_eval.c b/src/lib/unlang/xlat_eval.c
index ad38f2ebfb81e34083cc61c9a021b51b97b63e02..126900c325f5e9d9271823bbbdaa410450cf38f8 100644 (file)
--- a/src/lib/unlang/xlat_eval.c
+++ b/src/lib/unlang/xlat_eval.c
@@ -1662,8 +1662,10 @@ static ssize_t xlat_eval_sync(TALLOC_CTX *ctx, char **out, request_t *request, x
 
        switch (rcode) {
        default:
-               if (!XLAT_RESULT_SUCCESS(&unlang_result)) goto fail;
-               break;
+               if (XLAT_RESULT_SUCCESS(&unlang_result)) {
+                       break;
+               }
+               FALL_THROUGH;
 
        case RLM_MODULE_REJECT:
        case RLM_MODULE_FAIL: