[iscsi-initiator-utils: 108/109] fix regression in glob use, inappropriate error code escape

[Chris Leech]

commit 695b8c9be0cfedfb779c7ab080beb8c99db3f13b
Author: Chris Leech <cleech at redhat.com>
Date:   Fri Dec 6 12:22:20 2013 -0800

    fix regression in glob use, inappropriate error code escape

 ..._rec_write-pick-tpgt-from-existing-record.patch |    3 ++-
 ...-version-string-to-match-RPM-package-vers.patch |    2 +-
 iscsi-initiator-utils.spec                         |    5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/0046-idbw_rec_write-pick-tpgt-from-existing-record.patch b/0046-idbw_rec_write-pick-tpgt-from-existing-record.patch
index 894eb4b..d2af2fb 100644
--- a/0046-idbw_rec_write-pick-tpgt-from-existing-record.patch
+++ b/0046-idbw_rec_write-pick-tpgt-from-existing-record.patch
@@ -23,7 +23,7 @@ index cb6ffd1..5adbd95 100644
  #include <sys/stat.h>
  #include <sys/file.h>
  
-@@ -1884,12 +1885,47 @@ static int idbm_rec_write_old(node_rec_t *rec)
+@@ -1884,12 +1885,48 @@ static int idbm_rec_write_old(node_rec_t *rec)
  	FILE *f;
  	char *portal;
  	int rc = 0;
@@ -59,6 +59,7 @@ index cb6ffd1..5adbd95 100644
 +				    "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) {
diff --git a/0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch b/0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
index c6398b1..14215d1 100644
--- a/0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
+++ b/0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
@@ -16,7 +16,7 @@ index a090522..aef0c3d 100644
   * some other maintainer could merge a patch without going through us
   */
 -#define ISCSI_VERSION_STR	"2.0-873"
-+#define ISCSI_VERSION_STR	"6.2.0.873-14"
++#define ISCSI_VERSION_STR	"6.2.0.873-17"
  #define ISCSI_VERSION_FILE	"/sys/module/scsi_transport_iscsi/version"
  
  #endif
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 00dc729..231b7e7 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -4,7 +4,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
-Release: 16%{?dist}
+Release: 17%{?dist}
 Group: System Environment/Daemons
 License: GPLv2+
 URL: http://www.open-iscsi.org
@@ -297,6 +297,9 @@ fi
 %{_includedir}/libiscsi.h
 
 %changelog
+* Fri Dec 06 2013 Chris Leech <cleech at redhat.com> - 6.2.0.873-17
+- fix regression in glob use, inappropriate error code escape
+
 * Mon Nov 25 2013 Chris Leech <cleech at redhat.com> - 6.2.0.873-16
 - fix iscsiuio socket activation
 - have systemd start socket units on iscsiadm use, if not already listening