From a255f1a7ffeb6491d63ded5bc7c9c5d002dfedc5 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sun, 23 Oct 2022 06:13:20 +0000
Subject: [PATCH] import udisks2-2.9.0-12.el8

---
 SOURCES/udisks-2.10.0-iscsi-auth-info.patch | 29 +++++++++++++++++++++
 SPECS/udisks2.spec                          |  8 +++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/udisks-2.10.0-iscsi-auth-info.patch

diff --git a/SOURCES/udisks-2.10.0-iscsi-auth-info.patch b/SOURCES/udisks-2.10.0-iscsi-auth-info.patch
new file mode 100644
index 0000000..633386e
--- /dev/null
+++ b/SOURCES/udisks-2.10.0-iscsi-auth-info.patch
@@ -0,0 +1,29 @@
+From 9a6e6b700b19539465ab6b241f04b94d4b3769c4 Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek@redhat.com>
+Date: Mon, 10 Oct 2022 13:55:29 +0200
+Subject: [PATCH] iscsi: Always set auth info
+
+In case of reusing a context auth info needs to be
+always set to override previous data.
+---
+ modules/iscsi/udisksiscsiutil.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/modules/iscsi/udisksiscsiutil.c b/modules/iscsi/udisksiscsiutil.c
+index 8fdae889c7..78890106f0 100644
+--- a/modules/iscsi/udisksiscsiutil.c
++++ b/modules/iscsi/udisksiscsiutil.c
+@@ -171,11 +171,8 @@ iscsi_perform_login_action (UDisksLinuxModuleISCSI     *module,
+   /* Get a libiscsi context. */
+   ctx = udisks_linux_module_iscsi_get_libiscsi_context (module);
+ 
+-  if (action == ACTION_LOGIN &&
+-      auth_info && auth_info->method == libiscsi_auth_chap)
+-    {
+-      libiscsi_node_set_auth (ctx, node, auth_info);
+-    }
++  if (action == ACTION_LOGIN && auth_info)
++    libiscsi_node_set_auth (ctx, node, auth_info);
+ 
+   /* Login or Logout */
+   err = action == ACTION_LOGIN ?
diff --git a/SPECS/udisks2.spec b/SPECS/udisks2.spec
index 8808a11..0a3028b 100644
--- a/SPECS/udisks2.spec
+++ b/SPECS/udisks2.spec
@@ -56,7 +56,7 @@
 Name:    udisks2
 Summary: Disk Manager
 Version: 2.9.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2+
 Group:   System Environment/Libraries
 URL:     https://github.com/storaged-project/udisks
@@ -67,6 +67,8 @@ Patch1:  udisks-2.9.1-lvm_vdo-test_resize_physical-size.patch
 Patch2:  udisks-2.9.1-drive_ata_tests.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2120697
 Patch3:  udisks-2.10.0-block_format_ata_secure_erase.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=2135773
+Patch4:  udisks-2.10.0-iscsi-auth-info.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1845973
 Patch10: udisks-2.9.1-daemon-Always-flush-interface-property-changes.patch
 Patch11: udisks-2.9.1-lvm2-Always-flush-interface-property-changes.patch
@@ -296,6 +298,7 @@ This package contains module for VDO management.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
@@ -504,6 +507,9 @@ fi
 %endif
 
 %changelog
+* Wed Oct 19 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-12
+- Fix iscsi authentication info override (#2135773)
+
 * Fri Sep 16 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.9.0-11
 - Fix the patch list