From 240e250b11ae02de52e79ea04d6eaba7a6a3dfd7 Mon Sep 17 00:00:00 2001
From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Sat, 25 Dec 2010 12:04:29 +1100
Subject: [PATCH] USERNAME / PASSWORD

When failing iscsi-ls due to a missing url, print the url syntax
in the error message before aborting
---
 lib/init.c      | 2 +-
 src/iscsi-inq.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/init.c b/lib/init.c
index 4ce941d..c638c8e 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -234,7 +234,7 @@ iscsi_parse_full_url(struct iscsi_context *iscsi, const char *url)
 	char *tmp;
 
 	if (strncmp(url, "iscsi://", 8)) {
-		iscsi_set_error(iscsi, "Invalid URL %s\niSCSI URL must be of the form \"iscsi://[<username>[%<password>]@]<host>[:<port>]/<target-iqn>/<lun>\"\n", url);
+		iscsi_set_error(iscsi, "Invalid URL %s\niSCSI URL must be of the form \"iscsi://[<username>[%%<password>]@]<host>[:<port>]/<target-iqn>/<lun>\"\n", url);
 		return NULL;
 	}
 
diff --git a/src/iscsi-inq.c b/src/iscsi-inq.c
index e142458..ee455cd 100644
--- a/src/iscsi-inq.c
+++ b/src/iscsi-inq.c
@@ -192,9 +192,14 @@ int main(int argc, const char *argv[])
 		exit(10);
 	}
 
+	if (url == NULL) {
+		fprintf(stderr, "You must specify the URL\n");
+		fprintf(stderr, "   iscsi://[<username>[%%<password>]@]<host>[:<port>]/<target-iqn>/<lun>\n");
+		exit(10);
+	}
 	iscsi_url = iscsi_parse_full_url(iscsi, url);
 	if (iscsi_url == NULL) {
-		fprintf(stderr, "Failed to parse URL : %s\n", url);
+		fprintf(stderr, "Failed to parse URL : %s %s\n", url, iscsi_get_error(iscsi));
 		exit(10);
 	}