[rpms/iscsi-initiator-utils] rawhide: fix regression in node record of type "fw" or "static" with untagged upstream fix

[rpms/iscsi-initiator-utils] rawhide: fix regression in node record of type "fw" or "static" with untagged upstream fix

[Chris Leech]

A new commit has been pushed.

Repo   : rpms/iscsi-initiator-utils
Branch : rawhide
Commit : b2ffc3d0c9ffb1c77b9fd21511dee1e8ebe86661
Author : Chris Leech <cleech@redhat.com>
Date   : 2026-06-25T14:37:06-07:00
Stats  : +64/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/iscsi-initiator-utils/c/b2ffc3d0c9ffb1c77b9fd21511dee1e8ebe86661?branch=rawhide

Log:
fix regression in node record of type "fw" or "static" with untagged upstream fix

---
diff --git a/0001-Fix-incorrect-parsing-of-node.discovery_type-static-.patch b/0001-Fix-incorrect-parsing-of-node.discovery_type-static-.patch
new file mode 100644
index 0000000..473f65f
--- /dev/null
+++ b/0001-Fix-incorrect-parsing-of-node.discovery_type-static-.patch
@@ -0,0 +1,59 @@
+From 290d16d6c6b6f4c78af119eb874484b2f995dc23 Mon Sep 17 00:00:00 2001
+From: Mike Andrews <gubblebozer@gmail.com>
+Date: Sun, 28 Dec 2025 19:19:39 -0500
+Subject: [PATCH 1/1] Fix incorrect parsing of node.discovery_type "static" and
+ "fw" (#518)
+
+Remove the unused DISCOVERY_TYPE_SLP enumeration value so that the strings
+"static" and "fw" map to the correct enum values.
+
+Previous versions supported an "slp" discovery_type.  In d1d456cf28cd89, the
+"slp" string was removed from the list of TYPE_INT_O string arguments when
+processing DISC_TYPE and NODE_DISC_TYPE records in idbm_recinfo_discovery and
+_idbm_node_rec_link.  But, it was left in the discovery_type enum.  The
+resulting parsing logic would then map the string values "static" and "fw" to
+the wrong enum values, and thus logic with unique action on
+DISCOVERY_TYPE_STATIC and DISCOVERY_TYPE_FW did the wrong thing.  Specifically,
+
+- "static" mapped to DISCOVERY_TYPE_SLP, and
+- "fw" mapped to DISCOVERY_TYPE_STATIC.
+
+One manifestation of this bug is that you can no longer use iscsiadm to
+manipulate or delete nodes with discovery_type = "static", as it falls through
+to the default case in setup_disc_to_node_link.
+
+Fixes #463.
+---
+ libopeniscsiusr/idbm.h | 2 --
+ usr/config.h           | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h
+index 0b201f4..512851d 100644
+--- a/libopeniscsiusr/idbm.h
++++ b/libopeniscsiusr/idbm.h
+@@ -78,8 +78,6 @@ enum discovery_type {
+ 	DISCOVERY_TYPE_SENDTARGETS,
+ 	DISCOVERY_TYPE_ISNS,
+ 	DISCOVERY_TYPE_OFFLOAD_SENDTARGETS,
+-	/* SLP is Not Used --  kept as place holder */
+-	DISCOVERY_TYPE_SLP_NOT_IMPLEMENTED,
+ 	DISCOVERY_TYPE_STATIC,
+ 	DISCOVERY_TYPE_FW,
+ };
+diff --git a/usr/config.h b/usr/config.h
+index a38a25d..94a8ad0 100644
+--- a/usr/config.h
++++ b/usr/config.h
+@@ -161,8 +161,6 @@ typedef enum discovery_type {
+ 	DISCOVERY_TYPE_SENDTARGETS,
+ 	DISCOVERY_TYPE_ISNS,
+ 	DISCOVERY_TYPE_OFFLOAD_SENDTARGETS,
+-	/* SLP is Not Used --  kept as place holder */
+-	DISCOVERY_TYPE_SLP_NOT_IMPLEMENTED,
+ 	DISCOVERY_TYPE_STATIC,
+ 	DISCOVERY_TYPE_FW,
+ } discovery_type_e;
+-- 
+2.54.0
+

diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 06dca4a..fb83dd5 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -10,13 +10,14 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
-Release: 0.git%{shortcommit0}%{?dist}.5
+Release: 0.git%{shortcommit0}%{?dist}.6
 License: GPL-2.0-or-later
 URL: https://github.com/open-iscsi/open-iscsi
 Source0: https://github.com/open-iscsi/open-iscsi/archive/%{commit0}.tar.gz#/open-iscsi-%{shortcommit0}.tar.gz
 Source4: 04-iscsi
 Source5: iscsi-tmpfiles.conf
 
+Patch00: 0001-Fix-incorrect-parsing-of-node.discovery_type-static-.patch
 Patch01: 0001-meson-don-t-hide-things-with-Wno-all.patch
 
 # https://github.com/open-iscsi/open-iscsi/pull/394/
@@ -272,6 +273,9 @@ systemctl --no-reload preset iscsi.service iscsi-starter.service &>/dev/null || 
 %endif
 
 %changelog
+* Thu Jun 25 2026 Chris Leech <cleech@redhat.com> - 6.2.1.11-0.git4b3e853.6
+- fix regression in node record of type "fw" or "static" with untagged upstream fix
+
 * Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 6.2.1.11-0.git4b3e853.5
 - Rebuilt for openssl 4.0