From cfba783f1c5b0676902efca9ee631578ee6214f0 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 14 Apr 2023 14:47:15 +0200 Subject: [PATCH] src/confd: minor, drop trailing / from YANG_PATH_ Prevent // in new srx_require_module() when composing module PATH. Signed-off-by: Joachim Wiberg --- src/confd/src/Makefile.am | 2 +- src/confd/src/core.c | 2 +- src/confd/src/ietf-system.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/confd/src/Makefile.am b/src/confd/src/Makefile.am index 393e5693..685e6e43 100644 --- a/src/confd/src/Makefile.am +++ b/src/confd/src/Makefile.am @@ -1,5 +1,5 @@ CFLAGS = -Wall -Wextra -Werror -Wno-unused-parameter -AM_CPPFLAGS = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE -D_GNU_SOURCE -DYANG_PATH_=\"$(YANGDIR)/\" +AM_CPPFLAGS = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE -D_GNU_SOURCE -DYANG_PATH_=\"$(YANGDIR)\" plugindir = $(srpdplugindir) plugin_LTLIBRARIES = confd-plugin.la diff --git a/src/confd/src/core.c b/src/confd/src/core.c index 8c2708aa..b3a0a952 100644 --- a/src/confd/src/core.c +++ b/src/confd/src/core.c @@ -70,7 +70,7 @@ int sr_plugin_init_cb(sr_session_ctx_t *session, void **priv) goto err; } - rc = sr_install_module(confd.conn, YANG_PATH_"kernelkit-infix-deviations.yang", NULL, NULL); + rc = sr_install_module(confd.conn, YANG_PATH_"/kernelkit-infix-deviations.yang", NULL, NULL); if (rc) goto err; diff --git a/src/confd/src/ietf-system.c b/src/confd/src/ietf-system.c index 7c7841c4..7ba1003e 100644 --- a/src/confd/src/ietf-system.c +++ b/src/confd/src/ietf-system.c @@ -758,11 +758,11 @@ int ietf_system_init(struct confd *confd) goto err; } - rc = sr_install_module(confd->conn, YANG_PATH_"ietf-system@2014-08-06.yang", NULL, features); + rc = sr_install_module(confd->conn, YANG_PATH_"/ietf-system@2014-08-06.yang", NULL, features); if (rc) goto err; /* Augment to ietf-systems */ - rc = sr_install_module(confd->conn, YANG_PATH_"infix-system@2014-08-06.yang", NULL, NULL); + rc = sr_install_module(confd->conn, YANG_PATH_"/infix-system@2014-08-06.yang", NULL, NULL); if (rc) goto err;