From bb359ba2f25590fc72dd5126a196fb1720d18e6f Mon Sep 17 00:00:00 2001 From: Emanuele Di Pascale Date: Mon, 10 Dec 2018 14:27:37 +0100 Subject: [PATCH] lib: fix issue with yang_str2enum The same issue with derived enum types that was already fixed for yang_data_new_enum was still present here, so I simply applied the same fix. Signed-off-by: Emanuele Di Pascale --- lib/yang_wrappers.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/yang_wrappers.c b/lib/yang_wrappers.c index 96076d6468..6273dff3ce 100644 --- a/lib/yang_wrappers.c +++ b/lib/yang_wrappers.c @@ -171,6 +171,7 @@ int yang_str2enum(const char *xpath, const char *value) { const struct lys_node *snode; const struct lys_node_leaf *sleaf; + const struct lys_type *type; const struct lys_type_info_enums *enums; snode = ly_ctx_get_node(ly_native_ctx, NULL, xpath, 0); @@ -182,7 +183,12 @@ int yang_str2enum(const char *xpath, const char *value) } sleaf = (const struct lys_node_leaf *)snode; - enums = &sleaf->type.info.enums; + type = &sleaf->type; + enums = &type->info.enums; + while (enums->count == 0 && type->der) { + type = &type->der->type; + enums = &type->info.enums; + } for (unsigned int i = 0; i < enums->count; i++) { const struct lys_type_enum *enm = &enums->enm[i]; -- 2.39.5