!15 freeipmi:fix invalid template check error

From: @chenmaodong 
Reviewed-by: @Charlie_li 
Signed-off-by: @Charlie_li
This commit is contained in:
openeuler-ci-bot 2023-01-05 13:48:52 +00:00 committed by Gitee
commit 1dd890c943
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 79553b7b68f2f3b618234b9528f358952ebe61b2 Mon Sep 17 00:00:00 2001
From: Albert Chu <chu11@llnl.gov>
Date: Fri, 28 Jan 2022 14:58:34 -0800
Subject: [PATCH] libfreeipmi/cmds: fix invalid template check error
---
libfreeipmi/cmds/ipmi-lan-cmds.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libfreeipmi/cmds/ipmi-lan-cmds.c b/libfreeipmi/cmds/ipmi-lan-cmds.c
index 959548ca6..365e1771c 100644
--- a/libfreeipmi/cmds/ipmi-lan-cmds.c
+++ b/libfreeipmi/cmds/ipmi-lan-cmds.c
@@ -2324,7 +2324,7 @@ fill_cmd_set_lan_configuration_parameters_ipv6_static_addresses (uint8_t channel
return (-1);
}
- if (FIID_OBJ_TEMPLATE_COMPARE (obj_cmd_rq, tmpl_cmd_set_lan_configuration_parameters_ipv6_header_flow_label_rq) < 0)
+ if (FIID_OBJ_TEMPLATE_COMPARE (obj_cmd_rq, tmpl_cmd_set_lan_configuration_parameters_ipv6_static_addresses_rq) < 0)
{
ERRNO_TRACE (errno);
return (-1);
--
2.21.0

View File

@ -1,6 +1,6 @@
Name: freeipmi
Version: 1.6.8
Release: 2
Release: 3
Summary: IPMI remote console and system management software
License: GPLv3+
URL: http://www.gnu.org/software/freeipmi/
@ -9,6 +9,7 @@ Source1: bmc-watchdog.service
Source2: ipmidetectd.service
Source3: ipmiseld.service
Patch0: backport-0001-ipmi-config-fix-output-corner-case-due-to-missing-er.patch
Patch1: backport-0001-libfreeipmi-cmds-fix-invalid-template-check-error.patch
BuildRequires: libgcrypt-devel texinfo systemd gcc
%{?systemd_requires}
@ -138,6 +139,9 @@ install-info %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir &>/dev/null || :
%exclude %{_infodir}/dir
%changelog
* Thu Jan 05 2023 chenmaodong <chenmaodong@xfusion.com> - 1.6.8-3
- fix invalid template check error
* Thu Dec 29 2022 chenmaodong <chenmaodong@xfusion.com> - 1.6.8-2
- ipmi-config: fix output corner case due to missing error handling