1 From 55af753f593243bcd1ab4c7e82620bdee432915b Mon Sep 17 00:00:00 2001
2 From: Chris Leech <cleech@redhat.com>
3 Date: Thu, 7 Nov 2019 09:16:17 -0800
4 Subject: [PATCH] libiscsi: fix build against latest upstream, again
7 libiscsi/Makefile | 4 ++--
8 libiscsi/libiscsi.c | 6 +++---
9 2 files changed, 5 insertions(+), 5 deletions(-)
11 diff --git a/libiscsi/Makefile b/libiscsi/Makefile
12 index f2cf248..462d666 100644
13 --- a/libiscsi/Makefile
14 +++ b/libiscsi/Makefile
15 @@ -10,7 +10,7 @@ WARNFLAGS ?= -Wall -Wstrict-prototypes
16 CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \
17 -D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden \
19 -LDFLAGS = -L../libopeniscsiusr -lopeniscsiusr
20 +LDFLAGS = -L../libopeniscsiusr -lopeniscsiusr -lkmod -lcrypto
22 TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
23 TESTS += tests/test_login tests/test_logout tests/test_params
24 @@ -19,7 +19,7 @@ TESTS += tests/test_set_auth tests/test_get_auth
26 COMMON_SRCS = sysdeps.o
27 # sources shared between iscsid, iscsiadm and iscsistart
28 -ISCSI_LIB_SRCS = netlink.o transport.o cxgbi.o be2iscsi.o iscsi_timer.o initiator_common.o iscsi_err.o session_info.o iscsi_util.o io.o auth.o discovery.o login.o log.o md5.o sha1.o iface.o idbm.o sysfs.o iscsi_sysfs.o iscsi_net_util.o iscsid_req.o iser.o uip_mgmt_ipc.o
29 +ISCSI_LIB_SRCS = netlink.o transport.o cxgbi.o be2iscsi.o iscsi_timer.o initiator_common.o iscsi_err.o session_info.o iscsi_util.o io.o auth.o discovery.o login.o log.o iface.o idbm.o sysfs.o iscsi_sysfs.o iscsi_net_util.o iscsid_req.o iser.o uip_mgmt_ipc.o
30 FW_PARAM_SRCS = fw_entry.o prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_sysfs.o
32 # sources shared with the userspace utils, note we build these separately
33 diff --git a/libiscsi/libiscsi.c b/libiscsi/libiscsi.c
34 index 7003388..c598aee 100644
35 --- a/libiscsi/libiscsi.c
36 +++ b/libiscsi/libiscsi.c
37 @@ -429,7 +429,7 @@ int libiscsi_node_login(struct libiscsi_context *context,
39 CHECK(idbm_for_each_iface(&nr_found, (void*)node->iface, login_helper,
40 (char *)node->name, node->tpgt,
41 - (char *)node->address, node->port))
42 + (char *)node->address, node->port, false))
44 strcpy(context->error_str, "No such node");
46 @@ -615,7 +615,7 @@ int libiscsi_node_set_parameter(struct libiscsi_context *context,
48 CHECK(idbm_for_each_iface(&nr_found, ¶ms, idbm_node_set_param,
49 (char *)node->name, node->tpgt,
50 - (char *)node->address, node->port))
51 + (char *)node->address, node->port, false))
53 strcpy(context->error_str, "No such node");
55 @@ -677,7 +677,7 @@ int libiscsi_node_get_parameter(struct libiscsi_context *context,
56 as most settings should be the same independent of the iface. */
57 CHECK(idbm_for_each_iface(&nr_found, context, get_parameter_helper,
58 (char *)node->name, node->tpgt,
59 - (char *)node->address, node->port))
60 + (char *)node->address, node->port, false))
62 strcpy(context->error_str, "No such node");