libiscsi: fix discovery command timeout regression

libiscsi: fix format security build errors

0024-libiscsi-fix-discovery-timeout-regression.patch

@@ -0,0 +1,32 @@
+From 7028eb21348ca79c2a0f33807275089980ffa177 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 28 Feb 2017 09:00:41 -0800
+Subject: libiscsi: fix discovery request timeout regression
+
+---
+ libiscsi/libiscsi.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libiscsi/libiscsi.c b/libiscsi/libiscsi.c
+index 755c18ca8e3b..bb17dfcafded 100644
+--- a/libiscsi/libiscsi.c
++++ b/libiscsi/libiscsi.c
+@@ -136,6 +136,7 @@ int libiscsi_discover_sendtargets(struct libiscsi_context *context,
+ 
+ 	/* Fill the drec struct with all needed info */
+ 	memset(&drec, 0, sizeof drec);
++	drec.iscsid_req_tmo = -1;
+ 	idbm_sendtargets_defaults(&drec.u.sendtargets);
+ 	drec.type = DISCOVERY_TYPE_SENDTARGETS;
+ 	strlcpy(drec.address, address, sizeof(drec.address));
+@@ -228,6 +229,7 @@ int libiscsi_discover_firmware(struct libiscsi_context *context,
+ 	CHECK(iface_create_ifaces_from_boot_contexts(&ifaces, &targets));
+ 
+ 	memset(&drec, 0, sizeof(drec));
++	drec.iscsid_req_tmo = -1;
+ 	drec.type = DISCOVERY_TYPE_FW;
+ 	rc = idbm_bind_ifaces_to_nodes(discovery_fw, &drec, &ifaces, &rec_list);
+ 	if (rc) {
+-- 
+2.9.3
+

0025-libiscsi-format-security-build-errors.patch

@@ -0,0 +1,35 @@
+From 173fe0956fee58f6568fa61d2cd4609ca4decfb1 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 28 Feb 2017 10:06:42 -0800
+Subject: libiscsi format-security build errors
+
+---
+ libiscsi/libiscsi.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/libiscsi/libiscsi.c b/libiscsi/libiscsi.c
+index bb17dfcafded..66fe54f5f897 100644
+--- a/libiscsi/libiscsi.c
++++ b/libiscsi/libiscsi.c
+@@ -177,7 +177,8 @@ int libiscsi_discover_sendtargets(struct libiscsi_context *context,
+ 		*found_nodes = calloc(found, sizeof **found_nodes);
+ 		if (*found_nodes == NULL) {
+ 			snprintf(context->error_str,
+-				 sizeof(context->error_str), strerror(ENOMEM));
++				 sizeof(context->error_str),
++				 "%s", strerror(ENOMEM));
+ 			rc = ENOMEM;
+ 			goto leave;
+ 		}
+@@ -634,7 +635,7 @@ static int get_parameter_helper(void *data, node_rec_t *rec)
+ 	info = idbm_recinfo_alloc(MAX_KEYS);
+ 	if (!info) {
+ 		snprintf(context->error_str, sizeof(context->error_str),
+-			 strerror(ENOMEM));
++			 "%s", strerror(ENOMEM));
+ 		return ENOMEM;
+ 	}
+ 
+-- 
+2.9.3
+

iscsi-initiator-utils.spec

@@ -6,7 +6,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
-Release: 2.git%{shortcommit0}%{?dist}
+Release: 3.git%{shortcommit0}%{?dist}
 Group: System Environment/Daemons
 License: GPLv2+
 URL: http://www.open-iscsi.org
@@ -37,6 +37,8 @@ Patch0020: 0020-Add-macros-to-release-GIL-lock.patch
 Patch0021: 0021-libiscsi-introduce-sessions-API.patch
 Patch0022: 0022-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
 Patch0023: 0023-fix-discoverydb-command-timeout.patch
+Patch0024: 0024-libiscsi-fix-discovery-timeout-regression.patch
+Patch0025: 0025-libiscsi-format-security-build-errors.patch
 
 BuildRequires: flex bison python2-devel python3-devel python-setuptools doxygen kmod-devel systemd-units
 BuildRequires: autoconf automake libtool libmount-devel openssl-devel
@@ -278,6 +280,10 @@ fi
 %{python3_sitearch}/*
 
 %changelog
+* Tue Feb 28 2017 Chris Leech <cleech@redhat.com> - 6.2.0.874-3.git86e8892
+- libiscsi: fix discovery command timeout regression
+- libiscsi: fix format security build errors
+
 * Thu Feb 16 2017 Chris Leech <cleech@redhat.com> - 6.2.0.874-2.git86e8892
 - fix regression with iscsiadm discoverydb commands having a 0 timeout