commit 6b26e744cbf33c1e813312615b9a88c451b87af2
author Michal Vasko <mvasko@cesnet.cz> Fri Jul 17 15:02:10 2020 +0200
committer Michal Vasko <mvasko@cesnet.cz> Fri Jul 17 15:02:10 2020 +0200
tree 48700530637b32920eb545d72bc6627caf449f9b
parent ab49dbe808dee3467e46eab68109712226bf0a05

schema tree BUGFIX accessible tree fixes

src/tree_schema_compile.c

diff --git a/src/tree_schema_compile.c b/src/tree_schema_compile.c
index ca53a39..1b99187 100644
--- a/src/tree_schema_compile.c
+++ b/src/tree_schema_compile.c
@@ -6810,9 +6810,17 @@
     struct lysc_when **when = NULL;
     struct lysc_must *musts = NULL;
     LY_ERR ret = LY_SUCCESS;
+    const struct lysc_node *op;
 
     memset(&tmp_set, 0, sizeof tmp_set);
     opts = LYXP_SCNODE_SCHEMA;
+    if (node->flags & LYS_CONFIG_R) {
+        for (op = node->parent; op && !(op->nodetype & (LYS_RPC | LYS_ACTION)); op = op->parent);
+        if (op) {
+            /* we are actually in output */
+            opts = LYXP_SCNODE_OUTPUT;
+        }
+    }
 
     switch (node->nodetype) {
     case LYS_CONTAINER:
@@ -6932,7 +6940,7 @@
 static LY_ERR
 lys_compile_unres_leafref(struct lysc_ctx *ctx, const struct lysc_node *node, struct lysc_type_leafref *lref)
 {
-    const struct lysc_node *target = NULL;
+    const struct lysc_node *target = NULL, *siter;
     struct ly_path *p;
     struct lysc_type *type;
 
@@ -6965,8 +6973,9 @@
     ctx->path[1] = '\0';
 
     /* check config */
-    if (lref->require_instance && (node->flags & LYS_CONFIG_W)) {
-        if (target->flags & LYS_CONFIG_R) {
+    if (lref->require_instance) {
+        for (siter = node->parent; siter && !(siter->nodetype & (LYS_RPC | LYS_ACTION | LYS_NOTIF)); siter = siter->parent);
+        if (!siter && (node->flags & LYS_CONFIG_W) && (target->flags & LYS_CONFIG_R)) {
             LOGVAL(ctx->ctx, LY_VLOG_LYSC, node, LYVE_REFERENCE, "Invalid leafref path \"%s\" - target is supposed"
                    " to represent configuration data (as the leafref does), but it does not.", lref->path->expr);
             return LY_EVALID;