Allow checks for existence of virtual attrs. Fixes #1265

diff --git a/src/main/modcall.c b/src/main/modcall.c
index 4b45f6474156f8f98a3a592ffe820e134e36f708..28061f7be7d39e6daa87c6746c4092aaf5c52b16 100644 (file)
--- a/src/main/modcall.c
+++ b/src/main/modcall.c
@@ -3208,6 +3208,16 @@ static bool pass2_callback(void *ctx, fr_cond_t *c)
                        if (!pass2_fixup_undefined(c->ci, c->data.vpt)) return false;
                        c->pass2_fixup = PASS2_FIXUP_NONE;
                }
+
+               /*
+                *      Convert virtual &Attr-Foo to "%{Attr-Foo}"
+                */
+               vpt = c->data.vpt;
+               if ((vpt->type == TMPL_TYPE_ATTR) && vpt->tmpl_da->flags.virtual) {
+                       vpt->tmpl_xlat = xlat_from_tmpl_attr(vpt, vpt);
+                       vpt->type = TMPL_TYPE_XLAT_STRUCT;
+               }
+
                return true;
        }
 

diff --git a/src/tests/keywords/virtual-exists b/src/tests/keywords/virtual-exists
new file mode 100644 (file)
index 0000000..7a8e8f3
--- /dev/null
+++ b/src/tests/keywords/virtual-exists
@@ -0,0 +1,12 @@
+#
+#  PRE: update if
+#
+update control {
+       Cleartext-Password := 'hello'
+}
+
+if (&Client-Shortname) {
+       update reply {
+               Filter-Id := "filter"
+       }
+}