Skip to content

Commit ea9535d

Browse files
committed
session server UPDATE libyang changes
1 parent 89f82df commit ea9535d

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ set(LIBNETCONF2_MICRO_SOVERSION 3)
7171
set(LIBNETCONF2_SOVERSION_FULL ${LIBNETCONF2_MAJOR_SOVERSION}.${LIBNETCONF2_MINOR_SOVERSION}.${LIBNETCONF2_MICRO_SOVERSION})
7272
set(LIBNETCONF2_SOVERSION ${LIBNETCONF2_MAJOR_SOVERSION})
7373

74-
# libyang SO version required
74+
# Version of libyang library that this project depends on
75+
set(LIBYANG_DEP_VERSION 2.0.159)
76+
set(LIBYANG_DEP_SOVERSION 2.18.1)
7577
set(LIBYANG_DEP_SOVERSION_MAJOR 2)
7678

7779
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -fvisibility=hidden -std=gnu99")
@@ -263,7 +265,7 @@ if(ENABLE_DNSSEC)
263265
endif()
264266

265267
# dependencies - libyang
266-
find_package(LibYANG ${LIBYANG_DEP_SOVERSION_MAJOR} REQUIRED)
268+
find_package(LibYANG ${LIBYANG_DEP_SOVERSION} REQUIRED)
267269
target_link_libraries(netconf2 ${LIBYANG_LIBRARIES})
268270
include_directories(${LIBYANG_INCLUDE_DIRS})
269271

src/session_server.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -651,10 +651,9 @@ nc_clb_default_get_schema(struct lyd_node *rpc, struct nc_session *session)
651651
free(model_data);
652652
return NULL;
653653
}
654-
lydict_insert_zc(session->ctx, model_data, (const char **)&model_data);
655654
if (lyd_new_any(data, NULL, "data", model_data, 1, LYD_ANYDATA_STRING, 1, NULL)) {
656655
ERRINT;
657-
lydict_remove(session->ctx, model_data);
656+
free(model_data);
658657
lyd_free_tree(data);
659658
return NULL;
660659
}

0 commit comments

Comments
 (0)