fix regression in glob use, inappropriate error code escape
This commit is contained in:
parent
e4192b1937
commit
695b8c9be0
@ -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) {
|
||||
|
@ -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
|
||||
|
@ -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@redhat.com> - 6.2.0.873-17
|
||||
- fix regression in glob use, inappropriate error code escape
|
||||
|
||||
* Mon Nov 25 2013 Chris Leech <cleech@redhat.com> - 6.2.0.873-16
|
||||
- fix iscsiuio socket activation
|
||||
- have systemd start socket units on iscsiadm use, if not already listening
|
||||
|
Loading…
Reference in New Issue
Block a user