Re: [linux-iscsi-users] RHEL4

[AJ Lewis <alewis@xxxxxxxxxx>]

On Wed, 02 Mar 2005 10:14:28 +0100, Trond Eivind Glomsrød <teg@xxxxxxxxx> wrote:
> a a wrote:
> 
> >Hello,
> >
> >I'm trying to connect to our IBM DS300 ISCSI box from
> >RHE4 server (kernel 2.6.10)and linux-iscsi-4.0.1.11
> >has been installed. 
> >
> While on the topic of RHEL4... has anyone managed to compile linux-iscsi 
> on the included kernel yet?

I did with the attached patch against the linux-iscsi-4.0.1.11.tgz
src.  This was against 2.6.9-5.0.3.EL.  It's just changing the strdup
fxn to a different name.

Regards,
--
AJ Lewis                                   Voice:  612-638-0500
Red Hat Inc.                               E-Mail: alewis@xxxxxxxxxx
720 Washington Ave. SE, Suite 200
Minneapolis, MN 55414
   
Current GPG fingerprint = D9F8 EDCE 4242 855F A03D  9B63 F50C 54A8 578C 8715
Grab the key at: http://people.redhat.com/alewis/gpg.html or one of the
many keyservers out there...

diff -Nurp linux-iscsi-4.0.1.11/driver/iscsi-session.c linux-iscsi-4.0.1.11.new/driver/iscsi-session.c
--- linux-iscsi-4.0.1.11/driver/iscsi-session.c	2005-01-12 10:23:25.000000000 -0500
+++ linux-iscsi-4.0.1.11.new/driver/iscsi-session.c	2005-02-24 08:19:11.000000000 -0500
@@ -487,7 +487,7 @@ establish_session(struct iscsi_session *
 }
 
 static char*
-strdup(char *str, int *err)
+SFstrdup(char *str, int *err)
 {
 	int len;
 	char *s;
@@ -531,7 +531,7 @@ update_iscsi_strings(struct iscsi_sessio
 		return -EINVAL;
 	}
 	if (strcmp(ioctld->initiator_name, session->initiator_name)) {
-		iname = strdup(ioctld->initiator_name, &rc);
+		iname = SFstrdup(ioctld->initiator_name, &rc);
 		if (!iname) {
 			iscsi_host_err(session, "Failed to change "
 				       "InitiatorName from %s to %s\n",
@@ -543,7 +543,7 @@ update_iscsi_strings(struct iscsi_sessio
 
 	if (ioctld->initiator_alias[0] && (!session->initiator_alias ||
 	    strcmp(ioctld->initiator_alias, session->initiator_alias))) {
-		alias = strdup(ioctld->initiator_alias, &rc);
+		alias = SFstrdup(ioctld->initiator_alias, &rc);
 		if (!alias)
 			/* Alias is not ciritical so just print an error */
 			iscsi_host_err(session, "Failed to change "
@@ -552,7 +552,7 @@ update_iscsi_strings(struct iscsi_sessio
 
 	if (ioctld->username[0] && (!session->username ||
 	    strcmp(ioctld->username, session->username))) {
-		uname = strdup(ioctld->username, &rc);
+		uname = SFstrdup(ioctld->username, &rc);
 		if (!uname) {
 			iscsi_host_err(session, "Failed to change outgoing "
 				       "username\n");
@@ -562,7 +562,7 @@ update_iscsi_strings(struct iscsi_sessio
 
 	if (ioctld->username_in[0] && (!session->username_in ||
 	    strcmp(ioctld->username_in, session->username_in))) {
-		uname_in = strdup(ioctld->username_in, &rc);
+		uname_in = SFstrdup(ioctld->username_in, &rc);
 		if (!uname_in) {
 			iscsi_host_err(session, "Failed to change incoming "
 				       "username\n");
@@ -713,7 +713,7 @@ copy_iscsi_strings(struct iscsi_session 
 {
 	int rc;
 
-	session->initiator_name = strdup(ioctld->initiator_name, &rc);
+	session->initiator_name = SFstrdup(ioctld->initiator_name, &rc);
 	if (rc == -EINVAL) {
 		iscsi_host_err(session, "No InitiatorName\n");
 		return rc;
@@ -723,12 +723,12 @@ copy_iscsi_strings(struct iscsi_session 
 		return rc;
 	}
 
-	session->initiator_alias = strdup(ioctld->initiator_alias, &rc);
+	session->initiator_alias = SFstrdup(ioctld->initiator_alias, &rc);
 	/* Alias is not ciritical so just print an error */
 	if (!session->initiator_alias)
 		iscsi_host_err(session, "Cannot create InitiatorAlias\n");
 
-	session->target_name = strdup(ioctld->target_name, &rc);
+	session->target_name = SFstrdup(ioctld->target_name, &rc);
 	if (rc == -EINVAL) {
 		iscsi_err("No TargetName\n");
 		return rc;
@@ -738,14 +738,14 @@ copy_iscsi_strings(struct iscsi_session 
 		return rc;
 	}
 
-	session->username = strdup(ioctld->username, &rc);
+	session->username = SFstrdup(ioctld->username, &rc);
 	if (rc == -ENOMEM) {
 		iscsi_host_err(session, "Failed to allocate outgoing "
 			       "username\n");
 		return rc;
 	}
 
-	session->username_in = strdup(ioctld->username_in, &rc);
+	session->username_in = SFstrdup(ioctld->username_in, &rc);
 	if (rc == -ENOMEM) {
 		iscsi_host_err(session, "Failed to allocate incoming "
 			       "username\n");

Attachment: pgpqbhr0nCylE.pgp
Description: PGP signature