[Linuxisns-commit] isnsNT/isnsclient/src entity.c, 1.10, 1.11 isns.c, 1.12, 1.13 portal.c, 1.10, 1.11

[Robert W. <wrw...@us...>]

Update of /cvsroot/linuxisns/isnsNT/isnsclient/src
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30868/isnsclient/src

Modified Files:
	entity.c isns.c portal.c 
Log Message:
fixed dd query returning incorrect MEMBER_IDX tags

Index: isns.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/isns.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** isns.c	23 Aug 2007 02:50:20 -0000	1.12
--- isns.c	23 Aug 2007 04:00:52 -0000	1.13
***************
*** 134,138 ****
     src_type = 0;
     if (0 !=  GetInput (cmdLine,"SRC type",
!                  "*Default Control Node *1:Control Node 2:iSCSI Node 3:iFCP Node", sizeof (cmdLine)))
     {
        src_type = atoi (cmdLine);
--- 134,138 ----
     src_type = 0;
     if (0 !=  GetInput (cmdLine,"SRC type",
!                  "*1:Control Node 2:iSCSI Node 3:iFCP Node", sizeof (cmdLine)))
     {
        src_type = atoi (cmdLine);

Index: portal.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/portal.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** portal.c	14 Aug 2007 03:43:55 -0000	1.10
--- portal.c	23 Aug 2007 04:00:52 -0000	1.11
***************
*** 245,251 ****
--- 245,255 ----
              break;
           default:
+                ISNSAppendAttr (&cmd, ISNS_PORTAL_IP, 0, NULL, 0);
              break;
        }
     }
+    else
+       ISNSAppendAttr (&cmd, ISNS_PORTAL_IP, 0, NULL, 0);
+ 
  
     ISNSAppendAttr (&cmd, 0, 0, NULL, 0);

Index: entity.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/entity.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** entity.c	23 Aug 2007 02:50:20 -0000	1.10
--- entity.c	23 Aug 2007 04:00:52 -0000	1.11
***************
*** 159,162 ****
--- 159,163 ----
     ISNS_CMD cmd;
     int key_type = 0;
+    int added = FALSE;
  
     printf ("Query For Entities.\n");
***************
*** 192,197 ****
--- 193,200 ----
                 ISNSAppendAttr (&cmd, ISNS_ENTITY_ID, PAD4 (strlen (cmdLine)),
                                 cmdLine, 0);
+       	       added = TRUE;
              }
              else
+             if (!added)
                 ISNSAppendAttr (&cmd, ISNS_ENTITY_ID, 0, NULL, 0);