[iscsi-initiator-utils: 81/109] Resolves: #749051

[Chris Leech]

commit 777823a291de5a4b86e4103069280769808a7262
Author: mchristi <mchristi at redhat.com>
Date:   Fri Oct 28 06:58:55 2011 +0000

    Resolves: #749051

 iscsi-initiator-utils-add-rh-ver.patch       |    2 +-
 iscsi-initiator-utils-return-on-exists.patch |   22 ++++++++++++++++++++++
 iscsi-initiator-utils.spec                   |    9 ++++++---
 3 files changed, 29 insertions(+), 4 deletions(-)
---
diff --git a/iscsi-initiator-utils-add-rh-ver.patch b/iscsi-initiator-utils-add-rh-ver.patch
index 77ffc58..fcdb7bd 100644
--- a/iscsi-initiator-utils-add-rh-ver.patch
+++ b/iscsi-initiator-utils-add-rh-ver.patch
@@ -5,7 +5,7 @@
   * some other maintainer could merge a patch without going through us
   */
 -#define ISCSI_VERSION_STR	"2.0-872"
-+#define ISCSI_VERSION_STR	"2.0-872.31.el6"
++#define ISCSI_VERSION_STR	"2.0-872.32.el6"
  #define ISCSI_VERSION_FILE	"/sys/module/scsi_transport_iscsi/version"
  
  #endif
diff --git a/iscsi-initiator-utils-return-on-exists.patch b/iscsi-initiator-utils-return-on-exists.patch
new file mode 100644
index 0000000..e7822b3
--- /dev/null
+++ b/iscsi-initiator-utils-return-on-exists.patch
@@ -0,0 +1,22 @@
+diff -aurp open-iscsi-2.0-872-rc4-bnx2i/usr/initiator.c open-iscsi-2.0-872-rc4-bnx2i.workd/usr/initiator.c
+--- open-iscsi-2.0-872-rc4-bnx2i/usr/initiator.c	2011-10-28 01:56:53.000000000 -0500
++++ open-iscsi-2.0-872-rc4-bnx2i.workd/usr/initiator.c	2011-10-28 01:57:42.000000000 -0500
+@@ -1523,9 +1523,15 @@ static void setup_offload_login_phase(is
+ 	conn->state = ISCSI_CONN_STATE_IN_LOGIN;
+ 	if (ipc->start_conn(session->t->handle, session->id, conn->id,
+ 			    &rc) || rc) {
+-		log_error("can't start connection %d:%d retcode %d (%d)",
+-			  session->id, conn->id, rc, errno);
+-		iscsi_login_eh(conn, c->qtask, ISCSI_ERR_INTERNAL);
++		if (rc == -EEXIST) {
++			log_error("Session already exists.");
++			session_conn_shutdown(conn, c->qtask,
++					      ISCSI_ERR_SESS_EXISTS);
++		} else {
++			log_error("can't start connection %d:%d retcode (%d)",
++				  session->id, conn->id, rc);
++			iscsi_login_eh(conn, c->qtask, ISCSI_ERR_INTERNAL);
++		}
+ 		return;
+ 	}
+ 
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 0bd39cf..8f6685d 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.872
-Release: 31%{?dist}
+Release: 32%{?dist}
 Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc4-bnx2i.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -51,8 +51,10 @@ Patch18: iscsi-initiator-utils-Add-Netconfig-support-through-libiscsi.patch
 Patch19: iscsi-initiator-utils-libiscsi-to-support-offload.patch
 # sync iscsiuio to 0.7.0.14g
 Patch20: iscsi-initiator-utils-sync-uio-0.7.0.14g.patch
+# return on exists
+Patch21: iscsi-initiator-utils-return-on-exists.patch
 # add rhel version info to iscsi tools
-Patch21: iscsi-initiator-utils-add-rh-ver.patch
+Patch22: iscsi-initiator-utils-add-rh-ver.patch
 
 Group: System Environment/Daemons
 License: GPLv2+
@@ -101,7 +103,8 @@ developing applications that use %{name}.
 %patch18 -p1 -b .Add-Netconfig-support-through-libiscsi
 %patch19 -p1 -b .libiscsi-to-support-offload
 %patch20 -p1 -b .sync-uio-0.7.0.14g
-%patch21 -p1 -b .add-rh-ver
+%patch21 -p1 -b .return-on-exists
+%patch22 -p1 -b .add-rh-ver
 
 %build
 cd utils/open-isns