RHEL 9.0.0 Alpha bootstrap

The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/iscsi-initiator-utils#a2e117b6ad237223d5d4ccc96f537ae6347890c5
2020-10-15 13:47:25 +02:00 · 2020-10-15 13:47:25 +02:00 · 54c1943ea2
commit 54c1943ea2
parent 5216e4fe76
31 changed files with 7482 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,11 @@
+/open-iscsi-2.0-873.tar.gz
+/iscsiuio-0.7.2.1.tar.gz
+/open-iscsi-4c9d6f9.tar.gz
+/open-iscsi-4c1f2d9.tar.gz
+/open-iscsi-86e8892.tar.gz
+/open-iscsi-4ef9261.tar.gz
+/open-iscsi-f3c8e90.tar.gz
+/open-iscsi-4440e57.tar.gz
+/open-iscsi-ac87641.tar.gz
+/open-iscsi-802688d.tar.gz
+/open-iscsi-13e7f58.tar.gz
--- a/0001-configuration-support-for-CHAP-algorithms-rebased.patch
+++ b/0001-configuration-support-for-CHAP-algorithms-rebased.patch
@ -0,0 +1,658 @@
+From d3daa7a2bc3f5bca874d3efd072b34a657c4d492 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Sun, 24 Nov 2019 13:51:09 -0800
+Subject: [PATCH] configuration support for CHAP algorithms
+
+Introduces support for preference lists in configuration files, and uses
+that for the 'node.session.auth.chap_algs' setting.
+
+This is also re-used for discovery authentication, rather than have two
+different configurations.
+---
+ etc/iscsid.conf               |   7 ++
+ libopeniscsiusr/default.c     |   3 +
+ libopeniscsiusr/idbm.c        |  95 +++++++++++++++++++++++++
+ libopeniscsiusr/idbm.h        |   9 +++
+ libopeniscsiusr/idbm_fields.h |   1 +
+ usr/auth.c                    |  64 ++++++++++++-----
+ usr/auth.h                    |   3 +
+ usr/config.h                  |   1 +
+ usr/idbm.c                    | 126 ++++++++++++++++++++++++++++++----
+ usr/idbm.h                    |   2 +
+ usr/idbm_fields.h             |   1 +
+ usr/initiator.h               |   1 +
+ usr/initiator_common.c        |   2 +
+ usr/login.c                   |  11 +++
+ 14 files changed, 294 insertions(+), 32 deletions(-)
+
+diff --git a/etc/iscsid.conf b/etc/iscsid.conf
+index 70985afd..58f60404 100644
+--- a/etc/iscsid.conf
+++ b/etc/iscsid.conf
+@@ -57,6 +57,13 @@ node.leading_login = No
+ # to CHAP. The default is None.
+ #node.session.auth.authmethod = CHAP
+ 
+# To configure which CHAP algorithms to enable set
+# node.session.auth.chap_algs to a comma seperated list.
+# The algorithms should be listen with most prefered first.
+# Valid values are MD5, SHA1, SHA256, and SHA3-256.
+# The default is MD5.
+#node.session.auth.chap_algs = SHA3-256,SHA256,SHA1,MD5
+
+ # To set a CHAP username and password for initiator
+ # authentication by the target(s), uncomment the following lines:
+ #node.session.auth.username = username
+diff --git a/libopeniscsiusr/default.c b/libopeniscsiusr/default.c
+index d01d8928..d3b3da35 100644
+--- a/libopeniscsiusr/default.c
+++ b/libopeniscsiusr/default.c
+@@ -78,6 +78,9 @@ void _default_node(struct iscsi_node *node)
+ 	node->session.initial_login_retry_max = DEF_INITIAL_LOGIN_RETRIES_MAX;
+ 	node->session.reopen_max = DEF_SESSION_REOPEN_MAX;
+ 	node->session.auth.authmethod = 0;
+	/* TYPE_INT_LIST fields should be initialized to ~0 to indicate unset values */
+	memset(node->session.auth.chap_algs, ~0, sizeof(node->session.auth.chap_algs));
+	node->session.auth.chap_algs[0] = ISCSI_AUTH_CHAP_ALG_MD5;
+ 	node->session.auth.password_length = 0;
+ 	node->session.auth.password_in_length = 0;
+ 	node->session.err_tmo.abort_timeout = DEF_ABORT_TIMEO;
+diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c
+index d020e6ce..05cb7f9f 100644
+--- a/libopeniscsiusr/idbm.c
+++ b/libopeniscsiusr/idbm.c
+@@ -73,6 +73,7 @@
+ #define TYPE_INT32	6
+ #define TYPE_INT64	7
+ #define TYPE_BOOL	8
+#define TYPE_INT_LIST	9
+ #define MAX_KEYS	256   /* number of keys total(including CNX_MAX) */
+ #define NAME_MAXVAL	128   /* the maximum length of key name */
+ #define VALUE_MAXVAL	256   /* the maximum length of 223 bytes in the RFC. */
+@@ -248,6 +249,39 @@ do { \
+ 	_n++; \
+ } while(0)
+ 
+#define ARRAY_LEN(x) ( sizeof(x) / sizeof((x)[0]) )
+
+/* Options list type, rather than matching a single value this populates an
+ * array with a list of values in user specified order.
+ * Requires a table matching config strings to values.
+ **/
+#define _rec_int_list(_key, _recs, _org, _name, _show, _tbl, _n, _mod) \
+do {\
+	_recs[_n].type = TYPE_INT_LIST; \
+	_strncpy(_recs[_n].name, _key, NAME_MAXVAL); \
+	for (unsigned int _i = 0; _i < ARRAY_LEN(_org->_name); _i++) { \
+		if (_org->_name[_i] != ~0UL) { \
+			for (unsigned int _j = 0; _j < ARRAY_LEN(_tbl); _j++) { \
+				if (_tbl[_j].value == _org->_name[_i]) { \
+					strcat(_recs[_n].value, _tbl[_j].name); \
+					strcat(_recs[_n].value, ","); \
+					break; \
+				} \
+			} \
+		} \
+	} \
+	/* delete traling ',' */ \
+	if (strrchr(_recs[_n].value, ',')) \
+		*strrchr(_recs[_n].value, ',') = '\0'; \
+	_recs[_n].data = &_org->_name; \
+	_recs[_n].data_len = sizeof(_org->_name); \
+	_recs[_n].visible = _show; \
+	_recs[_n].opts[0] = (void *)&_tbl; \
+	_recs[_n].numopts = ARRAY_LEN(_tbl); \
+	_recs[_n].can_modify = _mod; \
+	_n++; \
+} while(0)
+
+ enum modify_mode {
+ 	_CANNOT_MODIFY,
+ 	_CAN_MODIFY,
+@@ -558,6 +592,11 @@ void _idbm_node_print(struct iscsi_node *node, FILE *f, bool show_secret)
+ 	_idbm_recs_free(recs);
+ }
+ 
+struct int_list_tbl {
+	const char *name;
+	unsigned int value;
+};
+
+ static int _idbm_rec_update_param(struct iscsi_context *ctx,
+ 				  struct idbm_rec *recs, char *name,
+ 				  char *value, int line_number)
+@@ -565,8 +604,14 @@ static int _idbm_rec_update_param(struct iscsi_context *ctx,
+ 	int rc = LIBISCSI_OK;
+ 	int i = 0;
+ 	int j = 0;
+	int k = 0;
+ 	int passwd_done = 0;
+ 	char passwd_len[8];
+	struct int_list_tbl *tbl = NULL;
+	char *tmp_value;
+	int *tmp_data;
+	bool *found;
+	char *token;
+ 
+ 	assert(ctx != NULL);
+ 	assert(recs != NULL);
+@@ -643,6 +688,47 @@ static int _idbm_rec_update_param(struct iscsi_context *ctx,
+ 				else
+ 					goto unknown_value;
+ 				goto updated;
+			case TYPE_INT_LIST:
+				if (!recs[i].data)
+					continue;
+				tbl = (void *)recs[i].opts[0];
+				/* strsep is destructive, make a copy to work with */
+				tmp_value = strdup(value);
+				k = 0;
+				tmp_data = malloc(recs[i].data_len);
+				memset(tmp_data, ~0, recs[i].data_len);
+				found = calloc(recs[i].numopts, sizeof(bool));
+next_token:			while ((token = strsep(&tmp_value, ", \n"))) {
+					if (!strlen(token))
+						continue;
+					if ((k * (int)sizeof(int)) >= (recs[i].data_len)) {
+						_warn(ctx, "Too many values set for '%s'"
+						      ", continuing without processing them all",
+						      recs[i].name);
+						break;
+					}
+					for (j = 0; j < recs[i].numopts; j++) {
+						if (!strcmp(token, tbl[j].name)) {
+							if ((found[j])) {
+								_warn(ctx, "Ignoring repeated value '%s'"
+								      " for '%s'", token, recs[i].name);
+								goto next_token;
+							}
+							((unsigned *)tmp_data)[k++] = tbl[j].value;
+							found[j] = true;
+							goto next_token;
+						}
+					}
+					_warn(ctx, "Ignoring unknown value '%s'"
+					      " for '%s'", token, recs[i].name);
+				}
+				memcpy(recs[i].data, tmp_data, recs[i].data_len);
+				free(tmp_value);
+				free(tmp_data);
+				tmp_value = NULL;
+				tmp_data = NULL;
+				token = NULL;
+				goto updated;
+ 			default:
+ unknown_value:
+ 				_error(ctx, "Got unknown data type %d "
+@@ -882,6 +968,13 @@ void _idbm_free(struct idbm *db)
+ 	free(db);
+ }
+ 
+static struct int_list_tbl chap_algs[] = {
+	{ "MD5", ISCSI_AUTH_CHAP_ALG_MD5 },
+	{ "SHA1", ISCSI_AUTH_CHAP_ALG_SHA1 },
+	{ "SHA256", ISCSI_AUTH_CHAP_ALG_SHA256 },
+	{ "SHA3-256", ISCSI_AUTH_CHAP_ALG_SHA3_256 },
+};
+
+ static void _idbm_node_rec_link(struct iscsi_node *node, struct idbm_rec *recs)
+ {
+ 	int num = 0;
+@@ -944,6 +1037,8 @@ static void _idbm_node_rec_link(struct iscsi_node *node, struct idbm_rec *recs)
+ 	_rec_uint32(SESSION_PASSWORD_IN_LEN, recs, node,
+ 		    session.auth.password_in_length, IDBM_HIDE, num,
+ 		    _CAN_MODIFY);
+	_rec_int_list(SESSION_CHAP_ALGS, recs, node, session.auth.chap_algs,
+		IDBM_SHOW, chap_algs, num, _CAN_MODIFY);
+ 	_rec_int64(SESSION_REPLACEMENT_TMO, recs, node,
+ 		   session.tmo.replacement_timeout, IDBM_SHOW, num,
+ 		   _CAN_MODIFY);
+diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h
+index 3fd0864a..cc90388b 100644
+--- a/libopeniscsiusr/idbm.h
+++ b/libopeniscsiusr/idbm.h
+@@ -48,6 +48,14 @@ enum iscsi_auth_method {
+ 	ISCSI_AUTH_METHOD_CHAP,
+ };
+ 
+enum iscsi_chap_algs {
+	ISCSI_AUTH_CHAP_ALG_MD5 = 5,
+	ISCSI_AUTH_CHAP_ALG_SHA1 = 6,
+	ISCSI_AUTH_CHAP_ALG_SHA256 = 7,
+	ISCSI_AUTH_CHAP_ALG_SHA3_256 = 8,
+	AUTH_CHAP_ALG_MAX_COUNT = 5,
+};
+
+ enum iscsi_startup_type {
+ 	ISCSI_STARTUP_MANUAL,
+ 	ISCSI_STARTUP_AUTOMATIC,
+@@ -92,6 +100,7 @@ struct iscsi_auth_config {
+ 	char					username_in[AUTH_STR_MAX_LEN];
+ 	unsigned char				password_in[AUTH_STR_MAX_LEN];
+ 	uint32_t				password_in_length;
+	unsigned int				chap_algs[AUTH_CHAP_ALG_MAX_COUNT];
+ };
+ 
+ /* all TCP options go in this structure.
+diff --git a/libopeniscsiusr/idbm_fields.h b/libopeniscsiusr/idbm_fields.h
+index 29a2090c..8bf17b02 100644
+--- a/libopeniscsiusr/idbm_fields.h
+++ b/libopeniscsiusr/idbm_fields.h
+@@ -120,6 +120,7 @@
+ #define SESSION_USERNAME_IN	"node.session.auth.username_in"
+ #define SESSION_PASSWORD_IN	"node.session.auth.password_in"
+ #define SESSION_PASSWORD_IN_LEN	"node.session.auth.password_in_length"
+#define SESSION_CHAP_ALGS	"node.session.auth.chap_algs"
+ #define SESSION_REPLACEMENT_TMO	"node.session.timeo.replacement_timeout"
+ #define SESSION_ABORT_TMO	"node.session.err_timeo.abort_timeout"
+ #define SESSION_LU_RESET_TMO	"node.session.err_timeo.lu_reset_timeout"
+diff --git a/usr/auth.c b/usr/auth.c
+index 5c819c28..a222c531 100644
+--- a/usr/auth.c
+++ b/usr/auth.c
+@@ -1806,7 +1806,7 @@ acl_chk_chap_alg_list(unsigned int option_count, const int *option_list)
+ 	return 0;
+ }
+ 
+-static int
+int
+ acl_set_chap_alg_list(struct iscsi_acl *client, unsigned int option_count,
+ 		      const int *option_list)
+ {
+@@ -1819,22 +1819,54 @@ acl_set_chap_alg_list(struct iscsi_acl *client, unsigned int option_count,
+ }
+ 
+ int
+-acl_init_chap_digests(int *value_list) {
+acl_init_chap_digests(int *value_list, unsigned *chap_algs, int conf_count) {
+ 	EVP_MD_CTX *context = EVP_MD_CTX_new();
+ 	int i = 0;
+ 
+-	if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) {
+-		value_list[i++] = AUTH_CHAP_ALG_SHA3_256;
+-	}
+-	if (EVP_DigestInit_ex(context, EVP_sha256(), NULL)) {
+-		value_list[i++] = AUTH_CHAP_ALG_SHA256;
+-	}
+-	if (EVP_DigestInit_ex(context, EVP_sha1(), NULL)) {
+-		value_list[i++] = AUTH_CHAP_ALG_SHA1;
+-	}
+-	if (EVP_DigestInit_ex(context, EVP_md5(), NULL)) {
+-		value_list[i++] = AUTH_CHAP_ALG_MD5;
+	for (int j = 0; j < conf_count; j++) {
+		switch (chap_algs[j]) {
+		case AUTH_CHAP_ALG_MD5:
+			if (EVP_DigestInit_ex(context, EVP_md5(), NULL)) {
+				value_list[i++] = AUTH_CHAP_ALG_MD5;
+			} else {
+				log_warning("Ignoring CHAP algorthm request for "
+				            "MD5 due to crypto lib configuration");
+			}
+			break;
+		case AUTH_CHAP_ALG_SHA1:
+			if (EVP_DigestInit_ex(context, EVP_sha1(), NULL)) {
+				value_list[i++] = AUTH_CHAP_ALG_SHA1;
+			} else {
+				log_warning("Ignoring CHAP algorthm request for "
+				            "SHA1 due to crypto lib configuration");
+			}
+			break;
+		case AUTH_CHAP_ALG_SHA256:
+			if (EVP_DigestInit_ex(context, EVP_sha256(), NULL)) {
+				value_list[i++] = AUTH_CHAP_ALG_SHA256;
+			} else {
+				log_warning("Ignoring CHAP algorthm request for "
+				            "SHA256 due to crypto lib configuration");
+			}
+			break;
+		case AUTH_CHAP_ALG_SHA3_256:
+			if (EVP_DigestInit_ex(context, EVP_sha3_256(), NULL)) {
+				value_list[i++] = AUTH_CHAP_ALG_SHA3_256;
+			} else {
+				log_warning("Ignoring CHAP algorthm request for "
+				            "SHA3-256 due to crypto lib configuration");
+			}
+			break;
+		case ~0:
+			/* unset value in array, just ignore */
+			break;
+		default:
+			log_warning("Ignoring unknown CHAP algorithm request "
+				    "'%d'", chap_algs[j]);
+			break;
+		}
+ 	}
+
+ 	return i;
+ }
+ 
+@@ -1926,12 +1958,6 @@ acl_init(int node_type, int buf_desc_count, struct auth_buffer_desc *buff_desc)
+ 		return AUTH_STATUS_ERROR;
+ 	}
+ 
+-	if (acl_set_chap_alg_list(client, acl_init_chap_digests(value_list),
+-					value_list) != AUTH_STATUS_NO_ERROR) {
+-		client->phase = AUTH_PHASE_ERROR;
+-		return AUTH_STATUS_ERROR;
+-	}
+-
+ 	return AUTH_STATUS_NO_ERROR;
+ }
+ 
+diff --git a/usr/auth.h b/usr/auth.h
+index f6dbbe4b..16cdb242 100644
+--- a/usr/auth.h
+++ b/usr/auth.h
+@@ -271,6 +271,9 @@ extern int acl_send_transit_bit(struct iscsi_acl *client, int *value);
+ extern int acl_set_user_name(struct iscsi_acl *client, const char *username);
+ extern int acl_set_passwd(struct iscsi_acl *client,
+ 			  const unsigned char *pw_data, unsigned int pw_len);
+extern int acl_set_chap_alg_list(struct iscsi_acl *client, unsigned int option_count,
+		      const int *option_list);
+extern int acl_init_chap_digests(int *value_list, unsigned int *chap_algs, int count);
+ extern int acl_set_auth_rmt(struct iscsi_acl *client, int auth_rmt);
+ extern int acl_set_ip_sec(struct iscsi_acl *client, int ip_sec);
+ extern int acl_get_dbg_status(struct iscsi_acl *client, int *value);
+diff --git a/usr/config.h b/usr/config.h
+index 250879db..79059ec3 100644
+--- a/usr/config.h
+++ b/usr/config.h
+@@ -58,6 +58,7 @@ struct iscsi_auth_config {
+ 	char username_in[AUTH_STR_MAX_LEN];
+ 	unsigned char password_in[AUTH_STR_MAX_LEN];
+ 	unsigned int password_in_length;
+	unsigned int chap_algs[AUTH_CHAP_ALG_MAX_COUNT];
+ };
+ 
+ /* all per-connection timeouts go in this structure.
+diff --git a/usr/idbm.c b/usr/idbm.c
+index be4d4e36..e08301c6 100644
+--- a/usr/idbm.c
+++ b/usr/idbm.c
+@@ -50,6 +50,8 @@
+ 
+ static struct idbm *db;
+ 
+#define ARRAY_LEN(x) ( sizeof(x) / sizeof((x)[0]) )
+
+ #define __recinfo_str(_key, _info, _rec, _name, _show, _n, _mod) do { \
+ 	_info[_n].type = TYPE_STR; \
+ 	strlcpy(_info[_n].name, _key, NAME_MAXVAL); \
+@@ -164,6 +166,42 @@ static struct idbm *db;
+ 	_n++; \
+ } while(0)
+ 
+#define __recinfo_int_list(_key,_info,_rec,_name,_show,_tbl,_n,_mod) do { \
+	_info[_n].type = TYPE_INT_LIST; \
+	strlcpy(_info[_n].name, _key, NAME_MAXVAL); \
+	for(int _i = 0; _i < ARRAY_LEN(_rec->_name); _i++) { \
+		if (_rec->_name[_i] != ~0) { \
+			for (int _j = 0; _j < ARRAY_LEN(_tbl); _j++) { \
+				if (_tbl[_j].value == _rec->_name[_i]) { \
+					strcat(_info[_n].value, _tbl[_j].name); \
+					strcat(_info[_n].value, ","); \
+					break; \
+				} \
+			} \
+		} \
+	} \
+	/* delete trailing ',' */ \
+	if (strrchr(_info[_n].value, ',')) \
+		*strrchr(_info[_n].value, ',') = '\0'; \
+	_info[_n].data = &_rec->_name; \
+	_info[_n].data_len = sizeof(_rec->_name); \
+	_info[_n].visible = _show; \
+	_info[_n].opts[0] = (void *)&_tbl; \
+	_info[_n].numopts = ARRAY_LEN(_tbl); \
+	_info[_n].can_modify = _mod; \
+	_n++; \
+} while (0)
+
+static struct int_list_tbl {
+	const char *name;
+	int value;
+} chap_algs [] = {
+	{ "MD5", AUTH_CHAP_ALG_MD5 },
+	{ "SHA1", AUTH_CHAP_ALG_SHA1 },
+	{ "SHA256", AUTH_CHAP_ALG_SHA256 },
+	{ "SHA3-256", AUTH_CHAP_ALG_SHA3_256 },
+};
+
+ static int idbm_remove_disc_to_node_link(node_rec_t *rec, char *portal);
+
+ static void
+@@ -196,6 +234,10 @@ idbm_recinfo_discovery(discovery_rec_t *r, recinfo_t *ri)
+ 		__recinfo_int(DISC_ST_PASSWORD_IN_LEN, ri, r,
+ 			u.sendtargets.auth.password_in_length, IDBM_HIDE,
+ 			num, 1);
+		/* reusing SESSION_CHAP_ALGS */
+		__recinfo_int_list(SESSION_CHAP_ALGS, ri, r,
+				   u.sendtargets.auth.chap_algs,
+				   IDBM_SHOW, chap_algs, num, 1);
+ 		__recinfo_int(DISC_ST_LOGIN_TMO, ri, r,
+ 			u.sendtargets.conn_timeo.login_timeout,
+ 			IDBM_SHOW, num, 1);
+@@ -428,6 +470,8 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri)
+ 		      session.auth.password_in, IDBM_MASKED, num, 1);
+ 	__recinfo_int(SESSION_PASSWORD_IN_LEN, ri, r,
+ 		      session.auth.password_in_length, IDBM_HIDE, num, 1);
+	__recinfo_int_list(SESSION_CHAP_ALGS, ri, r,
+			   session.auth.chap_algs, IDBM_SHOW, chap_algs, num, 1);
+ 	__recinfo_int(SESSION_REPLACEMENT_TMO, ri, r,
+ 		      session.timeo.replacement_timeout,
+ 		      IDBM_SHOW, num, 1);
+@@ -933,6 +977,9 @@ idbm_discovery_setup_defaults(discovery_rec_t *rec, discovery_type_e type)
+ 		rec->u.sendtargets.auth.authmethod = 0;
+ 		rec->u.sendtargets.auth.password_length = 0;
+ 		rec->u.sendtargets.auth.password_in_length = 0;
+		/* TYPE_INT_LIST fields should be initialized to ~0 to indicate unset values */
+		memset(rec->u.sendtargets.auth.chap_algs, ~0, sizeof(rec->u.sendtargets.auth.chap_algs));
+		rec->u.sendtargets.auth.chap_algs[0] = AUTH_CHAP_ALG_MD5;
+ 		rec->u.sendtargets.conn_timeo.login_timeout=15;
+ 		rec->u.sendtargets.conn_timeo.auth_timeout = 45;
+ 		rec->u.sendtargets.conn_timeo.active_timeout=30;
+@@ -966,59 +1013,109 @@ int idbm_rec_update_param(recinfo_t *info, char *name, char *value,
+ 	int i;
+ 	int passwd_done = 0;
+ 	char passwd_len[8];
+	char *tmp_value, *token;
+	bool *found;
+	int *tmp_data;
+ 
+ setup_passwd_len:
+ 	for (i=0; i<MAX_KEYS; i++) {
+ 		if (!strcmp(name, info[i].name)) {
+-			int j;
+			int j,k;
+			struct int_list_tbl *tbl;
+ 
+ 			log_debug(7, "updated '%s', '%s' => '%s'", name,
+ 				  info[i].value, value);
+ 			/* parse recinfo by type */
+-			if (info[i].type == TYPE_INT) {
+			switch (info[i].type) {
+			case TYPE_INT:
+ 				if (!info[i].data)
+ 					continue;
+ 
+ 				*(int*)info[i].data =
+ 					strtoul(value, NULL, 10);
+ 				goto updated;
+-			} else if (info[i].type == TYPE_UINT8) {
+			case TYPE_UINT8:
+ 				if (!info[i].data)
+ 					continue;
+ 
+ 				*(uint8_t *)info[i].data =
+ 					strtoul(value, NULL, 10);
+ 				goto updated;
+-			} else if (info[i].type == TYPE_UINT16) {
+			case TYPE_UINT16:
+ 				if (!info[i].data)
+ 					continue;
+ 
+ 				*(uint16_t *)info[i].data =
+ 					strtoul(value, NULL, 10);
+ 				goto updated;
+-			} else if (info[i].type == TYPE_UINT32) {
+			case TYPE_UINT32:
+ 				if (!info[i].data)
+ 					continue;
+ 
+ 				*(uint32_t *)info[i].data =
+ 					strtoul(value, NULL, 10);
+ 				goto updated;
+-			} else if (info[i].type == TYPE_STR) {
+			case TYPE_STR:
+ 				if (!info[i].data)
+ 					continue;
+ 
+ 				strlcpy((char*)info[i].data,
+ 					value, info[i].data_len);
+ 				goto updated;
+-			}
+-			for (j=0; j<info[i].numopts; j++) {
+-				if (!strcmp(value, info[i].opts[j])) {
+-					if (!info[i].data)
+			case TYPE_INT_O:
+				for (j=0; j<info[i].numopts; j++) {
+					if (!strcmp(value, info[i].opts[j])) {
+						if (!info[i].data)
+							continue;
+
+						*(int*)info[i].data = j;
+						goto updated;
+					}
+				}
+			case TYPE_INT_LIST:
+				if (!info[i].data)
+					continue;
+				tbl = (void *)info[i].opts[0];
+				/* strsep is destructive, make a copy to work with */
+				tmp_value = strdup(value);
+				k = 0;
+				tmp_data = malloc(info[i].data_len);
+				memset(tmp_data, ~0, info[i].data_len);
+				found = calloc(info[i].numopts, sizeof(bool));
+
+next_token:			while ((token = strsep(&tmp_value, ", \n"))) {
+					if (!strlen(token))
+ 						continue;
+-
+-					*(int*)info[i].data = j;
+-					goto updated;
+					if ((k * (int)sizeof(int)) >= (info[i].data_len)) {
+						log_warning("Too many values set for '%s'"
+						            ", continuing without processing them all",
+						            info[i].name);
+						break;
+					}
+					for (j = 0; j < info[i].numopts; j++) {
+						if (!strcmp(token, tbl[j].name)) {
+							if ((found[j])) {
+								log_warning("Ignoring repeated "
+								            "value '%s' "
+								            "for '%s'", token,
+								            info[i].name);
+								goto next_token;
+							}
+							((int*)tmp_data)[k++] = tbl[j].value;
+							found[j] = true;
+							goto next_token;
+						}
+					}
+					log_warning("Ignoring unknown value '%s'"
+					            " for '%s'", token, info[i].name);
+ 				}
+				memcpy(info[i].data, tmp_data, info[i].data_len);
+				free(tmp_value);
+				free(tmp_data);
+				tmp_value = NULL;
+				tmp_data = NULL;
+				token = NULL;
+				goto updated;
+ 			}
+ 			if (line_number) {
+ 				log_warning("config file line %d contains "
+@@ -3021,6 +3118,9 @@ void idbm_node_setup_defaults(node_rec_t *rec)
+ 	rec->session.initial_login_retry_max = DEF_INITIAL_LOGIN_RETRIES_MAX;
+ 	rec->session.reopen_max = DEF_SESSION_REOPEN_MAX;
+ 	rec->session.auth.authmethod = 0;
+	/* TYPE_INT_LIST fields should be initialized to ~0 to indicate unset values */
+	memset(rec->session.auth.chap_algs, ~0, sizeof(rec->session.auth.chap_algs));
+	rec->session.auth.chap_algs[0] = AUTH_CHAP_ALG_MD5;
+ 	rec->session.auth.password_length = 0;
+ 	rec->session.auth.password_in_length = 0;
+ 	rec->session.err_timeo.abort_timeout = DEF_ABORT_TIMEO;
+diff --git a/usr/idbm.h b/usr/idbm.h
+index 18c50255..46cd82ac 100644
+--- a/usr/idbm.h
+++ b/usr/idbm.h
+@@ -45,6 +45,8 @@
+ #define TYPE_UINT8	3
+ #define TYPE_UINT16	4
+ #define TYPE_UINT32	5
+#define TYPE_INT_LIST	6
+
+ #define MAX_KEYS	256   /* number of keys total(including CNX_MAX) */
+ #define NAME_MAXVAL	128   /* the maximum length of key name */
+ #define VALUE_MAXVAL	256   /* the maximum length of 223 bytes in the RFC. */
+diff --git a/usr/idbm_fields.h b/usr/idbm_fields.h
+index 142c7ae6..4a967fc0 100644
+--- a/usr/idbm_fields.h
+++ b/usr/idbm_fields.h
+@@ -30,6 +30,7 @@
+ #define SESSION_USERNAME_IN	"node.session.auth.username_in"
+ #define SESSION_PASSWORD_IN	"node.session.auth.password_in"
+ #define SESSION_PASSWORD_IN_LEN	"node.session.auth.password_in_length"
+#define SESSION_CHAP_ALGS	"node.session.auth.chap_algs"
+ #define SESSION_REPLACEMENT_TMO	"node.session.timeo.replacement_timeout"
+ #define SESSION_ABORT_TMO	"node.session.err_timeo.abort_timeout"
+ #define SESSION_LU_RESET_TMO	"node.session.err_timeo.lu_reset_timeout"
+diff --git a/usr/initiator.h b/usr/initiator.h
+index eccafb90..6a49ea6e 100644
+--- a/usr/initiator.h
+++ b/usr/initiator.h
+@@ -243,6 +243,7 @@ typedef struct iscsi_session {
+ 	char username_in[AUTH_STR_MAX_LEN];
+ 	uint8_t password_in[AUTH_STR_MAX_LEN];
+ 	int password_in_length;
+	unsigned int chap_algs[AUTH_CHAP_ALG_MAX_COUNT];
+ 	iscsi_conn_t conn[ISCSI_CONN_MAX];
+ 	uint64_t param_mask;
+ 
+diff --git a/usr/initiator_common.c b/usr/initiator_common.c
+index 790f13de..81da8fdb 100644
+--- a/usr/initiator_common.c
+++ b/usr/initiator_common.c
+@@ -94,6 +94,8 @@ int iscsi_setup_authentication(struct iscsi_session *session,
+ 		memcpy(session->password_in, auth_cfg->password_in,
+ 		       session->password_in_length);
+ 
+	memcpy(session->chap_algs, auth_cfg->chap_algs, sizeof(auth_cfg->chap_algs));
+
+ 	if (session->password_length || session->password_in_length) {
+ 		/* setup the auth buffers */
+ 		session->auth_buffers[0].address = &session->auth_client_block;
+diff --git a/usr/login.c b/usr/login.c
+index d7dad211..1251e61c 100644
+--- a/usr/login.c
+++ b/usr/login.c
+@@ -1262,6 +1262,17 @@ check_for_authentication(iscsi_session_t *session,
+ 		goto end;
+ 	}
+ 
+	int value_list[AUTH_CHAP_ALG_MAX_COUNT];
+
+	if (acl_set_chap_alg_list(auth_client,
+				acl_init_chap_digests(value_list,
+					session->chap_algs,
+					AUTH_CHAP_ALG_MAX_COUNT),
+				value_list) != AUTH_STATUS_NO_ERROR) {
+		log_error("Couldn't set CHAP algorithm list");
+		goto end;
+	}
+
+ 	if (acl_set_ip_sec(auth_client, 1) != AUTH_STATUS_NO_ERROR) {
+ 		log_error("Couldn't set IPSec");
+ 		goto end;
--- a/0001-service-file-tweaks.patch
+++ b/0001-service-file-tweaks.patch
@ -0,0 +1,146 @@
+From 2d84ee02e9ac69928261b38b5876bebb2349bd65 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 4 Jun 2019 13:23:32 -0700
+Subject: [PATCH] service file tweaks
+
+---
+ etc/systemd/iscsi-mark-root-nodes  | 30 ++++++++++++++++++++++++++++++
+ etc/systemd/iscsi-shutdown.service | 14 ++++++++++++++
+ etc/systemd/iscsi.service          | 23 +++++++++++++----------
+ etc/systemd/iscsid.service         |  6 ++++--
+ etc/systemd/iscsiuio.service       |  2 +-
+ 5 files changed, 62 insertions(+), 13 deletions(-)
+ create mode 100755 etc/systemd/iscsi-mark-root-nodes
+ create mode 100644 etc/systemd/iscsi-shutdown.service
+
+diff --git a/etc/systemd/iscsi-mark-root-nodes b/etc/systemd/iscsi-mark-root-nodes
+new file mode 100755
+index 0000000..c693707
+--- /dev/null
+++ b/etc/systemd/iscsi-mark-root-nodes
+@@ -0,0 +1,30 @@
+#!/bin/bash
+
+ISCSIADM=/usr/sbin/iscsiadm
+start_iscsid=0
+start_iscsiuio=0
+
+while read t num p target flash; do
+  # strip tag number from portal, keep "ip:port"
+  portal=${p%,*}
+  transport=${t%:}
+
+  $ISCSIADM -m node -p $portal -T $target -o update -n node.startup -v onboot
+
+  start_iscsid=1
+
+  if [ "$transport" = bnx2i ] || [ "$transport" = qedi ]; then
+    start_iscsiuio=1
+  fi
+done < <( $ISCSIADM -m session )
+
+# force iscsid and iscsiuio to start if needed for
+# recovering sessions created in the initrd
+
+if [ "$start_iscsid" -eq 1 ]; then
+  systemctl --no-block start iscsid.service
+fi
+if [ "$start_iscsiuio" -eq 1 ]; then
+  systemctl --no-block start iscsiuio.service
+fi
+
+diff --git a/etc/systemd/iscsi-shutdown.service b/etc/systemd/iscsi-shutdown.service
+new file mode 100644
+index 0000000..69c1c77
+--- /dev/null
+++ b/etc/systemd/iscsi-shutdown.service
+@@ -0,0 +1,14 @@
+[Unit]
+Description=Logout off all iSCSI sessions on shutdown
+Documentation=man:iscsid(8) man:iscsiadm(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
+Before=remote-fs-pre.target
+Wants=remote-fs-pre.target
+RefuseManualStop=yes
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStop=-/usr/sbin/iscsiadm -m node --logoutall=all
+diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
+index e475888..eadfcec 100644
+--- a/etc/systemd/iscsi.service
+++ b/etc/systemd/iscsi.service
+@@ -1,18 +1,21 @@
+ [Unit]
+ Description=Login and scanning of iSCSI devices
+-Documentation=man:iscsiadm(8) man:iscsid(8)
+-Before=remote-fs.target
+-After=network.target network-online.target iscsid.service
+-Requires=iscsid.service
+-ConditionPathExists=/etc/iscsi/initiatorname.iscsi
+Documentation=man:iscsid(8) man:iscsiadm(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
+Before=remote-fs-pre.target
+Wants=remote-fs-pre.target iscsi-shutdown.service
+ConditionDirectoryNotEmpty=|/var/lib/iscsi/nodes
+ConditionDirectoryNotEmpty=|/sys/class/iscsi_session
+ 
+ [Service]
+ Type=oneshot
+-ExecStart=/sbin/iscsiadm -m node --loginall=automatic
+-ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
+-ExecStop=/sbin/iscsiadm -m node --logoutall=manual
+-SuccessExitStatus=21
+ RemainAfterExit=true
+ExecStart=-/usr/libexec/iscsi-mark-root-nodes
+ExecStart=-/usr/sbin/iscsiadm -m node --loginall=automatic
+ExecReload=-/usr/sbin/iscsiadm -m node --loginall=automatic
+SuccessExitStatus=21
+ 
+ [Install]
+-WantedBy=remote-fs.target
+WantedBy=sysinit.target
+diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
+index 4fef168..8d50cf0 100644
+--- a/etc/systemd/iscsid.service
+++ b/etc/systemd/iscsid.service
+@@ -1,14 +1,16 @@
+ [Unit]
+ Description=Open-iSCSI
+-Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
+Documentation=man:iscsid(8) man:iscsiadm(8)
+ DefaultDependencies=no
+Conflicts=shutdown.target
+ After=network.target iscsiuio.service
+ Before=remote-fs-pre.target
+ 
+ [Service]
+ Type=notify
+ NotifyAccess=main
+-ExecStart=/sbin/iscsid -f
+ExecStart=/usr/sbin/iscsid -f
+ExecStop=/usr/sbin/iscsiadm -k 0 2
+ KillMode=mixed
+ Restart=on-failure
+ 
+diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service
+index e4d9fd0..8620cde 100644
+--- a/etc/systemd/iscsiuio.service
+++ b/etc/systemd/iscsiuio.service
+@@ -11,7 +11,7 @@ Before=remote-fs-pre.target iscsid.service
+ [Service]
+ Type=notify
+ NotifyAccess=main
+-ExecStart=/sbin/iscsiuio -f
+ExecStart=/usr/sbin/iscsiuio -f
+ KillMode=mixed
+ Restart=on-failure
+ 
+-- 
+2.21.0
+
--- a/0001-stop-using-Werror-for-now.patch
+++ b/0001-stop-using-Werror-for-now.patch
@ -0,0 +1,56 @@
+From d4758b0d347e4adccf4d39e6bd29ba68c53a92b8 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 3 Mar 2020 10:35:40 -0800
+Subject: [PATCH 1/1] stop using Werror for now
+
+need to work through these warning that only appear on s390x
+Werror seems bad for release, makes packaging a nightmare when new
+compilers come around
+---
+ Makefile        | 2 +-
+ usr/Makefile    | 2 +-
+ usr/initiator.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7e6b734..0069e75 100644
+--- a/Makefile
+++ b/Makefile
+@@ -7,7 +7,7 @@
+ DESTDIR ?=
+ 
+ prefix = /usr
+-exec_prefix = /
+exec_prefix = /usr
+ sbindir = $(exec_prefix)/sbin
+ bindir = $(exec_prefix)/bin
+ mandir = $(prefix)/share/man
+diff --git a/usr/Makefile b/usr/Makefile
+index 885243a..1a743d1 100644
+--- a/usr/Makefile
+++ b/usr/Makefile
+@@ -35,7 +35,7 @@ endif
+ PKG_CONFIG = /usr/bin/pkg-config
+ 
+ CFLAGS ?= -O2 -g
+-WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
+WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common
+ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
+ 	  -I$(TOPDIR)/libopeniscsiusr -DISNS_ENABLE
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
+diff --git a/usr/initiator.c b/usr/initiator.c
+index a07f9aa..a06760c 100644
+--- a/usr/initiator.c
+++ b/usr/initiator.c
+@@ -580,7 +580,7 @@ __session_conn_reopen(iscsi_conn_t *conn, queue_task_t *qtask, int do_stop,
+ 		      int redirected)
+ {
+ 	iscsi_session_t *session = conn->session;
+-	uint32_t delay;
+	uint32_t delay = 0;
+ 
+ 	log_debug(1, "re-opening session %d (reopen_cnt %d)", session->id,
+ 			session->reopen_cnt);
+-- 
+2.21.1
+
--- a/0001-unit-file-tweaks.patch
+++ b/0001-unit-file-tweaks.patch
@ -0,0 +1,158 @@
+From 52806cfdca12164f0757dcecd05c25c6aa4dda43 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 4 Jun 2019 13:23:32 -0700
+Subject: [PATCH] unit file tweaks
+
+---
+ etc/systemd/iscsi-mark-root-nodes  | 29 +++++++++++++++++++++++++++++
+ etc/systemd/iscsi-onboot.service   | 15 +++++++++++++++
+ etc/systemd/iscsi-shutdown.service | 14 ++++++++++++++
+ etc/systemd/iscsi.service          | 10 +++++++---
+ etc/systemd/iscsid.service         |  4 ++--
+ etc/systemd/iscsiuio.service       |  2 +-
+ 6 files changed, 68 insertions(+), 6 deletions(-)
+ create mode 100755 etc/systemd/iscsi-mark-root-nodes
+ create mode 100644 etc/systemd/iscsi-onboot.service
+ create mode 100644 etc/systemd/iscsi-shutdown.service
+
+diff --git a/etc/systemd/iscsi-mark-root-nodes b/etc/systemd/iscsi-mark-root-nodes
+new file mode 100755
+index 0000000..e5a09c6
+--- /dev/null
+++ b/etc/systemd/iscsi-mark-root-nodes
+@@ -0,0 +1,29 @@
+#!/bin/bash
+
+ISCSIADM=/usr/sbin/iscsiadm
+start_iscsid=0
+start_iscsiuio=0
+
+while read t num p target flash; do
+  # strip tag number from portal, keep "ip:port"
+  portal=${p%,*}
+  transport=${t%:}
+
+  # use session number to find the iface name in use
+  num=${num#[}; num=${num%]}
+  iface=$(iscsiadm -m session -r $num | grep iface.iscsi_ifacename | cut -d= -f2)
+
+  $ISCSIADM -m node -p $portal -T $target -I $iface -o update -n node.startup -v onboot
+
+  start_iscsid=1
+
+  if [ "$transport" = bnx2i ] || [ "$transport" = qedi ]; then
+    start_iscsiuio=1
+  fi
+done < <( $ISCSIADM -m session )
+
+# force iscsid and iscsiuio to start if needed for
+# recovering sessions created in the initrd
+
+if [ "$start_iscsid" -eq 1 ]; then
+  systemctl --no-block start iscsid.service
+diff --git a/etc/systemd/iscsi-onboot.service b/etc/systemd/iscsi-onboot.service
+new file mode 100644
+index 0000000..42ced68
+--- /dev/null
+++ b/etc/systemd/iscsi-onboot.service
+@@ -0,0 +1,15 @@
+[Unit]
+Description=Special handling of early boot iSCSI sessions
+Documentation=man:iscsiadm(8) man:iscsid(8)
+DefaultDependencies=no
+RefuseManualStart=true
+Before=iscsi.service
+After=systemd-remount-fs.service
+ConditionDirectoryNotEmpty=/sys/class/iscsi_session
+
+[Service]
+Type=oneshot
+ExecStart=-/usr/libexec/iscsi-mark-root-nodes
+
+[Install]
+WantedBy=sysinit.target
+diff --git a/etc/systemd/iscsi-shutdown.service b/etc/systemd/iscsi-shutdown.service
+new file mode 100644
+index 0000000..6848a72
+--- /dev/null
+++ b/etc/systemd/iscsi-shutdown.service
+@@ -0,0 +1,14 @@
+[Unit]
+Description=Logout off all iSCSI sessions on shutdown
+Documentation=man:iscsid(8) man:iscsiadm(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
+Before=remote-fs-pre.target
+Wants=remote-fs-pre.target
+RefuseManualStop=yes
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=-/usr/bin/true
+diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
+index 2f2bf81..51810c9 100644
+--- a/etc/systemd/iscsi.service
+++ b/etc/systemd/iscsi.service
+@@ -1,16 +1,20 @@
+ [Unit]
+ Description=Login and scanning of iSCSI devices
+ Documentation=man:iscsiadm(8) man:iscsid(8)
+DefaultDependencies=no
+Conflicts=shutdown.target
+ Before=remote-fs.target
+After=systemd-remount-fs.service iscsiuio.service
+ After=network.target network-online.target
+ After=iscsid.service iscsi-init.service
+ Requires=iscsid.socket iscsi-init.service
+Wants=remote-fs-pre.target iscsi-shutdown.service
+ConditionDirectoryNotEmpty=/var/lib/iscsi/nodes
+ 
+ [Service]
+ Type=oneshot
+-ExecStart=/sbin/iscsiadm -m node --loginall=automatic
+-ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
+-ExecStop=/sbin/iscsiadm -m node --logoutall=manual
+ExecStart=-/usr/sbin/iscsiadm -m node --loginall=automatic
+ExecReload=-/usr/sbin/iscsiadm -m node --loginall=automatic
+ SuccessExitStatus=21 15
+ RemainAfterExit=true
+ 
+diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
+index 648ceea..79e63cd 100644
+--- a/etc/systemd/iscsid.service
+++ b/etc/systemd/iscsid.service
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Open-iSCSI
+-Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
+Documentation=man:iscsid(8) man:iscsiuio(8)
+ DefaultDependencies=no
+ After=network.target iscsiuio.service
+ Before=remote-fs-pre.target
+@@ -9,7 +9,7 @@ Wants=remote-fs-pre.target
+ [Service]
+ Type=notify
+ NotifyAccess=main
+-ExecStart=/sbin/iscsid -f
+ExecStart=/usr/sbin/iscsid -f
+ KillMode=mixed
+ Restart=on-failure
+ 
+diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service
+index 923e019..f92b0e7 100644
+--- a/etc/systemd/iscsiuio.service
+++ b/etc/systemd/iscsiuio.service
+@@ -12,7 +12,7 @@ Wants=remote-fs-pre.target
+ [Service]
+ Type=notify
+ NotifyAccess=main
+-ExecStart=/sbin/iscsiuio -f
+ExecStart=/usr/sbin/iscsiuio -f
+ KillMode=mixed
+ Restart=on-failure
+ 
+-- 
+2.26.2
+
--- a/0002-idmb_rec_write-check-for-tpgt-first.patch
+++ b/0002-idmb_rec_write-check-for-tpgt-first.patch
@ -0,0 +1,54 @@
+From 97071360caa6868c21a161047ed471790c405efb Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Tue, 13 Aug 2013 10:59:44 -0700
+Subject: [PATCH] idmb_rec_write, check for tpgt first
+
+Factor out the check for a tpgt to a single place, before going crazy on
+the rec files.  Makes flow of this function easier to follow, and preps
+for splitting it up.
+---
+ usr/idbm.c | 18 +++++-------------
+ 1 file changed, 5 insertions(+), 13 deletions(-)
+
+diff --git a/usr/idbm.c b/usr/idbm.c
+index be4d4e3..a7da540 100644
+--- a/usr/idbm.c
+++ b/usr/idbm.c
+@@ -2078,6 +2078,10 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
+ 			goto free_portal;
+ 	}
+ 
+	if (rec->tpgt == PORTAL_GROUP_TAG_UNKNOWN)
+		/* drop down to old style portal as config */
+		goto open_conf;
+
+ 	rc = stat(portal, &statb);
+ 	if (rc) {
+ 		rc = 0;
+@@ -2086,22 +2090,10 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
+ 		 * set the tgpt. In new versions you must pass all the info in
+ 		 * from the start
+ 		 */
+-		if (rec->tpgt == PORTAL_GROUP_TAG_UNKNOWN)
+-			/* drop down to old style portal as config */
+-			goto open_conf;
+-		else
+-			goto mkdir_portal;
+		goto mkdir_portal;
+ 	}
+ 
+ 	if (!S_ISDIR(statb.st_mode)) {
+-		/*
+-		 * older iscsiadm versions had you create the config then set
+-		 * set the tgpt. In new versions you must pass all the info in
+-		 * from the start
+-		 */
+-		if (rec->tpgt == PORTAL_GROUP_TAG_UNKNOWN)
+-			/* drop down to old style portal as config */
+-			goto open_conf;
+ 		/*
+ 		 * Old style portal as a file, but with tpgt. Let's update it.
+ 		 */
+-- 
+2.21.0
+
--- a/0003-idbm_rec_write-seperate-old-and-new-style-writes.patch
+++ b/0003-idbm_rec_write-seperate-old-and-new-style-writes.patch
@ -0,0 +1,193 @@
+From 4c6e7c0fcc6da66cf81c0714bf907762194eedf2 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Tue, 13 Aug 2013 11:34:31 -0700
+Subject: [PATCH] idbm_rec_write, seperate old and new style writes
+
+Duplicates a small bit of code, but easier to understand and extened.
+---
+ usr/idbm.c | 129 +++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 86 insertions(+), 43 deletions(-)
+
+diff --git a/usr/idbm.c b/usr/idbm.c
+index a7da540..2f5e309 100644
+--- a/usr/idbm.c
+++ b/usr/idbm.c
+@@ -2030,12 +2030,7 @@ mkdir_portal:
+ 	return f;
+ }
+ 
+-/*
+- * When the disable_lock param is true, the idbm_lock/idbm_unlock needs
+- * to be holt by the caller, this will avoid overwriting each other in
+- * case of updating(read-modify-write) the recs in parallel.
+- */
+-static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
+static int idbm_rec_write_new(node_rec_t *rec)
+ {
+ 	struct stat statb;
+ 	FILE *f;
+@@ -2048,39 +2043,8 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
+ 		return ISCSI_ERR_NOMEM;
+ 	}
+ 
+-	snprintf(portal, PATH_MAX, "%s", NODE_CONFIG_DIR);
+-	if (access(portal, F_OK) != 0) {
+-		if (mkdir(portal, 0660) != 0) {
+-			log_error("Could not make %s: %s", portal,
+-				  strerror(errno));
+-			rc = ISCSI_ERR_IDBM;
+-			goto free_portal;
+-		}
+-	}
+-
+-	snprintf(portal, PATH_MAX, "%s/%s", NODE_CONFIG_DIR, rec->name);
+-	if (access(portal, F_OK) != 0) {
+-		if (mkdir(portal, 0660) != 0) {
+-			log_error("Could not make %s: %s", portal,
+-				  strerror(errno));
+-			rc = ISCSI_ERR_IDBM;
+-			goto free_portal;
+-		}
+-	}
+-
+ 	snprintf(portal, PATH_MAX, "%s/%s/%s,%d", NODE_CONFIG_DIR,
+ 		 rec->name, rec->conn[0].address, rec->conn[0].port);
+-	log_debug(5, "Looking for config file %s", portal);
+-
+-	if (!disable_lock) {
+-		rc = idbm_lock();
+-		if (rc)
+-			goto free_portal;
+-	}
+-
+-	if (rec->tpgt == PORTAL_GROUP_TAG_UNKNOWN)
+-		/* drop down to old style portal as config */
+-		goto open_conf;
+ 
+ 	rc = stat(portal, &statb);
+ 	if (rc) {
+@@ -2101,11 +2065,11 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
+ 			log_error("Could not convert %s: %s", portal,
+ 				  strerror(errno));
+ 			rc = ISCSI_ERR_IDBM;
+-			goto unlock;
+			goto free_portal;
+ 		}
+ 	} else {
+ 		rc = ISCSI_ERR_INVAL;
+-		goto unlock;
+		goto free_portal;
+ 	}
+ 
+ mkdir_portal:
+@@ -2116,24 +2080,103 @@ mkdir_portal:
+ 			log_error("Could not make dir %s: %s",
+ 				  portal, strerror(errno));
+ 			rc = ISCSI_ERR_IDBM;
+-			goto unlock;
+			goto free_portal;
+ 		}
+ 	}
+ 
+ 	snprintf(portal, PATH_MAX, "%s/%s/%s,%d,%d/%s", NODE_CONFIG_DIR,
+ 		 rec->name, rec->conn[0].address, rec->conn[0].port, rec->tpgt,
+ 		 rec->iface.name);
+-open_conf:
+
+ 	f = fopen(portal, "w");
+ 	if (!f) {
+ 		log_error("Could not open %s: %s", portal, strerror(errno));
+ 		rc = ISCSI_ERR_IDBM;
+-		goto unlock;
+		goto free_portal;
+ 	}
+ 
+ 	idbm_print(IDBM_PRINT_TYPE_NODE, rec, 1, f);
+ 	fclose(f);
+-unlock:
+free_portal:
+	free(portal);
+	return rc;
+}
+
+static int idbm_rec_write_old(node_rec_t *rec)
+{
+	FILE *f;
+	char *portal;
+	int rc = 0;
+
+	portal = malloc(PATH_MAX);
+	if (!portal) {
+		log_error("Could not alloc portal");
+		return ISCSI_ERR_NOMEM;
+	}
+	snprintf(portal, PATH_MAX, "%s/%s/%s,%d", NODE_CONFIG_DIR,
+		 rec->name, rec->conn[0].address, rec->conn[0].port);
+
+	f = fopen(portal, "w");
+	if (!f) {
+		log_error("Could not open %s: %sd", portal, strerror(errno));
+		rc = ISCSI_ERR_IDBM;
+		goto free_portal;
+	}
+	idbm_print(IDBM_PRINT_TYPE_NODE, rec, 1, f);
+	fclose(f);
+free_portal:
+	free(portal);
+	return rc;
+}
+
+/*
+ * When the disable_lock param is true, the idbm_lock/idbm_unlock needs
+ * to be holt by the caller, this will avoid overwriting each other in
+ * case of updating(read-modify-write) the recs in parallel.
+ */
+static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
+{
+	char *portal;
+	int rc = 0;
+
+	portal = malloc(PATH_MAX);
+	if (!portal) {
+		log_error("Could not alloc portal");
+		return ISCSI_ERR_NOMEM;
+	}
+
+	snprintf(portal, PATH_MAX, "%s", NODE_CONFIG_DIR);
+	if (access(portal, F_OK) != 0) {
+		if (mkdir(portal, 0660) != 0) {
+			log_error("Could not make %s: %s", portal,
+				  strerror(errno));
+			rc = ISCSI_ERR_IDBM;
+			goto free_portal;
+		}
+	}
+
+	snprintf(portal, PATH_MAX, "%s/%s", NODE_CONFIG_DIR, rec->name);
+	if (access(portal, F_OK) != 0) {
+		if (mkdir(portal, 0660) != 0) {
+			log_error("Could not make %s: %s", portal,
+				  strerror(errno));
+			rc = ISCSI_ERR_IDBM;
+			goto free_portal;
+		}
+	}
+
+	if (!disable_lock) {
+		rc = idbm_lock();
+		if (rc)
+			goto free_portal;
+	}
+
+	if (rec->tpgt == PORTAL_GROUP_TAG_UNKNOWN)
+		/* old style portal as config */
+		rc = idbm_rec_write_old(rec);
+	else
+		rc = idbm_rec_write_new(rec);
+
+ 	if (!disable_lock)
+ 		idbm_unlock();
+ free_portal:
+-- 
+2.21.0
+
--- a/0004-idbw_rec_write-pick-tpgt-from-existing-record.patch
+++ b/0004-idbw_rec_write-pick-tpgt-from-existing-record.patch
@ -0,0 +1,87 @@
+From 351ee477f713730d1c53cf26b6fb87706d268a5f Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Tue, 13 Aug 2013 12:39:07 -0700
+Subject: [PATCH 1/1] idbw_rec_write, pick tpgt from existing record
+
+On a static add (-m node -o new) without a user specified tpgt, looks
+for existing new style records with tpgt before creating an old style
+record without.  If one exists, take the tpgt from it an write an
+updated new style record instead.
+---
+ usr/idbm.c | 40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+diff --git a/usr/idbm.c b/usr/idbm.c
+index b6193e7..2208c4a 100644
+--- a/usr/idbm.c
+++ b/usr/idbm.c
+@@ -28,6 +28,7 @@
+ #include <dirent.h>
+ #include <limits.h>
+ #include <fcntl.h>
+#include <glob.h>
+ #include <sys/stat.h>
+ #include <sys/file.h>
+ #include <inttypes.h>
+@@ -202,6 +203,8 @@ static struct int_list_tbl {
+ 	{ "SHA3-256", AUTH_CHAP_ALG_SHA3_256 },
+ };
+ 
+static int idbm_remove_disc_to_node_link(node_rec_t *rec, char *portal);
+
+ static void
+ idbm_recinfo_discovery(discovery_rec_t *r, recinfo_t *ri)
+ {
+@@ -2206,12 +2209,49 @@ static int idbm_rec_write_old(node_rec_t *rec)
+ 	FILE *f;
+ 	char *portal;
+ 	int rc = 0;
+	glob_t globbuf;
+	size_t i;
+	int tpgt = PORTAL_GROUP_TAG_UNKNOWN;
+ 
+ 	portal = malloc(PATH_MAX);
+ 	if (!portal) {
+ 		log_error("Could not alloc portal");
+ 		return ISCSI_ERR_NOMEM;
+ 	}
+
+	/* check for newer portal dir with tpgt */
+	snprintf(portal, PATH_MAX, "%s/%s/%s,%d,*", NODE_CONFIG_DIR,
+		 rec->name, rec->conn[0].address, rec->conn[0].port);
+	rc = glob(portal, GLOB_ONLYDIR, NULL, &globbuf);
+	if (!rc) {
+		if (globbuf.gl_pathc > 1)
+			log_warning("multiple tpg records for portal "
+				    "%s/%s:%d found", rec->name,
+				    rec->conn[0].address, rec->conn[0].port);
+		/* set pattern for sscanf matching of tpgt */
+		snprintf(portal, PATH_MAX, "%s/%s/%s,%d,%%u", NODE_CONFIG_DIR,
+			 rec->name, rec->conn[0].address, rec->conn[0].port);
+		for (i = 0; i < globbuf.gl_pathc; i++) {
+			rc = sscanf(globbuf.gl_pathv[i], portal, &tpgt);
+			if (rc == 1)
+				break;
+		}
+		if (tpgt == PORTAL_GROUP_TAG_UNKNOWN)
+			log_warning("glob match on existing records, "
+				    "but no valid tpgt found");
+	}
+	globfree(&globbuf);
+	rc = 0;
+
+	/* if a tpgt was selected from an old record, write entry in new format */
+	if (tpgt != PORTAL_GROUP_TAG_UNKNOWN) {
+		log_warning("using tpgt %u from existing record", tpgt);
+		rec->tpgt = tpgt;
+		rc = idbm_remove_disc_to_node_link(rec, portal);
+		free(portal);
+		return idbm_rec_write_new(rec);
+	}
+
+ 	snprintf(portal, PATH_MAX, "%s/%s/%s,%d", NODE_CONFIG_DIR,
+ 		 rec->name, rec->conn[0].address, rec->conn[0].port);
+ 
+-- 
+2.21.1
+
--- a/0005-update-initscripts-and-docs.patch
+++ b/0005-update-initscripts-and-docs.patch
@ -0,0 +1,123 @@
+From 6602f08bfcc2b2e75d1a58671cb160c96cf2d99b Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Mon, 19 Nov 2012 16:37:13 -0800
+Subject: [PATCH] update initscripts and docs
+
+---
+ README          | 10 ++++------
+ etc/iscsid.conf | 21 ++++++++++-----------
+ usr/idbm.c      |  4 ++++
+ 3 files changed, 18 insertions(+), 17 deletions(-)
+
+diff --git a/README b/README
+index 2499d9a..c05814a 100644
+--- a/README
+++ b/README
+@@ -77,11 +77,6 @@ the cache sync command will fail.
+ - iscsiadm's -P 3 option will not print out scsi devices.
+ - iscsid will not automatically online devices.
+ 
+-You need to enable "Cryptographic API" under "Cryptographic options" in the
+-kernel config. And you must enable "CRC32c CRC algorithm" even if
+-you do not use header or data digests. They are the kernel options
+-CONFIG_CRYPTO and CONFIG_CRYPTO_CRC32C, respectively.
+-
+ The userspace components iscsid, iscsiadm and iscsistart require the
+ open-isns library, which can be found here:
+ 	https://github.com/gonzoleeman/open-isns/releases
+@@ -1151,7 +1146,7 @@ Red Hat or Fedora:
+ -----------------
+ To start open-iscsi in Red Hat/Fedora you can do:
+ 
+-	service open-iscsi start
+	service iscsi start
+ 
+ To get open-iscsi to automatically start at run time you may have to
+ run:
+@@ -1353,6 +1348,9 @@ iscsid will only perform rediscovery when it gets a SCN from the server.
+ #   linux-isns (SLES's iSNS server) where it sometimes does not send SCN
+ #   events in the proper format, so they may not get handled.
+ 
+To set the startup value, so that nodes are not logged into automatically
+use the value "manual".
+
+ Examples
+ --------
+ 
+diff --git a/etc/iscsid.conf b/etc/iscsid.conf
+index f21ed3d..56c56a9 100644
+--- a/etc/iscsid.conf
+++ b/etc/iscsid.conf
+@@ -19,7 +19,7 @@
+ # the time then leave this attribute commented out.
+ #
+ # Default for Fedora and RHEL. (uncomment to activate).
+-# iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
+iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
+ #
+ # Default if you are not using systemd (uncomment to activate)
+ # iscsid.startup = /usr/bin/service start iscsid
+@@ -41,8 +41,8 @@
+ # To request that the iscsi initd scripts startup a session set to "automatic".
+ # node.startup = automatic
+ #
+-# To manually startup the session set to "manual". The default is manual.
+-node.startup = manual
+# To manually startup the session set to "manual". The default is automatic.
+node.startup = automatic
+ 
+ # For "automatic" startup nodes, setting this to "Yes" will try logins on each
+ # available iface until one succeeds, and then stop.  The default "No" will try
+@@ -271,25 +271,22 @@ node.conn[0].iscsi.MaxXmitDataSegmentLength = 0
+ discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768
+ 
+ # To allow the targets to control the setting of the digest checking,
+-# with the initiator requesting a preference of enabling the checking, uncomment# one or both of the following lines:
+# with the initiator requesting a preference of enabling the checking, uncomment
+# the following lines (Data digests are not supported.):
+ #node.conn[0].iscsi.HeaderDigest = CRC32C,None
+-#node.conn[0].iscsi.DataDigest = CRC32C,None
+ #
+ # To allow the targets to control the setting of the digest checking,
+ # with the initiator requesting a preference of disabling the checking,
+-# uncomment one or both of the following lines:
+# uncomment the following line:
+ #node.conn[0].iscsi.HeaderDigest = None,CRC32C
+-#node.conn[0].iscsi.DataDigest = None,CRC32C
+ #
+ # To enable CRC32C digest checking for the header and/or data part of
+-# iSCSI PDUs, uncomment one or both of the following lines:
+# iSCSI PDUs, uncomment the following line:
+ #node.conn[0].iscsi.HeaderDigest = CRC32C
+-#node.conn[0].iscsi.DataDigest = CRC32C
+ #
+ # To disable digest checking for the header and/or data part of
+-# iSCSI PDUs, uncomment one or both of the following lines:
+-#node.conn[0].iscsi.HeaderDigest = None
+-#node.conn[0].iscsi.DataDigest = None
+# iSCSI PDUs, uncomment the following line:
+node.conn[0].iscsi.HeaderDigest = None
+ #
+ # The default is to never use DataDigests or HeaderDigests.
+ #
+diff --git a/usr/idbm.c b/usr/idbm.c
+index a2332cc..aed08f2 100644
+--- a/usr/idbm.c
+++ b/usr/idbm.c
+@@ -521,9 +521,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri)
+ 				 IDBM_SHOW, "None", "CRC32C", "CRC32C,None",
+ 				 "None,CRC32C", num, 1);
+ 		sprintf(key, CONN_DATA_DIGEST, i);
+
+#if 0
+We do not support data digests
+ 		__recinfo_int_o4(key, ri, r, conn[i].iscsi.DataDigest, IDBM_SHOW,
+ 				 "None", "CRC32C", "CRC32C,None",
+ 				 "None,CRC32C", num, 1);
+#endif
+ 		sprintf(key, CONN_IFMARKER, i);
+ 		__recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW,
+ 				"No", "Yes", num, 1);
+-- 
+2.21.0
+
--- a/0006-use-var-for-config.patch
+++ b/0006-use-var-for-config.patch
@ -0,0 +1,255 @@
+From 9cae86dd15bf78ee9d221f722f723062eb6ad3d8 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Mon, 19 Nov 2012 16:38:45 -0800
+Subject: [PATCH] use var for config
+
+---
+ README         | 33 ++++++++++++++++-----------------
+ doc/iscsiadm.8 |  8 ++++----
+ doc/iscsid.8   |  2 +-
+ usr/idbm.c     |  6 +++---
+ usr/idbm.h     | 13 +++++++------
+ usr/iface.h    |  3 ++-
+ 6 files changed, 33 insertions(+), 32 deletions(-)
+
+diff --git a/README b/README
+index c05814a..326c3b0 100644
+--- a/README
+++ b/README
+@@ -172,8 +172,7 @@ Usage: iscsid [OPTION]
+ 
+ Open-iSCSI persistent configuration is stored in a number of
+ directories under a configuration root directory, using a flat-file
+-format. This configuration root directory is /etc/iscsi by default,
+-but may also commonly be in /var/lib/iscsi.
+format. This configuration root directory is /var/lib/iscsi by default.
+ 
+ Configuration is contained in directories for:
+ 
+@@ -561,7 +560,7 @@ a scsi_host per HBA port).
+ To manage both types of initiator stacks, iscsiadm uses the interface (iface)
+ structure. For each HBA port or for software iscsi for each network
+ device (ethX) or NIC, that you wish to bind sessions to you must create
+-a iface config /etc/iscsi/ifaces.
+a iface config /var/lib/iscsi/ifaces.
+ 
+ Prep
+ ----
+@@ -594,7 +593,7 @@ Running
+ The command
+ 	iscsiadm -m iface
+ 
+-will report iface configurations that are setup in /etc/iscsi/ifaces:
+will report iface configurations that are setup in /var/lib/iscsi/ifaces:
+ 
+ 	iface0 qla4xxx,00:c0:dd:08:63:e8,20.15.0.7,default,iqn.2005-06.com.redhat:madmax
+ 	iface1 qla4xxx,00:c0:dd:08:63:ea,20.15.0.9,default,iqn.2005-06.com.redhat:madmax
+@@ -604,10 +603,10 @@ The format is:
+ 
+ For software iscsi, you can create the iface configs by hand, but it is
+ recommended that you use iscsiadm's iface mode. There is an iface.example in
+-/etc/iscsi/ifaces which can be used as a template for the daring.
+/var/lib/iscsi/ifaces which can be used as a template for the daring.
+ 
+ For each network object you wish to bind a session to, you must create
+-a separate iface config in /etc/iscsi/ifaces and each iface config file
+a separate iface config in /var/lib/iscsi/ifaces and each iface config file
+ must have a unique name which is less than or equal to 64 characters.
+ 
+ Example
+@@ -615,12 +614,12 @@ Example
+ 
+ If you have NIC1 with MAC address 00:0F:1F:92:6B:BF and NIC2 with
+ MAC address 00:C0:DD:08:63:E7, and you wanted to do software iscsi over
+-TCP/IP, then in /etc/iscsi/ifaces/iface0 you would enter:
+TCP/IP, then in /var/lib/iscsi/ifaces/iface0 you would enter:
+ 
+ 	iface.transport_name = tcp
+ 	iface.hwaddress = 00:0F:1F:92:6B:BF
+ 
+-and in /etc/iscsi/ifaces/iface1 you would enter:
+and in /var/lib/iscsi/ifaces/iface1 you would enter:
+ 
+ 	iface.transport_name = tcp
+ 	iface.hwaddress = 00:C0:DD:08:63:E7
+@@ -662,7 +661,7 @@ port. The iface name will be of the form:
+ Running the following command:
+ 	iscsiadm -m iface
+ 
+-will report iface configurations that are setup in /etc/iscsi/ifaces:
+will report iface configurations that are setup in /var/lib/iscsi/ifaces:
+ 
+ 	default tcp,<empty>,<empty>,<empty>,<empty>
+ 	iser iser,<empty>,<empty>,<empty>,<empty>
+@@ -742,7 +741,7 @@ need a separate network connection to the target for discovery purposes.
+ *This will be fixed in the next version of open-iscsi*
+ 
+ For compatibility reasons, when you run iscsiadm to do discovery, it
+-will check for interfaces in /etc/iscsi/iscsi/ifaces that are using
+will check for interfaces in /var/lib/iscsi/iscsi/ifaces that are using
+ tcp for the iface.transport, and it will bind the portals that are discovered
+ so that they will be logged in through those ifaces. This behavior can also
+ be overridden by passing in the interfaces you want to use. For the case
+@@ -757,7 +756,7 @@ If you had defined interfaces but wanted the old behavior, where we do not
+ bind a session to an iface, then you can use the special iface "default":
+ 	iscsiadm -m discoverydb -t st -p ip:port -I default --discover -P 1
+ 
+-And if you did not define any interfaces in /etc/iscsi/ifaces and do
+And if you did not define any interfaces in /var/lib/iscsi/ifaces and do
+ not pass anything into iscsiadm, running iscsiadm will do the default
+ behavior, allowing the network subsystem to decide which device to use.
+ 
+@@ -793,7 +792,7 @@ Discovery mode
+ 		ID [192.168.1.1:3260]:
+ 	iscsiadm -m discoverydb -t st -p 192.168.1.1:3260 --discover
+ 
+-	This will search /etc/iscsi/send_targets for a record with the
+	This will search /var/lib/iscsi/send_targets for a record with the
+ 	ID [portal = 192.168.1.1:3260 and type = sendtargets. If found it
+ 	will perform discovery using the settings stored in the record.
+ 	If a record does not exist, it will be created using the iscsid.conf
+@@ -802,7 +801,7 @@ Discovery mode
+ 	The argument to -p may also be a hostname instead of an address:
+ 		iscsiadm -m discoverydb -t st -p somehost --discover
+ 
+-	For the ifaces, iscsiadm will first search /etc/iscsi/ifaces for
+	For the ifaces, iscsiadm will first search /var/lib/iscsi/ifaces for
+ 	interfaces using software iscsi. If any are found then nodes found
+ 	during discovery will be setup so that they can logged in through
+ 	those interfaces. To specify a specific iface, pass the
+@@ -853,7 +852,7 @@ Discovery mode
+ 
+ - SendTargets iSCSI Discovery with a specific interface.
+ 		If you wish to only use a subset of the interfaces in
+-		/etc/iscsi/ifaces, then you can pass them in during discovery:
+		/var/lib/iscsi/ifaces, then you can pass them in during discovery:
+ 	iscsiadm -m discoverydb -t sendtargets -p 192.168.1.1:3260 \
+ 		--interface=iface0 --interface=iface1 --discover
+ 
+@@ -1223,8 +1222,8 @@ where targetname is the name of the target and ip_address:port is the address
+ and port of the portal. tpgt is the Target Portal Group Tag of
+ the portal, and is not used in iscsiadm commands except for static
+ record creation. ifacename is the name of the iscsi interface
+-defined in /etc/iscsi/ifaces. If no interface was defined in
+-/etc/iscsi/ifaces or passed in, the default behavior is used.
+defined in /var/lib/iscsi/ifaces. If no interface was defined in
+/var/lib/iscsi/ifaces or passed in, the default behavior is used.
+ Default here is iscsi_tcp/tcp to be used over whichever NIC the
+ network layer decides is best.
+ 
+@@ -1336,7 +1335,7 @@ If set, iscsid will perform discovery to the address every
+ discovery.isns.discoveryd_poll_inval or
+ discovery.sendtargets.discoveryd_poll_inval seconds,
+ and it will log into any portals found from the discovery source using
+-the ifaces in /etc/iscsi/ifaces.
+the ifaces in /var/lib/iscsi/ifaces.
+ 
+ Note that for iSNS the poll_interval does not have to be set. If not set,
+ iscsid will only perform rediscovery when it gets a SCN from the server.
+diff --git a/doc/iscsiadm.8 b/doc/iscsiadm.8
+index bf23dd2..9cfce16 100644
+--- a/doc/iscsiadm.8
+++ b/doc/iscsiadm.8
+@@ -228,7 +228,7 @@ This option is only valid for ping submode.
+ .TP
+ \fB\-I\fR, \fB\-\-interface=\fI[iface]\fR
+ The interface argument specifies the iSCSI interface to use for the operation.
+-iSCSI interfaces (iface) are defined in /etc/iscsi/ifaces. For hardware
+iSCSI interfaces (iface) are defined in /var/lib/iscsi/ifaces. For hardware
+ iSCSI (qla4xxx) the iface config must have the hardware address
+ (iface.hwaddress = port's MAC address)
+ and the driver/transport_name (iface.transport_name). The iface's name is
+@@ -301,7 +301,7 @@ If no other options are specified: for \fIdiscovery\fR, \fIdiscoverydb\fR and
+ \fInode\fR, all of their respective records are displayed; for \fIsession\fR,
+ all active sessions and connections are displayed; for \fIfw\fR, all boot
+ firmware values are displayed; for \fIhost\fR, all iSCSI hosts are displayed;
+-and for \fIiface\fR, all ifaces setup in /etc/iscsi/ifaces are displayed.
+and for \fIiface\fR, all ifaces setup in /var/lib/iscsi/ifaces are displayed.
+ .TP
+ \fB\-n\fR, \fB\-\-name=\fIname\fR
+ In node mode, specify a field \fIname\fR in a record. In flashnode submode
+@@ -640,10 +640,10 @@ The configuration file read by \fBiscsid\fR and \fBiscsiadm\fR on startup.
+ The file containing the iSCSI InitiatorName and InitiatorAlias read by
+ \fBiscsid\fR and \fBiscsiadm\fR on startup.
+ .TP
+-/etc/iscsi/nodes/
+/var/lib/iscsi/nodes/
+ This directory contains the nodes with their targets.
+ .TP
+-/etc/iscsi/send_targets
+/var/lib/iscsi/send_targets
+ This directory contains the portals.
+ .SH "SEE ALSO"
+ .BR iscsid (8)
+diff --git a/doc/iscsid.8 b/doc/iscsid.8
+index 6f9218f..0da0551 100644
+--- a/doc/iscsid.8
+++ b/doc/iscsid.8
+@@ -65,7 +65,7 @@ and
+ .B iscsiadm
+ on startup.
+ .TP
+-/etc/iscsi/nodes
+/var/lib/iscsi/nodes
+ Open-iSCSI persistent configuration database
+ 
+ .SH "SEE ALSO"
+diff --git a/usr/idbm.c b/usr/idbm.c
+index aed08f2..15802c3 100644
+--- a/usr/idbm.c
+++ b/usr/idbm.c
+@@ -2968,9 +2968,9 @@ free_info:
+ int idbm_init(idbm_get_config_file_fn *fn)
+ {
+ 	/* make sure root db dir is there */
+-	if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) {
+-		if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) {
+-			log_error("Could not make %s %d", ISCSI_CONFIG_ROOT,
+	if (access(ISCSIVAR, F_OK) != 0) {
+		if (mkdir(ISCSIVAR, 0660) != 0) {
+			log_error("Could not make %s %d", ISCSIVAR,
+ 				   errno);
+ 			return errno;
+ 		}
+diff --git a/usr/idbm.h b/usr/idbm.h
+index 18c5025..6bdfd60 100644
+--- a/usr/idbm.h
+++ b/usr/idbm.h
+@@ -30,12 +30,13 @@
+ #include "list.h"
+ #include "flashnode.h"
+ 
+-#define NODE_CONFIG_DIR		ISCSI_CONFIG_ROOT"nodes"
+-#define SLP_CONFIG_DIR		ISCSI_CONFIG_ROOT"slp"
+-#define ISNS_CONFIG_DIR		ISCSI_CONFIG_ROOT"isns"
+-#define STATIC_CONFIG_DIR	ISCSI_CONFIG_ROOT"static"
+-#define FW_CONFIG_DIR		ISCSI_CONFIG_ROOT"fw"
+-#define ST_CONFIG_DIR		ISCSI_CONFIG_ROOT"send_targets"
+#define ISCSIVAR		"/var/lib/iscsi/"
+#define NODE_CONFIG_DIR		ISCSIVAR"nodes"
+#define SLP_CONFIG_DIR		ISCSIVAR"slp"
+#define ISNS_CONFIG_DIR		ISCSIVAR"isns"
+#define STATIC_CONFIG_DIR	ISCSIVAR"static"
+#define FW_CONFIG_DIR		ISCSIVAR"fw"
+#define ST_CONFIG_DIR		ISCSIVAR"send_targets"
+ #define ST_CONFIG_NAME		"st_config"
+ #define ISNS_CONFIG_NAME	"isns_config"
+ 
+diff --git a/usr/iface.h b/usr/iface.h
+index 6c06f7f..c8b9de9 100644
+--- a/usr/iface.h
+++ b/usr/iface.h
+@@ -21,8 +21,9 @@
+ #define ISCSI_IFACE_H
+ 
+ #include <libopeniscsiusr/libopeniscsiusr.h>
+#include "idbm.h"
+ 
+-#define IFACE_CONFIG_DIR	ISCSI_CONFIG_ROOT"ifaces"
+#define IFACE_CONFIG_DIR	ISCSIVAR"ifaces"
+ 
+ struct iface_rec;
+ struct list_head;
+-- 
+2.21.0
+
--- a/0007-use-red-hat-for-name.patch
+++ b/0007-use-red-hat-for-name.patch
@ -0,0 +1,39 @@
+From 1ddee25396962a6bd966b98311881ed6d4cba87c Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Mon, 19 Nov 2012 16:40:04 -0800
+Subject: [PATCH] use red hat for name
+
+---
+ doc/iscsi-iname.8   | 2 +-
+ utils/iscsi-iname.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/iscsi-iname.8 b/doc/iscsi-iname.8
+index 6a413f6..dd77ed9 100644
+--- a/doc/iscsi-iname.8
+++ b/doc/iscsi-iname.8
+@@ -14,7 +14,7 @@ generates a unique iSCSI node name on every invocation.
+ Display help
+ .TP
+ .BI [-p=]\fIprefix\fP
+-Use the prefix passed in instead of the default "iqn.2016-04.com.open-iscsi"
+Use the prefix passed in instead of the default "iqn.1994-05.com.redhat"
+ 
+ .SH AUTHORS
+ Open-iSCSI project <http://www.open-iscsi.com/>
+diff --git a/utils/iscsi-iname.c b/utils/iscsi-iname.c
+index da850dc..29aa4ad 100644
+--- a/utils/iscsi-iname.c
+++ b/utils/iscsi-iname.c
+@@ -80,7 +80,7 @@ main(int argc, char *argv[])
+ 			exit(0);
+ 		}
+ 	} else {
+-		prefix = "iqn.2016-04.com.open-iscsi";
+		prefix = "iqn.1994-05.com.redhat";
+ 	}
+ 
+ 	/* try to feed some entropy from the pool to MD5 in order to get
+-- 
+2.21.0
+
--- a/0008-libiscsi.patch
+++ b/0008-libiscsi.patch
--- a/0009-Add-macros-to-release-GIL-lock.patch
+++ b/0009-Add-macros-to-release-GIL-lock.patch
@ -0,0 +1,56 @@
+From 3df19ccba0af40da8cdb15c41e1bcd08ce25fbd9 Mon Sep 17 00:00:00 2001
+From: Jiri Konecny <jkonecny@redhat.com>
+Date: Mon, 11 May 2015 13:16:26 +0200
+Subject: [PATCH] Add macros to release GIL lock
+
+Other threads are blocked when GIL is not released before the time consuming
+functions.
+---
+ libiscsi/pylibiscsi.c | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/libiscsi/pylibiscsi.c b/libiscsi/pylibiscsi.c
+index 8800853..40b5955 100644
+--- a/libiscsi/pylibiscsi.c
+++ b/libiscsi/pylibiscsi.c
+@@ -364,8 +364,13 @@ static PyObject *PyIscsiNode_str(PyObject *self)
+ static PyObject *PyIscsiNode_login(PyObject *self)
+ {
+ 	PyIscsiNode *node = (PyIscsiNode *)self;
+	int ret;
+ 
+-	if (libiscsi_node_login(context, &node->node)) {
+	Py_BEGIN_ALLOW_THREADS
+	ret = libiscsi_node_login(context, &node->node);
+	Py_END_ALLOW_THREADS
+
+	if (ret) {
+ 		PyErr_SetString(PyExc_IOError,
+ 				libiscsi_get_error_string(context));
+ 		return NULL;
+@@ -551,6 +556,7 @@ static PyObject *pylibiscsi_discover_sendtargets(PyObject *self,
+ 	const struct libiscsi_auth_info *authinfo = NULL;
+ 	struct libiscsi_node *found_nodes;
+ 	PyObject* found_node_list;
+	int ret;
+ 
+ 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|iO",
+ 					kwlist, &address, &port,
+@@ -570,8 +576,12 @@ static PyObject *pylibiscsi_discover_sendtargets(PyObject *self,
+ 		}
+ 	}
+ 
+-	if (libiscsi_discover_sendtargets(context, address, port, authinfo,
+-					  &nr_found, &found_nodes)) {
+	Py_BEGIN_ALLOW_THREADS
+	ret = libiscsi_discover_sendtargets(context, address, port, authinfo,
+					    &nr_found, &found_nodes);
+	Py_END_ALLOW_THREADS
+
+	if (ret) {
+ 		PyErr_SetString(PyExc_IOError,
+ 				libiscsi_get_error_string(context));
+ 		return NULL;
+-- 
+2.21.0
+
--- a/0010-libiscsi-introduce-sessions-API.patch
+++ b/0010-libiscsi-introduce-sessions-API.patch
@ -0,0 +1,290 @@
+From bca0b3a085b7a169aa40d81ed7997c73fde8b4d3 Mon Sep 17 00:00:00 2001
+From: Peter Hatina <phatina@redhat.com>
+Date: Mon, 5 Oct 2015 16:50:36 -0700
+Subject: [PATCH] libiscsi introduce sessions API
+
+---
+ libiscsi/libiscsi.c | 125 ++++++++++++++++++++++++++++++++++++++++++++
+ libiscsi/libiscsi.h |  56 ++++++++++++++++++++
+ usr/iscsi_sysfs.c   |   6 +++
+ usr/iscsi_sysfs.h   |   2 +
+ 4 files changed, 189 insertions(+)
+
+diff --git a/libiscsi/libiscsi.c b/libiscsi/libiscsi.c
+index 064e4b5..755c18c 100644
+--- a/libiscsi/libiscsi.c
+++ b/libiscsi/libiscsi.c
+@@ -3,6 +3,7 @@
+  *
+  * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
+  * Copyright (C) 2008-2009 Hans de Goede <hdegoede@redhat.com>
+ * Copyright (C) 2015      Peter Hatina <phatina@redhat.com>
+  * maintained by open-iscsi@googlegroups.com
+  *
+  * This program is free software; you can redistribute it and/or modify
+@@ -469,6 +470,130 @@ leave:
+ 	return rc;
+ }
+ 
+struct libiscsi_session_array {
+	int cnt;
+	int size;
+	struct libiscsi_session_info *data;
+};
+
+static void libiscsi_session_array_init(struct libiscsi_session_array *arr)
+{
+	arr->cnt = 0;
+	arr->size = 0;
+	arr->data = NULL;
+}
+
+static int libiscsi_session_array_grow(struct libiscsi_session_array *arr)
+{
+	if (arr->size == 0)
+		arr->size = 4;
+	else
+		arr->size *= 2;
+
+	arr->data = (struct libiscsi_session_info *) realloc(
+		arr->data,
+		arr->size * sizeof(struct libiscsi_session_info));
+
+	return arr->data ? 0 : 1;
+}
+
+static int libiscsi_session_array_grow_ondemand(struct libiscsi_session_array *arr)
+{
+	if (arr->size == arr->cnt)
+		return libiscsi_session_array_grow(arr);
+	return 0;
+}
+
+static int libiscsi_session_array_resize_precize(struct libiscsi_session_array *arr)
+{
+	arr->data = (struct libiscsi_session_info *) realloc(
+		arr->data,
+		arr->cnt * sizeof(struct libiscsi_session_info));
+	arr->size = arr->cnt;
+
+	return arr->data ? 0 : 1;
+}
+
+static void copy_session_info_to_libiscsi_session_info(
+	struct libiscsi_session_info *info,
+	struct session_info *s_info)
+{
+	/* Copy session info to public struct. */
+	info->sid = s_info->sid;
+	/* Timeouts */
+	memcpy(&info->tmo, &s_info->tmo, sizeof(struct libiscsi_session_timeout));
+	/* CHAP authentication information */
+	memcpy(&info->chap, &s_info->chap, sizeof(struct libiscsi_chap_auth_info));
+	/* Target information */
+	strncpy(info->targetname, s_info->targetname, LIBISCSI_VALUE_MAXLEN);
+	strncpy(info->address, s_info->address, NI_MAXHOST);
+	strncpy(info->persistent_address, s_info->persistent_address, NI_MAXHOST);
+	info->tpgt = s_info->tpgt;
+	info->persistent_port = s_info->persistent_port;
+}
+
+static int get_sessions_helper(void *data, struct session_info *s_info)
+{
+	struct libiscsi_session_array *arr = (struct libiscsi_session_array *) data;
+
+	if (libiscsi_session_array_grow_ondemand(arr) != 0)
+		return 1;
+
+	copy_session_info_to_libiscsi_session_info(&arr->data[arr->cnt++], s_info);
+
+	return 0;
+}
+
+int libiscsi_get_session_infos(struct libiscsi_context *context,
+	struct libiscsi_session_info **infos,
+	int *nr_sessions)
+{
+	int rc = 0;
+	int nr_found = 0;
+	struct libiscsi_session_array arr;
+
+	if (!context || !infos || !nr_sessions)
+		return 1;
+
+	libiscsi_session_array_init(&arr);
+
+	rc = iscsi_sysfs_for_each_session((void *) &arr, &nr_found,
+		get_sessions_helper, 0);
+	if (rc != 0 || nr_found == 0) {
+		strcpy(context->error_str, "No matching session");
+		return ENODEV;
+	}
+
+	if (libiscsi_session_array_resize_precize(&arr) != 0) {
+		strcpy(context->error_str, "Can't allocate memory for session infos");
+		return ENOMEM;
+	}
+
+	*infos = arr.data;
+	*nr_sessions = nr_found;
+
+	return 0;
+}
+
+int libiscsi_get_session_info_by_id(struct libiscsi_context *context,
+	struct libiscsi_session_info *info,
+	const char *session)
+{
+	struct session_info s_info;
+
+	if (!context || !info || !session)
+		return 1;
+
+	if (iscsi_sysfs_get_sessioninfo_by_id(&s_info, (char*) session) != 0) {
+		strcpy(context->error_str, "No matching session");
+		return ENODEV;
+	}
+
+	copy_session_info_to_libiscsi_session_info(info, &s_info);
+
+	return 0;
+}
+
+ int libiscsi_node_set_parameter(struct libiscsi_context *context,
+ 	const struct libiscsi_node *node,
+ 	const char *parameter, const char *value)
+diff --git a/libiscsi/libiscsi.h b/libiscsi/libiscsi.h
+index 756590e..a9891f4 100644
+--- a/libiscsi/libiscsi.h
+++ b/libiscsi/libiscsi.h
+@@ -3,6 +3,7 @@
+  *
+  * Copyright (C) 2008-2009 Red Hat, Inc. All rights reserved.
+  * Copyright (C) 2008-2009 Hans de Goede <hdegoede@redhat.com>
+ * Copyright (C) 2015      Peter Hatina <phatina@redhat.com>
+  * maintained by open-iscsi@googlegroups.com
+  *
+  * This program is free software; you can redistribute it and/or modify
+@@ -56,6 +57,17 @@ enum libiscsi_auth_t {
+  */
+ struct libiscsi_context;
+ 
+/** \brief iSCSI session timeouts
+ *
+ * Struct holding session timeouts.
+ */
+struct libiscsi_session_timeout {
+    int abort_tmo;
+    int lu_reset_tmo;
+    int recovery_tmo;
+    int tgt_reset_tmo;
+};
+
+ /** \brief iSCSI node record
+  *
+  * Struct holding data uniquely identifying an iSCSI node.
+@@ -84,6 +96,24 @@ struct libiscsi_chap_auth_info {
+     char reverse_password[LIBISCSI_VALUE_MAXLEN] /** Reverse Password */;
+ };
+ 
+/** \brief iSCSI session
+ *
+ * Struct hoding iSCSI session information.
+ */
+struct libiscsi_session_info {
+    int sid;
+
+    struct libiscsi_session_timeout tmo;
+    struct libiscsi_chap_auth_info chap;
+
+    char targetname[LIBISCSI_VALUE_MAXLEN];
+    int tpgt;
+    char address[NI_MAXHOST];
+    int port;
+    char persistent_address[NI_MAXHOST];
+    int persistent_port;
+};
+
+ /** \brief generic libiscsi authentication information struct
+  *
+  * Struct holding authentication information for discovery and login.
+@@ -248,6 +278,32 @@ PUBLIC int libiscsi_node_login(struct libiscsi_context *context,
+ PUBLIC int libiscsi_node_logout(struct libiscsi_context *context,
+     const struct libiscsi_node *node);
+ 
+/** \brief Get an array of iSCSI sessions.
+ *
+ * Get the array containing iSCSI sessions' information.
+ *
+ * \param context       libiscsi context to operate on.
+ * \param infos         Array of iSCSI sessions' information.
+ *                      Release with free().
+ * \param nr_sessions   The number of elements in \e infos.
+ * \return              0 on success, otherwise a standard error code
+ *                      (from errno.h).
+ */
+PUBLIC int libiscsi_get_session_infos(struct libiscsi_context *context,
+    struct libiscsi_session_info **infos, int *nr_sessions);
+
+/** \brief Get session information by session ID.
+ *
+ * \param context       libiscsi context to operate on.
+ * \param info          iSCSI session information.
+ * \param session       Session name.
+ * \return              0 on success, otherwise a standard error code
+ *                      (from errno.h)
+ */
+PUBLIC int libiscsi_get_session_info_by_id(struct libiscsi_context *context,
+    struct libiscsi_session_info *info,
+    const char *session);
+
+ /** \brief Set an iSCSI parameter for the given node
+  *
+  * Set the given nodes iSCSI parameter named by \e parameter to value \e value.
+diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
+index 418f51b..6febba2 100644
+--- a/usr/iscsi_sysfs.c
+++ b/usr/iscsi_sysfs.c
+@@ -3,6 +3,7 @@
+  *
+  * Copyright (C) 2006 Mike Christie
+  * Copyright (C) 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2015      Peter Hatina <phatina@redhat.com>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published
+@@ -1151,6 +1152,11 @@ free_info:
+ 	return rc;
+ }
+ 
+const char *iscsi_sysfs_get_session_path(void)
+{
+	return ISCSI_SESSION_DIR;
+}
+
+ int iscsi_sysfs_for_each_iface_on_host(void *data, uint32_t host_no,
+ 				       int *nr_found,
+ 				       iscsi_sysfs_iface_op_fn *fn)
+diff --git a/usr/iscsi_sysfs.h b/usr/iscsi_sysfs.h
+index 1d0377f..909db34 100644
+--- a/usr/iscsi_sysfs.h
+++ b/usr/iscsi_sysfs.h
+@@ -3,6 +3,7 @@
+  *
+  * Copyright (C) 2006 Mike Christie
+  * Copyright (C) 2006 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2015      Peter Hatina <phatina@redhat.com>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published
+@@ -47,6 +48,7 @@ typedef int (iscsi_sysfs_flashnode_op_fn)(void *, struct flashnode_rec *,
+ 					  uint32_t, uint32_t);
+ typedef int (iscsi_sysfs_iface_op_fn)(void *, struct iface_rec *);
+ 
+extern const char *iscsi_sysfs_get_session_path(void);
+ extern int iscsi_sysfs_for_each_iface_on_host(void *data, uint32_t host_no,
+ 					      int *nr_found,
+ 					      iscsi_sysfs_iface_op_fn *fn);
+-- 
+2.21.0
+
--- a/0011-libiscsi-fix-discovery-request-timeout-regression.patch
+++ b/0011-libiscsi-fix-discovery-request-timeout-regression.patch
@ -0,0 +1,32 @@
+From 2e660a78632545e98f7c9e2ffb8518512c0db5ff Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 28 Feb 2017 09:00:41 -0800
+Subject: [PATCH] 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 755c18c..bb17dfc 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.21.0
+
--- a/0012-libiscsi-format-security-build-errors.patch
+++ b/0012-libiscsi-format-security-build-errors.patch
@ -0,0 +1,35 @@
+From 3040b7530eda1ab5625d76783dc7b8cf595a0ef0 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 28 Feb 2017 10:06:42 -0800
+Subject: [PATCH] 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 bb17dfc..7003388 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.21.0
+
--- a/0013-libiscsi-fix-build-to-use-libopeniscsiusr.patch
+++ b/0013-libiscsi-fix-build-to-use-libopeniscsiusr.patch
@ -0,0 +1,36 @@
+From 123fc55dd8ad98c9afd39bf0824b3d31d5e93214 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 24 May 2018 15:17:05 -0700
+Subject: [PATCH] libiscsi fix build to use libopeniscsiusr
+
+---
+ libiscsi/Makefile | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libiscsi/Makefile b/libiscsi/Makefile
+index 53f9746..f2cf248 100644
+--- a/libiscsi/Makefile
+++ b/libiscsi/Makefile
+@@ -8,7 +8,9 @@ OSNAME=$(shell uname -s)
+ OPTFLAGS ?= -O2 -g
+ WARNFLAGS ?= -Wall -Wstrict-prototypes
+ CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \
+-		-D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden
+		-D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden \
+		-I../libopeniscsiusr
+LDFLAGS = -L../libopeniscsiusr -lopeniscsiusr
+ LIB = libiscsi.so.0
+ TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
+ TESTS += tests/test_login tests/test_logout tests/test_params
+@@ -23,7 +25,7 @@ FW_PARAM_SRCS = fw_entry.o prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_sys
+ # sources shared with the userspace utils, note we build these separately
+ # to get PIC versions.
+ COMMON_OBJS = $(patsubst %.o, common-objs/%.o, $(COMMON_SRCS))
+-USR_OBJS = $(patsubst %.o, usr-objs/%.o, $(ISCSI_LIB_SRCS) strings.o)
+USR_OBJS = $(patsubst %.o, usr-objs/%.o, $(ISCSI_LIB_SRCS) local_strings.o)
+ FW_OBJS = $(patsubst %.o, fw-objs/%.o, $(FW_PARAM_SRCS))
+ 
+ # Flags for the tests
+-- 
+2.21.0
+
--- a/0014-libiscsi-fix-build-against-latest-upstream-again.patch
+++ b/0014-libiscsi-fix-build-against-latest-upstream-again.patch
@ -0,0 +1,66 @@
+From 039700890e11dff3323241349d3858f258c09cc0 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Thu, 7 Nov 2019 09:16:17 -0800
+Subject: [PATCH] libiscsi: fix build against latest upstream, again
+
+---
+ libiscsi/Makefile   | 4 ++--
+ libiscsi/libiscsi.c | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libiscsi/Makefile b/libiscsi/Makefile
+index f2cf248..462d666 100644
+--- a/libiscsi/Makefile
+++ b/libiscsi/Makefile
+@@ -10,7 +10,7 @@ WARNFLAGS ?= -Wall -Wstrict-prototypes
+ CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \
+ 		-D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden \
+ 		-I../libopeniscsiusr
+-LDFLAGS = -L../libopeniscsiusr -lopeniscsiusr
+LDFLAGS = -L../libopeniscsiusr -lopeniscsiusr -lkmod -lcrypto
+ LIB = libiscsi.so.0
+ TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
+ TESTS += tests/test_login tests/test_logout tests/test_params
+@@ -19,7 +19,7 @@ TESTS += tests/test_set_auth tests/test_get_auth
+ 
+ COMMON_SRCS = sysdeps.o
+ # sources shared between iscsid, iscsiadm and iscsistart
+-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
+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
+ FW_PARAM_SRCS = fw_entry.o prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_sysfs.o
+ 
+ # sources shared with the userspace utils, note we build these separately
+diff --git a/libiscsi/libiscsi.c b/libiscsi/libiscsi.c
+index 7003388..c598aee 100644
+--- a/libiscsi/libiscsi.c
+++ b/libiscsi/libiscsi.c
+@@ -429,7 +429,7 @@ int libiscsi_node_login(struct libiscsi_context *context,
+ 
+ 	CHECK(idbm_for_each_iface(&nr_found, (void*)node->iface, login_helper,
+ 		(char *)node->name, node->tpgt,
+-		(char *)node->address, node->port))
+		(char *)node->address, node->port, false))
+ 	if (nr_found == 0) {
+ 		strcpy(context->error_str, "No such node");
+ 		rc = ENODEV;
+@@ -615,7 +615,7 @@ int libiscsi_node_set_parameter(struct libiscsi_context *context,
+ 
+ 	CHECK(idbm_for_each_iface(&nr_found, &params, idbm_node_set_param,
+ 		(char *)node->name, node->tpgt,
+-		(char *)node->address, node->port))
+		(char *)node->address, node->port, false))
+ 	if (nr_found == 0) {
+ 		strcpy(context->error_str, "No such node");
+ 		rc = ENODEV;
+@@ -677,7 +677,7 @@ int libiscsi_node_get_parameter(struct libiscsi_context *context,
+ 	   as most settings should be the same independent of the iface. */
+ 	CHECK(idbm_for_each_iface(&nr_found, context, get_parameter_helper,
+ 		(char *)node->name, node->tpgt,
+-		(char *)node->address, node->port))
+		(char *)node->address, node->port, false))
+ 	if (nr_found == 0) {
+ 		strcpy(context->error_str, "No such node");
+ 		rc = ENODEV;
+-- 
+2.21.0
+
--- a/0015-remove-the-offload-boot-supported-ifdef.patch
+++ b/0015-remove-the-offload-boot-supported-ifdef.patch
@ -0,0 +1,45 @@
+From d0689253c9e2eb78fc5296adb109aba4d35a13fd Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Mon, 19 Nov 2012 17:09:24 -0800
+Subject: [PATCH] remove the offload boot supported ifdef
+
+---
+ usr/iface.c | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/usr/iface.c b/usr/iface.c
+index 645b0b8..9cd07fd 100644
+--- a/usr/iface.c
+++ b/usr/iface.c
+@@ -993,6 +993,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
+ {
+ 	struct iscsi_transport *t = NULL;
+ 	uint32_t hostno;
+	int rc;
+ 
+ 	if (strlen(context->initiatorname))
+ 		strlcpy(iface->iname, context->initiatorname,
+@@ -1006,10 +1007,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
+ 			return 0;
+ 		}
+ 	} else if (strlen(context->iface)) {
+-/* this ifdef is only temp until distros and firmwares are updated */
+-#ifdef OFFLOAD_BOOT_SUPPORTED
+ 		char transport_name[ISCSI_TRANSPORT_NAME_MAXLEN];
+-		int rc;
+ 
+ 		memset(transport_name, 0, ISCSI_TRANSPORT_NAME_MAXLEN);
+ 		/* make sure offload driver is loaded */
+@@ -1035,9 +1033,6 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
+ 		}
+ 
+ 		strlcpy(iface->netdev, context->iface, sizeof(iface->netdev));
+-#else
+-		return 0;
+-#endif
+ 	} else
+ 		return 0;
+ 
+-- 
+2.21.0
+
--- a/0016-Revert-iscsiadm-return-error-when-login-fails.patch
+++ b/0016-Revert-iscsiadm-return-error-when-login-fails.patch
@ -0,0 +1,34 @@
+From ccb9d70a0dad7c42f926f1680ae708a5ae3d3696 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Mon, 24 Feb 2014 09:33:33 -0800
+Subject: [PATCH] Revert "iscsiadm: return error when login fails"
+
+This reverts commit fc2a8e9a2911bc76f961fe3e4a159fab9b8b9691.
+
+Done to address RHBZ #1015563
+---
+ usr/session_mgmt.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/usr/session_mgmt.c b/usr/session_mgmt.c
+index 0500f15..1e1f2bc 100644
+--- a/usr/session_mgmt.c
+++ b/usr/session_mgmt.c
+@@ -178,12 +178,12 @@ int iscsi_login_portal(void *data, struct list_head *list, struct node_rec *rec)
+ 		goto done;
+ 	}
+ 	if (session_count >= rec->session.nr_sessions) {
+-		log_warning("%s: %d session%s requested, but %d "
+		log_debug(1, "%s: %d session%s requested, but %d "
+ 			  "already present.",
+ 			  rec->iface.name, rec->session.nr_sessions,
+ 			  rec->session.nr_sessions == 1 ? "" : "s",
+ 			  session_count);
+-		rc = ISCSI_ERR_SESS_EXISTS;
+		rc = 0;
+ 		goto done;
+ 	}
+ 
+-- 
+2.21.0
+
--- a/0017-dont-install-scripts.patch
+++ b/0017-dont-install-scripts.patch
@ -0,0 +1,25 @@
+From f524e332835b2b59d3f3ff8a67814ef2d58a2857 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Fri, 25 May 2018 09:39:07 -0700
+Subject: [PATCH] dont install scripts
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 4ab091f..7e6b734 100644
+--- a/Makefile
+++ b/Makefile
+@@ -116,7 +116,7 @@ install_systemd:
+ 	$(INSTALL) -d $(DESTDIR)$(systemddir)
+ 	$(INSTALL) -m 644 $(SYSTEMDFILES) $(DESTDIR)/$(systemddir)
+ 
+-install_programs:  $(PROGRAMS) $(SCRIPTS)
+install_programs:  $(PROGRAMS) # $(SCRIPTS)
+ 	$(INSTALL) -d $(DESTDIR)$(sbindir)
+ 	$(INSTALL) -m 755 $^ $(DESTDIR)$(sbindir)
+ 
+-- 
+2.21.0
+
--- a/0018-use-var-lib-iscsi-in-libopeniscsiusr.patch
+++ b/0018-use-var-lib-iscsi-in-libopeniscsiusr.patch
@ -0,0 +1,109 @@
+From e2b8215b80cc037ecbcb9eef50e432c31d5e56eb Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Wed, 30 May 2018 16:08:30 -0700
+Subject: [PATCH] use /var/lib/iscsi in libopeniscsiusr
+
+---
+ libopeniscsiusr/idbm.h                                  | 3 ++-
+ libopeniscsiusr/iface.c                                 | 2 +-
+ libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h       | 8 ++++----
+ libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h | 2 +-
+ libopeniscsiusr/node.h                                  | 2 +-
+ 5 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h
+index 3fd0864..c84d332 100644
+--- a/libopeniscsiusr/idbm.h
+++ b/libopeniscsiusr/idbm.h
+@@ -31,7 +31,8 @@
+ #include "libopeniscsiusr/libopeniscsiusr_common.h"
+ 
+ #define ISCSI_CONFIG_ROOT	"/etc/iscsi/"
+-#define IFACE_CONFIG_DIR	ISCSI_CONFIG_ROOT"ifaces"
+#define ISCSI_VAR_LIB		"/var/lib/iscsi/"
+#define IFACE_CONFIG_DIR	ISCSI_VAR_LIB"ifaces"
+ #define AUTH_STR_MAX_LEN	256
+ #define BOOT_NAME_MAXLEN	256
+ #define IDBM_DUMP_SIZE		8192
+diff --git a/libopeniscsiusr/iface.c b/libopeniscsiusr/iface.c
+index e7938a5..99ab7b5 100644
+--- a/libopeniscsiusr/iface.c
+++ b/libopeniscsiusr/iface.c
+@@ -381,7 +381,7 @@ int iscsi_default_iface_setup(struct iscsi_context *ctx)
+ 
+ 	_good(_iscsi_hids_get(ctx, &hids, &hid_count), rc, out);
+ 	for (i = 0; i < hid_count; ++i) {
+-		/* Create /etc/iscsi/ifaces/<iface_name> file if not found
+		/* Create /var/lib/iscsi/ifaces/<iface_name> file if not found
+ 		 */
+ 		_good(_iscsi_ifaces_get_from_sysfs(ctx, hids[i], &ifaces, &iface_count),
+ 			rc, out);
+diff --git a/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h b/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h
+index 4395902..81582da 100644
+--- a/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h
+++ b/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h
+@@ -339,7 +339,7 @@ __DLL_EXPORT void iscsi_session_free(struct iscsi_session *se);
+  *	* bnx2i
+  *
+  * It will also create configuration files for iSCSI hardware offload cards in
+- * /etc/iscsi/ifaces/<iface_name>.
+ * /var/lib/iscsi/ifaces/<iface_name>.
+  *
+  * @ctx:
+  *	Pointer of 'struct iscsi_context'.
+@@ -369,7 +369,7 @@ __DLL_EXPORT int iscsi_default_iface_setup(struct iscsi_context *ctx);
+  * Retrieves all iSCSI interfaces. For the properties of 'struct iscsi_iface',
+  * please refer to the functions defined in 'libopeniscsiusr_iface.h' file.
+  * The returned results contains default iSCSI interfaces(iser and iscsi_tcp)
+- * and iSCSI interfaces configured in "/etc/iscsi/ifaces/".
+ * and iSCSI interfaces configured in "/var/lib/iscsi/ifaces/".
+  * Illegal configuration file will be skipped and warned.
+  * To generate iSCSI interface configuration when new card installed, please
+  * use iscsi_default_iface_setup().
+@@ -427,7 +427,7 @@ __DLL_EXPORT void iscsi_ifaces_free(struct iscsi_iface **ifaces,
+  * iscsi_iface_get() - Retrieve specified iSCSI interface.
+  *
+  * Retrieves specified iSCSI interfaces by reading configuration from
+- * "/etc/iscsi/iface/<iface_name>".
+ * "/var/lib/iscsi/iface/<iface_name>".
+  * To generate iSCSI interface configuration when new card installed, please
+  * use iscsi_default_iface_setup().
+  * Illegal configuration file will be treated as error LIBISCSI_ERR_IDBM.
+@@ -438,7 +438,7 @@ __DLL_EXPORT void iscsi_ifaces_free(struct iscsi_iface **ifaces,
+  *	If this pointer is NULL, your program will be terminated by assert.
+  * @iface_name:
+  *	String. Name of iSCSI interface. Also the file name of configuration
+- *	file "/etc/iscsi/iface/<iface_name>".
+ *	file "/var/lib/iscsi/iface/<iface_name>".
+  *	If this pointer is NULL or empty string, your program will be terminated
+  *	by assert.
+  * @iface:
+diff --git a/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h b/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h
+index a1a2552..95b0160 100644
+--- a/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h
+++ b/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h
+@@ -182,7 +182,7 @@ __DLL_EXPORT const char *iscsi_iface_name_get(struct iscsi_iface *iface);
+  *
+  * Dump all configurations of specified iSCSI interface. Will skip empty
+  * configuration so that output string could be saved directly to
+- * /etc/iscsi/ifaces/<iface_name> file.
+ * /var/lib/iscsi/ifaces/<iface_name> file.
+  *
+  * @iface:
+  *	Pointer of 'struct iscsi_iface'.
+diff --git a/libopeniscsiusr/node.h b/libopeniscsiusr/node.h
+index 39e07b3..9eba7fa 100644
+--- a/libopeniscsiusr/node.h
+++ b/libopeniscsiusr/node.h
+@@ -44,7 +44,7 @@ struct iscsi_node {
+ 	char					portal[NI_MAXHOST * 2];
+ };
+ 
+-#define NODE_CONFIG_DIR		ISCSI_CONFIG_ROOT"nodes"
+#define NODE_CONFIG_DIR		ISCSI_VAR_LIB"nodes"
+ 
+ /* Might be public in the future */
+ __DLL_LOCAL void iscsi_node_free(struct iscsi_node *node);
+-- 
+2.21.0
+
--- a/0019-Coverity-scan-fixes.patch
+++ b/0019-Coverity-scan-fixes.patch
@ -0,0 +1,100 @@
+From ad8c3353b8e482575ff2208182290cf35b624dde Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Wed, 5 Jun 2019 09:08:39 -0700
+Subject: [PATCH 1/1] Coverity scan fixes
+
+---
+ iscsiuio/src/unix/libs/qedi.c |  2 +-
+ iscsiuio/src/unix/main.c      |  3 +++
+ libopeniscsiusr/idbm.c        | 11 +++++------
+ usr/idbm.c                    | 10 ++++------
+ usr/iscsid.c                  |  2 +-
+ 5 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c
+index 3414cb5..a359700 100644
+--- a/iscsiuio/src/unix/libs/qedi.c
+++ b/iscsiuio/src/unix/libs/qedi.c
+@@ -1023,7 +1023,7 @@ static int qedi_read(nic_t *nic, packet_t *pkt)
+ 
+ 	LOG_DEBUG(PFX "%s:hw_prod %d bd_prod %d, rx_pkt_idx %d, rxlen %d",
+ 		  nic->log_name, hw_prod, bd_prod, rx_bd->rx_pkt_index, len);
+-	LOG_DEBUG(PFX "%s: sw_con %d bd_cons %d num BD %d",
+	LOG_DEBUG(PFX "%s: sw_con %d bd_cons %d num BD %lu",
+ 		  nic->log_name, sw_cons, bd_cons, QEDI_NUM_RX_BD);
+ 
+ 	if (bd_cons != bd_prod) {
+diff --git a/iscsiuio/src/unix/main.c b/iscsiuio/src/unix/main.c
+index 0c9ad49..f83f305 100644
+--- a/iscsiuio/src/unix/main.c
+++ b/iscsiuio/src/unix/main.c
+@@ -391,6 +391,9 @@ int main(int argc, char *argv[])
+ 	sigaddset(&set, SIGTERM);
+ 	sigaddset(&set, SIGUSR1);
+ 	rc = pthread_sigmask(SIG_SETMASK, &set, NULL);
+	if (rc != 0) {
+		LOG_ERR("Failed to set thread signal mask");
+	}
+ 
+ 	/*  Spin off the signal handling thread */
+ 	pthread_attr_init(&attr);
+diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c
+index 7bc2381..7d4c338 100644
+--- a/libopeniscsiusr/idbm.c
+++ b/libopeniscsiusr/idbm.c
+@@ -321,12 +321,11 @@ int _idbm_lock(struct iscsi_context *ctx)
+ 		return 0;
+ 	}
+ 
+-	if (access(LOCK_DIR, F_OK) != 0) {
+-		if (mkdir(LOCK_DIR, 0660) != 0) {
+-			_error(ctx, "Could not open %s: %d %s", LOCK_DIR, errno,
+-				_strerror(errno, strerr_buff));
+-			return LIBISCSI_ERR_IDBM;
+-		}
+	if (((mkdir(LOCK_DIR, 0660) != 0) && (errno != EEXIST)) ||
+	    (access(LOCK_DIR, F_OK) != 0)) {
+		_error(ctx, "Could not open %s: %d %s", LOCK_DIR, errno,
+			_strerror(errno, strerr_buff));
+		return LIBISCSI_ERR_IDBM;
+ 	}
+ 
+ 	fd = open(LOCK_FILE, O_RDWR | O_CREAT, 0666);
+diff --git a/usr/idbm.c b/usr/idbm.c
+index d5e16cb..a210c88 100644
+--- a/usr/idbm.c
+++ b/usr/idbm.c
+@@ -1438,12 +1438,10 @@ int idbm_lock(void)
+ 		return 0;
+ 	}
+ 
+-	if (access(LOCK_DIR, F_OK) != 0) {
+-		if (mkdir(LOCK_DIR, 0660) != 0) {
+-			log_error("Could not open %s: %s", LOCK_DIR,
+-				  strerror(errno));
+-			return ISCSI_ERR_IDBM;
+-		}
+	if (((mkdir(LOCK_DIR, 0660) != 0) && (errno != EEXIST)) ||
+	    (access(LOCK_DIR, F_OK) != 0)) {
+		log_error("Could not open %s: %s", LOCK_DIR, strerror(errno));
+		return ISCSI_ERR_IDBM;
+ 	}
+ 
+ 	fd = open(LOCK_FILE, O_RDWR | O_CREAT, 0666);
+diff --git a/usr/iscsid.c b/usr/iscsid.c
+index 99d27ab..dbb0900 100644
+--- a/usr/iscsid.c
+++ b/usr/iscsid.c
+@@ -490,8 +490,8 @@ int main(int argc, char *argv[])
+ 				log_close(log_pid);
+ 				exit(ISCSI_ERR);
+ 			}
+			close(fd);
+ 		}
+-		close(fd);
+ 
+ 		if ((control_fd = ipc->ctldev_open()) < 0) {
+ 			log_close(log_pid);
+-- 
+2.21.1
+
--- a/0020-fix-upstream-build-breakage-of-iscsiuio-LDFLAGS.patch
+++ b/0020-fix-upstream-build-breakage-of-iscsiuio-LDFLAGS.patch
@ -0,0 +1,29 @@
+From 4142125fa296d21a307fb2370b2d4d7e8487f22c Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Wed, 16 Oct 2019 23:17:20 -0700
+Subject: [PATCH] fix upstream build breakage of iscsiuio LDFLAGS
+
+---
+ iscsiuio/configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
+index b41df0e..a856cc5 100644
+--- a/iscsiuio/configure.ac
+++ b/iscsiuio/configure.ac
+@@ -67,10 +67,10 @@ AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
+ AC_ARG_WITH([systemd],
+ 	    AS_HELP_STRING([--without-systemd], [Build without systemd]),
+     [case "${withval}" in
+-     yes) LDFLAGS="`pkg-config --libs libsystemd`" ;;
+     yes) LDFLAGS="${LDFLAGS} `pkg-config --libs libsystemd`" ;;
+      no)  CFLAGS="${CFLAGS} -DNO_SYSTEMD" ;;
+      *)   AC_MSG_ERROR([bad value $withval for --with-systemd]) ;;
+-     esac],[LDFLAGS="`pkg-config --libs libsystemd`"])
+     esac],[LDFLAGS="${LDFLAGS} `pkg-config --libs libsystemd`"])
+ 
+ AC_CONFIG_COMMANDS([default],[[
+     if [ -n "$SOURCE_DATE_EPOCH" ] ; then
+-- 
+2.21.0
+
--- a/0021-improve-systemd-service-files-for-boot-session-handl.patch
+++ b/0021-improve-systemd-service-files-for-boot-session-handl.patch
@ -0,0 +1,130 @@
+From 77150edd697669467ff9f8775b93bd9d7a34cadf Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Mon, 28 Oct 2019 10:20:56 -0700
+Subject: [PATCH] improve systemd service files for boot session handling
+
+---
+ etc/systemd/iscsi-mark-root-nodes  |  6 +++++-
+ etc/systemd/iscsi-onboot.service   | 15 +++++++++++++++
+ etc/systemd/iscsi-shutdown.service |  1 +
+ etc/systemd/iscsi.service          | 11 ++++-------
+ etc/systemd/iscsid.service         |  4 +---
+ etc/systemd/iscsiuio.service       |  1 -
+ 6 files changed, 26 insertions(+), 12 deletions(-)
+ create mode 100644 etc/systemd/iscsi-onboot.service
+
+diff --git a/etc/systemd/iscsi-mark-root-nodes b/etc/systemd/iscsi-mark-root-nodes
+index c693707..9d48805 100755
+--- a/etc/systemd/iscsi-mark-root-nodes
+++ b/etc/systemd/iscsi-mark-root-nodes
+@@ -9,7 +9,11 @@ while read t num p target flash; do
+   portal=${p%,*}
+   transport=${t%:}
+ 
+-  $ISCSIADM -m node -p $portal -T $target -o update -n node.startup -v onboot
+  # use session number to find the iface name in use
+  num=${num#[}; num=${num%]}
+  iface=$(iscsiadm -m session -r $num | grep iface.iscsi_ifacename | cut -d= -f2)
+
+  $ISCSIADM -m node -p $portal -T $target -I $iface -o update -n node.startup -v onboot
+ 
+   start_iscsid=1
+ 
+diff --git a/etc/systemd/iscsi-onboot.service b/etc/systemd/iscsi-onboot.service
+new file mode 100644
+index 0000000..42ced68
+--- /dev/null
+++ b/etc/systemd/iscsi-onboot.service
+@@ -0,0 +1,15 @@
+[Unit]
+Description=Special handling of early boot iSCSI sessions
+Documentation=man:iscsiadm(8) man:iscsid(8)
+DefaultDependencies=no
+RefuseManualStart=true
+Before=iscsi.service
+After=systemd-remount-fs.service
+ConditionDirectoryNotEmpty=/sys/class/iscsi_session
+
+[Service]
+Type=oneshot
+ExecStart=-/usr/libexec/iscsi-mark-root-nodes
+
+[Install]
+WantedBy=sysinit.target
+diff --git a/etc/systemd/iscsi-shutdown.service b/etc/systemd/iscsi-shutdown.service
+index 69c1c77..caee933 100644
+--- a/etc/systemd/iscsi-shutdown.service
+++ b/etc/systemd/iscsi-shutdown.service
+@@ -11,4 +11,5 @@ RefuseManualStop=yes
+ [Service]
+ Type=oneshot
+ RemainAfterExit=true
+ExecStart=-/usr/bin/true
+ ExecStop=-/usr/sbin/iscsiadm -m node --logoutall=all
+diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
+index eadfcec..175cb2c 100644
+--- a/etc/systemd/iscsi.service
+++ b/etc/systemd/iscsi.service
+@@ -1,21 +1,18 @@
+ [Unit]
+ Description=Login and scanning of iSCSI devices
+-Documentation=man:iscsid(8) man:iscsiadm(8)
+Documentation=man:iscsiadm(8) man:iscsid(8)
+ DefaultDependencies=no
+-Conflicts=shutdown.target
+-After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
+ Before=remote-fs-pre.target
+After=network.target network-online.target iscsid.service iscsiuio.service systemd-remount-fs.service
+ Wants=remote-fs-pre.target iscsi-shutdown.service
+-ConditionDirectoryNotEmpty=|/var/lib/iscsi/nodes
+-ConditionDirectoryNotEmpty=|/sys/class/iscsi_session
+ConditionDirectoryNotEmpty=/var/lib/iscsi/nodes
+ 
+ [Service]
+ Type=oneshot
+ RemainAfterExit=true
+-ExecStart=-/usr/libexec/iscsi-mark-root-nodes
+ ExecStart=-/usr/sbin/iscsiadm -m node --loginall=automatic
+ ExecReload=-/usr/sbin/iscsiadm -m node --loginall=automatic
+ SuccessExitStatus=21
+ 
+ [Install]
+-WantedBy=sysinit.target
+WantedBy=remote-fs.target
+diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
+index 8d50cf0..28402fb 100644
+--- a/etc/systemd/iscsid.service
+++ b/etc/systemd/iscsid.service
+@@ -1,8 +1,7 @@
+ [Unit]
+ Description=Open-iSCSI
+-Documentation=man:iscsid(8) man:iscsiadm(8)
+Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
+ DefaultDependencies=no
+-Conflicts=shutdown.target
+ After=network.target iscsiuio.service
+ Before=remote-fs-pre.target
+ 
+@@ -10,7 +9,6 @@ Before=remote-fs-pre.target
+ Type=notify
+ NotifyAccess=main
+ ExecStart=/usr/sbin/iscsid -f
+-ExecStop=/usr/sbin/iscsiadm -k 0 2
+ KillMode=mixed
+ Restart=on-failure
+ 
+diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service
+index 8620cde..fc0be93 100644
+--- a/etc/systemd/iscsiuio.service
+++ b/etc/systemd/iscsiuio.service
+@@ -2,7 +2,6 @@
+ Description=iSCSI UserSpace I/O driver
+ Documentation=man:iscsiuio(8)
+ DefaultDependencies=no
+-Conflicts=shutdown.target
+ Requires=iscsid.service
+ BindTo=iscsid.service
+ After=network.target
+-- 
+2.21.0
+
--- a/0021-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
+++ b/0021-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
@ -0,0 +1,25 @@
+From 58d24c239b9b6f762231ff3eedbc685971ce0a98 Mon Sep 17 00:00:00 2001
+From: Chris Leech <cleech@redhat.com>
+Date: Mon, 21 Jan 2013 15:43:36 -0800
+Subject: [PATCH 1/1] use Red Hat version string to match RPM package version
+
+---
+ usr/version.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usr/version.h b/usr/version.h
+index 4fa9179..c5c9e76 100644
+--- a/usr/version.h
+++ b/usr/version.h
+@@ -6,7 +6,7 @@
+  * This may not be the same value as the kernel versions because
+  * some other maintainer could merge a patch without going through us
+  */
+-#define ISCSI_VERSION_STR	"2.1.2"
+#define ISCSI_VERSION_STR	"6.2.1.1-0"
+ #define ISCSI_VERSION_FILE	"/sys/module/scsi_transport_iscsi/version"
+ 
+ #endif
+-- 
+2.21.1
+
--- a/0022-iscsi_if.h-replace-zero-length-array-with-flexible-a.patch
+++ b/0022-iscsi_if.h-replace-zero-length-array-with-flexible-a.patch
@ -0,0 +1,44 @@
+From a37c8753f277c156bcd4b3e7596931e3de2e67d7 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 11 Aug 2020 21:00:29 +0200
+Subject: [PATCH] iscsi_if.h replace zero-length array with flexible-array
+ member
+
+---
+ include/iscsi_if.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/iscsi_if.h b/include/iscsi_if.h
+index 5a1c614..e8cee0d 100644
+--- a/include/iscsi_if.h
+++ b/include/iscsi_if.h
+@@ -337,7 +337,7 @@ enum iscsi_param_type {
+ struct iscsi_param_info {
+ 	uint32_t len;		/* Actual length of the param value */
+ 	uint16_t param;		/* iscsi param */
+-	uint8_t value[0];	/* length sized value follows */
+	uint8_t value[];	/* length sized value follows */
+ } __attribute__((__packed__));
+ 
+ struct iscsi_iface_param_info {
+@@ -346,7 +346,7 @@ struct iscsi_iface_param_info {
+ 	uint16_t param;		/* iscsi param value */
+ 	uint8_t iface_type;	/* IPv4 or IPv6 */
+ 	uint8_t param_type;	/* iscsi_param_type */
+-	uint8_t value[0];	/* length sized value follows */
+	uint8_t value[];	/* length sized value follows */
+ } __attribute__((__packed__));
+ 
+ /*
+@@ -723,7 +723,7 @@ enum iscsi_flashnode_param {
+ struct iscsi_flashnode_param_info {
+ 	uint32_t len;		/* Actual length of the param */
+ 	uint16_t param;		/* iscsi param value */
+-	uint8_t value[0];	/* length sized value follows */
+	uint8_t value[];	/* length sized value follows */
+ } __attribute__((__packed__));
+ 
+ enum iscsi_discovery_parent_type {
+-- 
+2.26.2
+
--- a/7
+++ b/7
@ -0,0 +1,7 @@
+#!/bin/sh
+
+case "$2" in
+	up|vpn-up)
+		/bin/systemctl --no-block reload iscsi.service || :
+		;;
+esac
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@ -0,0 +1,622 @@
+%global open_iscsi_version	2.1
+%global open_iscsi_build	2
+%global commit0			13e7f58a1658636202994e3298237edefb985919
+%global shortcommit0		%(c=%{commit0}; echo ${c:0:7})
+
+# Disable python2 build by default
+%bcond_with python2
+
+Summary: iSCSI daemon and utility programs
+Name: iscsi-initiator-utils
+Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
+Release: 1.git%{shortcommit0}%{?dist}
+License: GPLv2+
+URL: http://www.open-iscsi.org
+Source0: https://github.com/open-iscsi/open-iscsi/archive/%{commit0}.tar.gz#/open-iscsi-%{shortcommit0}.tar.gz
+Source4: 04-iscsi
+Source5: iscsi-tmpfiles.conf
+
+Patch0001: 0001-unit-file-tweaks.patch
+Patch0002: 0002-idmb_rec_write-check-for-tpgt-first.patch
+Patch0003: 0003-idbm_rec_write-seperate-old-and-new-style-writes.patch
+Patch0004: 0004-idbw_rec_write-pick-tpgt-from-existing-record.patch
+Patch0005: 0005-update-initscripts-and-docs.patch
+Patch0006: 0006-use-var-for-config.patch
+Patch0007: 0007-use-red-hat-for-name.patch
+Patch0008: 0008-libiscsi.patch
+Patch0009: 0009-Add-macros-to-release-GIL-lock.patch
+Patch0010: 0010-libiscsi-introduce-sessions-API.patch
+Patch0011: 0011-libiscsi-fix-discovery-request-timeout-regression.patch
+Patch0012: 0012-libiscsi-format-security-build-errors.patch
+Patch0013: 0013-libiscsi-fix-build-to-use-libopeniscsiusr.patch
+Patch0014: 0014-libiscsi-fix-build-against-latest-upstream-again.patch
+Patch0015: 0015-remove-the-offload-boot-supported-ifdef.patch
+Patch0016: 0016-Revert-iscsiadm-return-error-when-login-fails.patch
+Patch0017: 0017-dont-install-scripts.patch
+Patch0018: 0018-use-var-lib-iscsi-in-libopeniscsiusr.patch
+Patch0019: 0019-Coverity-scan-fixes.patch
+Patch0020: 0020-fix-upstream-build-breakage-of-iscsiuio-LDFLAGS.patch
+Patch0021: 0021-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
+Patch0022: 0022-iscsi_if.h-replace-zero-length-array-with-flexible-a.patch
+Patch0023: 0001-stop-using-Werror-for-now.patch
+
+BuildRequires: flex bison doxygen kmod-devel systemd-units
+BuildRequires: autoconf automake libtool libmount-devel openssl-devel
+BuildRequires: isns-utils-devel
+BuildRequires: systemd-devel
+Requires: %{name}-iscsiuio >= %{version}-%{release}
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+
+# Old NetworkManager expects the dispatcher scripts in a different place
+Conflicts: NetworkManager < 1.20
+
+%global _hardened_build 1
+%global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{python3_sitearch}/.*\\.so)$
+
+%description
+The iscsi package provides the server daemon for the iSCSI protocol,
+as well as the utility programs used to manage it. iSCSI is a protocol
+for distributed disk access using SCSI commands sent over Internet
+Protocol networks.
+
+# I don't think we're ready to expose these just yet
+# For now just add the needed library to the base package
+
+#%%package -n libopeniscsiusr
+#Summary: library providing access to Open-iSCSI initiator functionality
+#Group: Development/Libraries
+#License: BSD
+
+#%%description -n libopeniscsiusr
+#The libopeniscsiusr library provides a C API for access to the Open-iSCSI
+#initiator. It is used by the Open-iSCSI command line tools.
+
+#%%package -n libopeniscsiusr-devel
+#Summary: Development files for libopeniscsiusr
+#Group: Development/Libraries
+#Requires: libopeniscsiusr = %%{version}-%%{release}
+
+#%%description -n libopeniscsiusr-devel
+#The libopeniscsiusr-devel package contains libraries and header files for
+#developing applications that use libopeniscsiusr.
+
+%package iscsiuio
+Summary: Userspace configuration daemon required for some iSCSI hardware
+License: BSD
+Requires: %{name} = %{version}-%{release}
+
+%description iscsiuio
+The iscsiuio configuration daemon provides network configuration help
+for some iSCSI offload hardware.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%if %{with python2}
+%package -n python2-%{name}
+%{?python_provide:%python_provide python2-%{name}}
+Summary: Python %{python2_version} bindings to %{name}
+Requires: %{name} = %{version}-%{release}
+BuildRequires: python2-devel
+BuildRequires: python2-setuptools
+
+%description -n python2-%{name}
+The %{name}-python2 package contains Python %{python2_version} bindings to the
+libiscsi interface for interacting with %{name}
+%endif
+# ended with python2
+
+%package -n python3-%{name}
+%{?python_provide:%python_provide python3-%{name}}
+Summary: Python %{python3_version} bindings to %{name}
+Requires: %{name} = %{version}-%{release}
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+
+%description -n python3-%{name}
+The %{name}-python3 package contains Python %{python3_version} bindings to the
+libiscsi interface for interacting with %{name}
+
+%prep
+%autosetup -p1 -n open-iscsi-%{commit0}
+
+# change exec_prefix, there's no easy way to override
+%{__sed} -i -e 's|^exec_prefix = /$|exec_prefix = %{_exec_prefix}|' Makefile
+
+%build
+# avoid undefined references linking failures
+%undefine _ld_as_needed
+
+# configure sub-packages from here
+# letting the top level Makefile do it will lose setting from rpm
+cd iscsiuio
+autoreconf --install
+%{configure}
+cd ..
+
+%{__make} OPTFLAGS="%{optflags} %{?__global_ldflags}"
+pushd libiscsi
+%if %{with python2}
+%py2_build
+%endif
+# ended with python2
+%py3_build
+touch -r libiscsi.doxy html/*
+popd
+
+
+%install
+%{__make} DESTDIR=%{?buildroot} install_programs install_doc install_etc install_libopeniscsiusr
+# upstream makefile doesn't get everything the way we like it
+#rm $RPM_BUILD_ROOT%%{_sbindir}/iscsi_discovery
+rm $RPM_BUILD_ROOT%{_mandir}/man8/iscsi_discovery.8
+rm $RPM_BUILD_ROOT%{_mandir}/man8/iscsi_fw_login.8
+%{__install} -pm 755 usr/iscsistart $RPM_BUILD_ROOT%{_sbindir}
+%{__install} -pm 644 doc/iscsistart.8 $RPM_BUILD_ROOT%{_mandir}/man8
+%{__install} -pm 644 doc/iscsi-iname.8 $RPM_BUILD_ROOT%{_mandir}/man8
+%{__install} -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+%{__install} -pm 644 iscsiuio/iscsiuiolog $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+
+%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi
+%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/nodes
+%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/send_targets
+%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/static
+%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/isns
+%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/slp
+%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/ifaces
+
+# for %%ghost
+%{__install} -d $RPM_BUILD_ROOT%{_rundir}/lock/iscsi
+touch $RPM_BUILD_ROOT%{_rundir}/lock/iscsi/lock
+
+
+%{__install} -d $RPM_BUILD_ROOT%{_unitdir}
+%{__install} -pm 644 etc/systemd/iscsi.service $RPM_BUILD_ROOT%{_unitdir}
+%{__install} -pm 644 etc/systemd/iscsi-init.service $RPM_BUILD_ROOT%{_unitdir}
+%{__install} -pm 644 etc/systemd/iscsi-shutdown.service $RPM_BUILD_ROOT%{_unitdir}
+%{__install} -pm 644 etc/systemd/iscsid.service $RPM_BUILD_ROOT%{_unitdir}
+%{__install} -pm 644 etc/systemd/iscsid.socket $RPM_BUILD_ROOT%{_unitdir}
+%{__install} -pm 644 etc/systemd/iscsiuio.service $RPM_BUILD_ROOT%{_unitdir}
+%{__install} -pm 644 etc/systemd/iscsiuio.socket $RPM_BUILD_ROOT%{_unitdir}
+
+%{__install} -d $RPM_BUILD_ROOT%{_libexecdir}
+%{__install} -pm 755 etc/systemd/iscsi-mark-root-nodes $RPM_BUILD_ROOT%{_libexecdir}
+
+%{__install} -d $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d
+%{__install} -pm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d
+
+%{__install} -d $RPM_BUILD_ROOT%{_tmpfilesdir}
+%{__install} -pm 644 %{SOURCE5} $RPM_BUILD_ROOT%{_tmpfilesdir}/iscsi.conf
+
+%{__install} -d $RPM_BUILD_ROOT%{_libdir}
+%{__install} -pm 755 libiscsi/libiscsi.so.0 $RPM_BUILD_ROOT%{_libdir}
+%{__ln_s}    libiscsi.so.0 $RPM_BUILD_ROOT%{_libdir}/libiscsi.so
+%{__install} -d $RPM_BUILD_ROOT%{_includedir}
+%{__install} -pm 644 libiscsi/libiscsi.h $RPM_BUILD_ROOT%{_includedir}
+
+%if %{with python2}
+%{__install} -d $RPM_BUILD_ROOT%{python2_sitearch}
+%endif
+# ended with python2
+%{__install} -d $RPM_BUILD_ROOT%{python3_sitearch}
+pushd libiscsi
+%if %{with python2}
+%py2_install
+%endif
+# ended with python2
+%py3_install
+popd
+
+
+%post
+%systemd_post iscsi.service iscsi-shutdown.service iscsid.service iscsid.socket
+
+%post iscsiuio
+%systemd_post iscsiuio.service iscsiuio.socket
+
+%preun
+%systemd_preun iscsi.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
+
+%preun iscsiuio
+%systemd_preun iscsiuio.service iscsiuio.socket
+
+%postun
+%systemd_postun iscsi.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
+
+%postun iscsiuio
+%systemd_postun iscsiuio.service iscsiuio.socket
+
+%triggerun -- iscsi-initiator-utils < 6.2.0.873-25
+# prior to 6.2.0.873-24 iscsi.service was missing a Wants=remote-fs-pre.target
+# this forces remote-fs-pre.target active if needed for a clean shutdown/reboot
+# after upgrading this package
+if [ $1 -gt 0 ]; then
+    /usr/bin/systemctl -q is-active iscsi.service
+    if [ $? -eq 0 ]; then
+        /usr/bin/systemctl -q is-active remote-fs-pre.target
+        if [ $? -ne 0 ]; then
+            SRC=`/usr/bin/systemctl show --property FragmentPath remote-fs-pre.target | cut -d= -f2`
+            DST=/run/systemd/system/remote-fs-pre.target
+            if [ $SRC != $DST ]; then
+                cp $SRC $DST
+            fi
+            sed -i 's/RefuseManualStart=yes/RefuseManualStart=no/' $DST
+            /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+            /usr/bin/systemctl start remote-fs-pre.target >/dev/null 2>&1 || :
+        fi
+    fi
+fi
+# added in 6.2.0.873-25
+if [ $1 -gt 0 ]; then
+    systemctl start iscsi-shutdown.service >/dev/null 2>&1 || :
+fi
+
+
+%files
+%doc README
+%dir %{_sharedstatedir}/iscsi
+%dir %{_sharedstatedir}/iscsi/nodes
+%dir %{_sharedstatedir}/iscsi/isns
+%dir %{_sharedstatedir}/iscsi/static
+%dir %{_sharedstatedir}/iscsi/slp
+%dir %{_sharedstatedir}/iscsi/ifaces
+%dir %{_sharedstatedir}/iscsi/send_targets
+%ghost %{_rundir}/lock/iscsi
+%{_unitdir}/iscsi.service
+%{_unitdir}/iscsi-init.service
+%{_unitdir}/iscsi-shutdown.service
+%{_unitdir}/iscsid.service
+%{_unitdir}/iscsid.socket
+%{_libexecdir}/iscsi-mark-root-nodes
+%{_prefix}/lib/NetworkManager
+%{_tmpfilesdir}/iscsi.conf
+%dir %{_sysconfdir}/iscsi
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
+%{_sbindir}/iscsi-iname
+%{_sbindir}/iscsiadm
+%{_sbindir}/iscsid
+%{_sbindir}/iscsistart
+%{_libdir}/libiscsi.so.0
+%{_mandir}/man8/iscsi-iname.8.gz
+%{_mandir}/man8/iscsiadm.8.gz
+%{_mandir}/man8/iscsid.8.gz
+%{_mandir}/man8/iscsistart.8.gz
+# until we decide to setup libopeniscsiusr as a subpkg for real
+%{_libdir}/libopeniscsiusr.so.*
+%exclude %{_libdir}/libopeniscsiusr.so
+%exclude %{_includedir}/libopeniscsiusr.h
+%exclude %{_includedir}/libopeniscsiusr_common.h
+%exclude %{_includedir}/libopeniscsiusr_iface.h
+%exclude %{_includedir}/libopeniscsiusr_node.h
+%exclude %{_includedir}/libopeniscsiusr_session.h
+%exclude %{_libdir}/pkgconfig/libopeniscsiusr.pc
+
+# %%files -n libopeniscsiusr
+# %%{_libdir}/libopeniscsiusr.so.*
+#
+# %%files -n libopeniscsiusr-devel
+# %%{_libdir}/libopeniscsiusr.so
+# %%{_includedir}/libopeniscsiusr.h
+# %%{_includedir}/libopeniscsiusr_common.h
+# %%{_includedir}/libopeniscsiusr_iface.h
+# %%{_includedir}/libopeniscsiusr_session.h
+# %%{_libdir}/pkgconfig/libopeniscsiusr.pc
+
+%files iscsiuio
+%{_sbindir}/iscsiuio
+%{_unitdir}/iscsiuio.service
+%{_unitdir}/iscsiuio.socket
+%config(noreplace) %{_sysconfdir}/logrotate.d/iscsiuiolog
+%{_mandir}/man8/iscsiuio.8.gz
+
+%files devel
+%doc libiscsi/html
+%{_libdir}/libiscsi.so
+%{_includedir}/libiscsi.h
+
+%if %{with python2}
+%files -n python2-%{name}
+%{python2_sitearch}/*
+%endif
+# ended with python2
+
+%files -n python3-%{name}
+%{python3_sitearch}/*
+
+%changelog
+* Mon Sep 21 2020 Chris Leech <cleech@redhat.com> - 6.2.1.2-1.git13e7f58
+- iscsiadm overflow regression when discovering many targets at once
+- check for invalid session id during stop connection
+- add ability to attempt target logins asynchronously
+
+* Tue Aug 11 2020 Christian Glombek <cglombek@redhat.com> - 6.2.1.2-0.git802688d
+- Update to upstream v2.1.2
+- Remove systemctl enable calls, as this is now handled by Fedora presets
+- per the guidelines
+- Remove initiator name generation, as this is now handled by an init service
+- Install ghost lockfile and dir to /run instead of /var
+- Rebased/fixed up patches
+- Fixed macros in comments and comments after macros
+- Merged service-file-tweaks.patch and
+- improve-systemd-service-files-for-boot-session-handl.patch
+- into unit-file-tweaks.patch 
+- Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1493296
+- Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1729740
+- Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1834509
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.1.1-0.gitac87641.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 6.2.1.1-0.gitac87641.1
+- Rebuilt for Python 3.9
+
+* Mon Mar 02 2020 Chris Leech <cleech@redhat.com> - 6.2.1.1-0.gitac87641
+- rebase to new upstream v2.1.1
+- enhanced CHAP options are now a configuration to deal with broken targets (#1774746)
+
+* Sun Mar 01 2020 Adam Williamson <awilliam@redhat.com> - 6.2.1.0-2.git4440e57
+- Backport upstream d3daa7a2 to fix bz #1774746
+
+* Mon Feb 24 2020 Than Ngo <than@redhat.com> - 6.2.1.0-1.git4440e57
+- upstream patch to support gcc -fno-common option
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.1.0-0.git4440e57.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 19 2019 Chris Leech <cleech@redhat.com> - 6.2.1.0-0.git4440e57
+- update to upstream v2.1.0
+
+* Thu Aug 22 2019 Lubomir Rintel <lkundrak@v3.sk> - 6.2.0.876-12.gitf3c8e90
+- Move the NetworkManager dispatcher script out of /etc
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 6.2.0.876-11.gitf3c8e90
+- Rebuilt for Python 3.8
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0.876-10.gitf3c8e90
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu May 30 2019 Chris Leech <cleech@redhat.com> - 6.2.0.876-9.gitf3c8e90
+- FTBFS: %%systemd_postun scriptlets need service files as an argument
+
+* Tue Feb 12 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 6.2.0.876-8.gitf3c8e90
+- Remove obsolete scriptlets
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0.876-7.gitf3c8e90
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 10 2019 Miro Hrončok <mhroncok@redhat.com> - 6.2.0.876-6.gitf3c8e90
+- Disable python2 build
+
+* Tue Jul 10 2018 Chris Leech <cleech@redhat.com> - 6.2.0.876-5.gitf3c8e90
+- iscsiuio: add mutex to protect netlink buffer for pass-through xmit
+- iscsid: get gateway information from sysfs when recovering sessions
+- enabled MaxOustandingR2T negotiation during login
+
+* Mon Jun 25 2018 Adam Williamson <awilliam@redhat.com> - 6.2.0.876-4.git4ef9261
+- Rebuilt for Python 3.7, again
+
+* Mon Jun 25 2018 Adam Williamson <awilliam@redhat.com> - 6.2.0.876-3.git4ef9261
+- Link libiscsi against libopeniscsiusr (bz #1594946) (python 3.6 build)
+
+* Wed Jun 20 2018 Miro Hrončok <mhroncok@redhat.com> - 6.2.0.876-2.git4ef9261
+- Rebuilt for Python 3.7
+
+* Tue Jun 19 2018 Chris Leech <cleech@redhat.com> - 6.2.0.876-1.git4ef9261
+- pull in post 2.0.876 tagged fixes from upstream git
+- minimal packaging of libopeniscsiusr (internal use only, no dev package yet)
+- Conditionalize the python2 subpackage [Charalampos Stratakis <cstratak@redhat.com>]
+
+* Tue Jun 19 2018 Chris Leech <cleech@redhat.com> - 6.2.0.876-1.git24580ad
+- rebase to upstream 2.0.876
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 6.2.0.874-10.git86e8892
+- Rebuilt for Python 3.7
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0.874-9.git86e8892
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan 05 2018 Iryna Shcherbina <ishcherb@redhat.com> - 6.2.0.874-8.git86e8892
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.2.0.874-7.git86e8892
+- Python 2 binary package renamed to python2-iscsi-initiator-utils
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0.874-6.git86e8892
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0.874-5.git86e8892
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed Apr 12 2017 Chris Leech <cleech@redhat.com> - 6.2.0.874-4.git86e8892
+- rebuild to use shared libisns
+
+* 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
+
+* Thu Feb 09 2017 Chris Leech <cleech@redhat.com> - 6.2.0.874-1
+- update to 2.0.874
+
+* Mon Dec 12 2016 Charalampos Stratakis <cstratak@redhat.com> - 6.2.0.873-35.git4c1f2d9
+- Rebuild for Python 3.6
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.873-34.git4c1f2d9
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Fri Feb 19 2016 Chris Leech <cleech@redhat.com> - 6.2.0.873-33.git4c1f2d9
+- sync with upstream
+- sysfs handling changes to speed up operations over large number of sessions
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0.873-32.git4c9d6f9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Feb  3 2016 Michael Schwendt <mschwendt@fedoraproject.org> - 6.2.0.873-31.git4c9d6f9
+- BuildRequires: isns-utils-static for -lisns (bz #1291913)
+
+* Tue Nov 03 2015 Robert Kuska <rkuska@redhat.com> - 6.2.0.873-30.git4c9d6f9
+- Rebuilt for Python3.5 rebuild
+
+* Tue Oct 06 2015 Chris Leech <cleech@redhat.com> - 6.2.0.873-29.git4c9d6f9
+- rebase with upstream, change Source0 url to github
+- build with external isns-utils
+
+* Mon Oct 05 2015 Chris Leech <cleech@redhat.com> - 6.2.0.873-28.git6aa2c9b
+- fixed broken multiple trigger scripts, removed old pre-systemd migration triggers
+- added libiscsi session API patch (bz #1262279)
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.873-27.git6aa2c9b
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Jun 10 2015 Chris Leech <cleech@redhat.com> - 6.2.0.873-26.git6aa2c9b
+- rebase to upstream snapshot
+- add patch to improve GIL lock performance in libiscsi
+- Split Python 2 and Python 3 bindings out into subpackages
+
+* Wed Jan 28 2015 Chris Leech <cleech@redhat.com> - 6.2.0.873-25.gitc9d830b
+- split out session logout on shutdown to a separate service
+- 985321 roll up libiscsi patches, update python bindings to support python3
+- scriptlets were never split out properly for the iscsiuio subpackage
+- fix regression in network interface binding
+- created iscsi-shutdown.service to ensure that session cleanup happens
+- Add --with-slp=no
+- segfault from unexpected netlink event during discovery
+- inhibit strict aliasing optimizations in iscsiuio, rpmdiff error
+
+* Thu Oct 23 2014 Chris Leech <cleech@redhat.com> - 6.2.0.873-24.gitc9d830b
+- sync with upstream v2.0.873-84-gc9d830b
+- ignore iscsiadm return in iscsi.service
+- make sure systemd order against remote mounts is correct
+- add discovery as a valid mode in iscsiadm.8
+- make sure to pass --with-security=no to isns configure
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.873-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.873-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon Apr 14 2014 Chris Leech <cleech@redhat.com> - 6.2.0.873-21
+- boot session handling improvements
+- split out iscsiuio into a seperate sub-package
+- sync with new upstream additions
+- revert change to return code when calling login_portal for sessions
+  that already exist, as it impacts users scripting around iscsiadm
+
+* Tue Dec 10 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-17
+- fix regression in glob use, inappropriate error code escape
+- clean up dead node links from discovery when reusing tpgt
+
+* Mon Nov 25 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-16
+- fix iscsiuio socket activation
+- have systemd start socket units on iscsiadm use, if not already listening
+
+* Sun Sep 15 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-15
+- move /sbin to /usr/sbin
+- use rpm macros in install rules
+
+* Fri Sep 13 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-14
+- fix iscsiuio hardened build and other compiler flags
+
+* Fri Aug 23 2013 Andy Grover <agrover@redhat.com> - 6.2.0.873-13
+- Fix patch 0041 to check session != NULL before calling iscsi_sysfs_read_boot()
+
+* Tue Aug 20 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-12
+- fix regression in last build, database records can't be accessed
+
+* Mon Aug 19 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-11
+- iscsi boot related fixes
+  make sure iscsid gets started if there are any boot sessions running
+  add reload target to fix double session problem when restarting from NM
+  don't rely on session list passed from initrd, never got fully implemented
+  remove patches related to running iscsid from initrd, possible to revisit later
+
+* Sun Aug 18 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-10
+- sync with upstream git, minor context fixes after rebase of out-of-tree patches
+- iscsiuio is merged upstream, remove old source archive and patches
+- spec cleanups to fix rpmlint issues
+
+* Sun Aug  4 2013 Peter Robinson <pbrobinson@fedoraproject.org> 6.2.0.873-9
+- Fix FTBFS, cleanup spec
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.873-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jun 11 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-7
+- Use the systemd tmpfiles service to recreate lockfiles in /var/lock
+- 955167 build as a position independent executable
+- 894576 fix order of setuid/setgid and drop additional groups
+
+* Tue May 28 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-6
+- Don't have iscsiadm scan for autostart record if node db is empty (bug #951951)
+
+* Tue Apr 30 2013 Orion Poplawski <orion@cora.nwra.com> - 6.2.0.873-5
+- Fix typo in NM dispatcher script (bug #917058)
+
+* Thu Feb 21 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-4
+- build with libkmod support, instead of calling out to modprobe
+- enable socket activation by default
+
+* Thu Jan 24 2013 Kalev Lember <kalevlember@gmail.com> - 6.2.0.873-3
+- Fix the postun script to not use ldconfig as the interpreter
+
+* Wed Jan 23 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-2
+- package iscsi_mark_root_nodes script, it's being referenced by the unit files
+
+* Tue Jan 22 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-1
+- rebase to new upstream code
+- systemd conversion
+- 565245 Fix multilib issues caused by timestamp in doxygen footers
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.872-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Feb 14 2012 Mike Christie <mchristi@redhat.com> 6.2.0.872.18
+- 789683 Fix boot slow down when the iscsi service is started
+  (regression added in 6.2.0.872.16 when the nm wait was added).
+
+* Mon Feb 6 2012 Mike Christie <mchristi@redhat.com> 6.2.0.872.17
+- 786174 Change iscsid/iscsi service startup, so it always starts
+  when called.
+
+* Sat Feb 4 2012 Mike Christie <mchristi@redhat.com> 6.2.0.872.16
+- 747479 Fix iscsidevs handling of network requirement
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.872-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Nov 30 2011 Mike Christie <mcrhsit@redhat.com> 6.2.0.872.14
+- Fix version string to reflect fedora and not rhel.
+
+* Tue Oct 18 2011 Mike Christie <mcrhsit@redhat.com> 6.2.0.872.13
+- Update iscsi tools.
+
+* Sat Apr 30 2011 Hans de Goede <hdegoede@redhat.com> - 6.2.0.872-12
+- Change iscsi init scripts to check for networking being actually up, rather
+  then for NetworkManager being started (#692230)
+
+* Tue Apr 26 2011 Hans de Goede <hdegoede@redhat.com> - 6.2.0.872-11
+- Fix iscsid autostarting when upgrading from an older version
+  (add iscsid.startup key to iscsid.conf on upgrade)
+- Fix printing of [ OK ] when successfully stopping iscsid
+- systemd related fixes:
+ - Add Should-Start/Stop tgtd to iscsi init script to fix (re)boot from
+   hanging when using locally hosted targets
+ - %%ghost /var/lock/iscsi and contents (#656605)
+
+* Mon Apr 25 2011 Mike Christie <mchristi@redhat.com> 6.2.0.872-10
+- Fix iscsi init scripts check for networking being up (#692230)
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.0.872-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
--- a/iscsi-tmpfiles.conf
+++ b/iscsi-tmpfiles.conf
@ -0,0 +1,2 @@
+d /run/lock/iscsi 0700 root root -
+f /run/lock/iscsi/lock 0600 root root -
--- a/1
+++ b/1
@ -0,0 +1 @@
+SHA512 (open-iscsi-13e7f58.tar.gz) = baaf1b69c6e2da24684458bd3042dae07dcaa415b0b4c44d2b5b9076f17871f7c430e6f515a18ea439ee02da7d76af25fee82a9e88196eea59cce88979b5bc9b
				`@ -0,0 +1 @@`
				`SHA512 (open-iscsi-13e7f58.tar.gz) = baaf1b69c6e2da24684458bd3042dae07dcaa415b0b4c44d2b5b9076f17871f7c430e6f515a18ea439ee02da7d76af25fee82a9e88196eea59cce88979b5bc9b`