[scsi-target-utils/f16] 1.0.18-4

[Andy Grover]

commit a9fd2fdcbd74a22e5b9e554d5deafd4cb206c918
Author: Andy Grover <agrover at redhat.com>
Date:   Mon Dec 19 17:35:32 2011 -0800

    1.0.18-4

 scsi-target-utils-fix-segfault-on-exit.patch |   23 +++-
 scsi-target-utils-git-sync.patch             |  152 --------------------------
 scsi-target-utils.spec                       |    6 +-
 3 files changed, 24 insertions(+), 157 deletions(-)
---
diff --git a/scsi-target-utils-fix-segfault-on-exit.patch b/scsi-target-utils-fix-segfault-on-exit.patch
index 3d9771e..b597574 100644
--- a/scsi-target-utils-fix-segfault-on-exit.patch
+++ b/scsi-target-utils-fix-segfault-on-exit.patch
@@ -1,7 +1,14 @@
-diff -Naur tgt-1.0.18-orig/usr/iscsi/iser.c tgt-1.0.18/usr/iscsi/iser.c
---- tgt-1.0.18-orig/usr/iscsi/iser.c	2011-09-29 17:57:49.546065404 -0700
-+++ tgt-1.0.18/usr/iscsi/iser.c	2011-09-29 17:58:25.663956172 -0700
-@@ -3502,8 +3502,10 @@
+commit f673c239c2e2272ef821a6e7d2ecb9227273bc4b
+Author: Andy Grover <agrover at redhat.com>
+Date:   Mon Dec 19 17:31:04 2011 -0800
+
+    fix-segfault-on-exit
+
+diff --git a/usr/iscsi/iser.c b/usr/iscsi/iser.c
+index 3904aaf..0813714 100644
+--- a/usr/iscsi/iser.c
++++ b/usr/iscsi/iser.c
+@@ -3502,8 +3502,10 @@ static int iser_init(int index, char *args)
  
  
  	err = iser_ib_init();
@@ -13,3 +20,11 @@ diff -Naur tgt-1.0.18-orig/usr/iscsi/iser.c tgt-1.0.18/usr/iscsi/iser.c
  
  	if (iser_send_nop) {
  		nop_work.func = iser_nop_work_handler;
+@@ -3516,6 +3518,7 @@ static int iser_init(int index, char *args)
+ 
+ Exit:
+ 	syslog(LOG_ERR, "%s - iser transport not used", dlerror());
++	iser_send_nop = 0;
+ 	if (pverbs)
+ 		dlclose(pverbs);
+ 	if (prdma)
diff --git a/scsi-target-utils.spec b/scsi-target-utils.spec
index 7471aef..21ba93a 100644
--- a/scsi-target-utils.spec
+++ b/scsi-target-utils.spec
@@ -1,6 +1,6 @@
 Name:           scsi-target-utils
 Version:        1.0.18
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The SCSI target daemon and utility programs
 
 Group:          System Environment/Daemons
@@ -100,6 +100,10 @@ fi
 
 
 %changelog
+* Mon Dec 19 2011 Andy Grover <agrover at redhat.com> - 1.0.18-4
+- Refresh fix-segfault-on-exit patch to set iser_send_nop to 0
+  if rdma libs are not present
+
 * Mon Dec 19 2011 Andy Grover <agrover at redhat.com> - 1.0.18-3
 - Add missing lsof and sg3_utils requires