rpms/iscsi-initiator-utils/devel iscsi-initiator-utils-fix-non-def-port.patch, NONE, 1.1 iscsi-initiator-utils.spec, 1.50, 1.51

[Mike Christie]

Author: michaelc

Update of /cvs/pkgs/rpms/iscsi-initiator-utils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19762

Modified Files:
	iscsi-initiator-utils.spec 
Added Files:
	iscsi-initiator-utils-fix-non-def-port.patch 
Log Message:
Fix iscsiadm handling of port argument when it is not the default iscsi value of 3260

iscsi-initiator-utils-fix-non-def-port.patch:
 iscsiadm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE iscsi-initiator-utils-fix-non-def-port.patch ---
diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c
index 2d9f1a2..87dd4a0 100644
--- a/usr/iscsiadm.c
+++ b/usr/iscsiadm.c
@@ -1646,7 +1646,7 @@ main(int argc, char **argv)
 		goto free_ifaces;
 	}
 
-	if (mode != MODE_DISCOVERY && ip)
+	if (mode != MODE_DISCOVERY && ip && port != -1)
 		port = ISCSI_LISTEN_PORT;
 
 	switch (mode) {


Index: iscsi-initiator-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iscsi-initiator-utils/devel/iscsi-initiator-utils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- iscsi-initiator-utils.spec	6 May 2010 21:41:12 -0000	1.50
+++ iscsi-initiator-utils.spec	10 Jun 2010 02:41:51 -0000	1.51
@@ -3,7 +3,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.2.0.872
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: http://people.redhat.com/mchristi/iscsi/rhel6.0/source/open-iscsi-2.0-872-rc1-bnx2i.tar.gz
 Source1: iscsid.init
 Source2: iscsidevs.init
@@ -28,7 +28,8 @@ Patch7: iscsi-initiator-utils-fix-zero-M
 Patch8: iscsi-initiator-utils-be2iscsi-fix-init-r2t.patch
 # do not send informational msgs to stderr
 Patch9: iscsi-initiator-utils-log-info.patch
-
+# Fix iscsiadm non default port handling
+Patch10: iscsi-initiator-utils-fix-non-def-port.patch
 
 Group: System Environment/Daemons
 License: GPLv2+
@@ -67,6 +68,7 @@ developing applications that use %{name}
 %patch7 -p1 -b .fix-zero-MaxXmitDataSegmentLength
 %patch8 -p1 -b .be2iscsi-fix-init-r2t
 %patch9 -p1 -b .log-info
+%patch10 -p1 -b .fix-non-def-port
 
 %build
 cd utils/open-isns
@@ -179,6 +181,9 @@ fi
 %{_includedir}/libiscsi.h
 
 %changelog
+* Wed Jun 9 2010 Mike Christie <mchristi at redhat.com> 6.2.0.872.5
+- Fix iscsiadm handling of port argument when it is not the default 3260.
+
 * Thu May 6 2010 Mike Christie <mchristi at redhat.com> 6.2.0.872.4
 - Fix iscsi script operations to check for offload drivers in rh_status
 - Fix iscsiadm logging to not trigger iscsi script error detection