Re: [PATCH 1/2] iscsiadm: Correct the comparison for invalid hostno in host mode

[Mike Christie]

On 04/05/2013 06:34 AM, vikas.chaudh...@qlogic.com wrote:
> From: Adheer Chandravanshi <adheer.chandravan...@qlogic.com>
> 
> Signed-off-by: Adheer Chandravanshi <adheer.chandravan...@qlogic.com>
> Signed-off-by: Vikas Chaudhary <vikas.chaudh...@qlogic.com>
> ---
>  usr/iscsiadm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c
> index 5a18522..f87f48c 100644
> --- a/usr/iscsiadm.c
> +++ b/usr/iscsiadm.c
> @@ -3016,7 +3016,7 @@ main(int argc, char **argv)
>               if (sub_mode != -1) {
>                       switch (sub_mode) {
>                       case MODE_CHAP:
> -                             if (!op || !host_no) {
> +                             if (!op || (host_no == 0xffffffff)) {
>                                       log_error("CHAP mode requires host "
>                                               "no and valid operation");
>                                       rc = ISCSI_ERR_INVAL;
> @@ -3026,7 +3026,7 @@ main(int argc, char **argv)
>                                                      value);
>                               break;
>                       case MODE_FLASHNODE:
> -                             if (!host_no) {
> +                             if (host_no == 0xffffffff) {
>                                       log_error("FLASHNODE mode requires host 
> no");
>                                       rc = ISCSI_ERR_INVAL;
>                                       break;
> 

I merged the attached instead. It uses a define instead.

-- 
You received this message because you are subscribed to the Google Groups 
"open-iscsi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to open-iscsi+unsubscr...@googlegroups.com.
To post to this group, send email to open-iscsi@googlegroups.com.
Visit this group at http://groups.google.com/group/open-iscsi?hl=en.
For more options, visit https://groups.google.com/groups/opt_out.



diff --git a/usr/host.h b/usr/host.h
index 894ab91..bb65a77 100644
--- a/usr/host.h
+++ b/usr/host.h
@@ -5,6 +5,8 @@
 #include "types.h"
 #include "config.h"
 
+#define MAX_HOST_NO 0xffffffff
+
 #define MAX_CHAP_BUF_SZ 4096
 #define REQ_CHAP_BUF_SZ (MAX_CHAP_BUF_SZ + sizeof(struct iscsi_uevent))
 
diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c
index 84d5a27..7b257b9 100644
--- a/usr/iscsiadm.c
+++ b/usr/iscsiadm.c
@@ -3019,7 +3019,7 @@ main(int argc, char **argv)
                if (sub_mode != -1) {
                        switch (sub_mode) {
                        case MODE_CHAP:
-                               if (!op || !host_no) {
+                               if (!op || (host_no == MAX_HOST_NO)) {
                                        log_error("CHAP mode requires host "
                                                "no and valid operation");
                                        rc = ISCSI_ERR_INVAL;
@@ -3029,7 +3029,7 @@ main(int argc, char **argv)
                                                       value);
                                break;
                        case MODE_FLASHNODE:
-                               if (!host_no) {
+                               if (host_no == MAX_HOST_NO) {
                                        log_error("FLASHNODE mode requires host 
no");
                                        rc = ISCSI_ERR_INVAL;
                                        break;