[Linuxisns-commit] isnsNT/isnsserver/src iSNSquery.c, 1.20, 1.21 iSNSreg.c, 1.24, 1.25

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

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

Modified Files:
	iSNSquery.c iSNSreg.c 
Log Message:
Fix Check_Permission logic

Index: iSNSreg.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSreg.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** iSNSreg.c	15 Mar 2007 22:28:30 -0000	1.24
--- iSNSreg.c	30 Mar 2007 22:56:14 -0000	1.25
***************
*** 3555,3558 ****
--- 3555,3560 ----
     int ii;
  
+    DEBUG_1 (isns_reg_debug &1,(Append_DD_to_List id=%i),id);
+ 
     for (ii = 0; ii < MAX_DD_PER_LIST; ii++)
     {

Index: iSNSquery.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSquery.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** iSNSquery.c	6 Feb 2007 23:13:10 -0000	1.20
--- iSNSquery.c	30 Mar 2007 22:56:14 -0000	1.21
***************
*** 2618,2621 ****
--- 2618,2622 ----
     SOIP_Dd_Member *p_member;
     SOIP_DB_Entry lentry;
+    int index_Flag = -1;
  
     for (ii = 0; (ii < SNS_MAX_ATTRS) && (attr_indx[ii]); ii++)
***************
*** 2669,2672 ****
--- 2670,2680 ----
                                 PAD4 (strlen (p_member->node_id)),
                                 p_member->node_id, 0);
+ 
+            index_Flag = ISNSFindTag (0, ISNS_DD_ISCSI_MEMBER_IDX, attr_indx);
+            if (index_Flag != -1 )
+              if (p_member->type == ISNS_DD_ISCSI_MEMBER)
+                ISNSAppendAttr (p_msg, ISNS_DD_ISCSI_MEMBER_IDX,
+                                ISNS_DD_ISCSI_MEMBER_IDX_SIZE,
+                                NULL, p_member->node_idx);
           }
           break;
***************
*** 2680,2690 ****
                                 ISNS_PORT_NAME_SIZE, p_member->node_id,
                                 0);
!          }
!          break;
!       case ISNS_DD_ISCSI_MEMBER_IDX:
!          pnode=NULL;
!          while ((pnode=GetNextNode(&p_dd->member_list, pnode)))
!          {
!              p_member=(SOIP_Dd_Member *)GetNodeData(pnode);
               if (p_member->type == ISNS_DD_ISCSI_MEMBER)
                 ISNSAppendAttr (p_msg, ISNS_DD_ISCSI_MEMBER_IDX,
--- 2688,2693 ----
                                 ISNS_PORT_NAME_SIZE, p_member->node_id,
                                 0);
!            index_Flag = ISNSFindTag (0, ISNS_DD_ISCSI_MEMBER_IDX, attr_indx);
!            if (index_Flag != -1 )
               if (p_member->type == ISNS_DD_ISCSI_MEMBER)
                 ISNSAppendAttr (p_msg, ISNS_DD_ISCSI_MEMBER_IDX,
***************
*** 3403,3406 ****
--- 3406,3411 ----
     int           rval;
  
+    DEBUG_1(isns_query_debug & 1, (Get_Active_DD_List_From_ISCSI_Node nodename=%s),nodename);
+ 
     /* Fetch the node */
     key.tag = ISCSI_ID_KEY;
***************
*** 3524,3528 ****
     for (ii = 0; ii < MAX_DD_PER_LIST; ii++)
     {
!       if (p_dlist_node[ii]==0)
           break;
  
--- 3529,3533 ----
     for (ii = 0; ii < MAX_DD_PER_LIST; ii++)
     {
!       if (p_dlist_src[ii]==0)
           break;
  
***************
*** 3547,3550 ****
--- 3552,3557 ----
     int rval;
  
+    DEBUG_1 (isns_query_debug &1,(Check_Permission src_node_name=%s),src_attr->val.node_name.v);
+ 
     /* check if control node */
     if ( 0 == strcmp (src_attr->val.node_name.v, isns_control_node) )
***************
*** 3567,3571 ****
            memset (dlist_node, 0, MAX_DD_PER_LIST*sizeof(uint32_t));
  
!           DEBUG_0 (isns_query_debug &1, Get_Active_DD_List);
            Get_Active_DD_List (&pnode->dd_id_list, dlist_node, 0);
  
--- 3574,3578 ----
            memset (dlist_node, 0, MAX_DD_PER_LIST*sizeof(uint32_t));
  
!           DEBUG_0 (isns_query_debug &1, call Get_Active_DD_List);
            Get_Active_DD_List (&pnode->dd_id_list, dlist_node, 0);