matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: use LYD_VALIDATE_MULTI_ERROR only if available

Browse source 
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: 51a2a4b3f4 ("lib: print all errors when validating a config")
Cc: Igor Ryzhov <iryzhov@nfware.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2023-11-20 10:29:57 +01:00
parent f9012ed5cf
commit 75a7b5b6b6
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/northbound.c
View file

@ -871,7 +871,12 @@ int nb_candidate_update(struct nb_config *candidate)
int nb_candidate_validate_yang(struct nb_config *candidate, bool no_state, int nb_candidate_validate_yang(struct nb_config *candidate, bool no_state,
char *errmsg, size_t errmsg_len) 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) if (no_state)
SET_FLAG(options, LYD_VALIDATE_NO_STATE); SET_FLAG(options, LYD_VALIDATE_NO_STATE);