From 75a7b5b6b64fde187acdfde67e60396f7634664c Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Mon, 20 Nov 2023 10:29:57 +0100 Subject: [PATCH] lib: use LYD_VALIDATE_MULTI_ERROR only if available LYD_VALIDATE_MULTI_ERROR was added in libyang 2.1.36. The currently enforced minimum of libyang is 2.0.0. Stick an #ifdef around it. Fixes: 51a2a4b3f471 ("lib: print all errors when validating a config") Cc: Igor Ryzhov Signed-off-by: David Lamparter --- lib/northbound.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/northbound.c b/lib/northbound.c index 15775f4d3aa8..88aa2a5f20d3 100644 --- a/lib/northbound.c +++ b/lib/northbound.c @@ -871,7 +871,12 @@ int nb_candidate_update(struct nb_config *candidate) int nb_candidate_validate_yang(struct nb_config *candidate, bool no_state, char *errmsg, size_t errmsg_len) { - uint32_t options = LYD_VALIDATE_MULTI_ERROR; + uint32_t options = 0; + +#ifdef LYD_VALIDATE_MULTI_ERROR + /* libyang 2.1.36+ */ + options |= LYD_VALIDATE_MULTI_ERROR; +#endif if (no_state) SET_FLAG(options, LYD_VALIDATE_NO_STATE);