Wb classlistattrref didn't always test for disabled

wb/lib/wb/src/wb_trv.cpp

@@ -1069,6 +1069,7 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
   int size;
   pwr_tObjid child;
   pwr_tCid child_cid;
+  pwr_tDisableAttr disabled;
 
   switch (depth) {
   case trv_eDepth_Deep:
@@ -1089,11 +1090,17 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
                 ldhses, &aref, ldh_eName_Hierarchy, &aname, &size);
             if (EVEN(sts))
               return sts;
-
+	    
             if (trv_wildcard(name, aname) == 1)
               continue;
           }
 
+	  sts = ldh_AttributeDisabled(ldhses, &aref, &disabled);
+	  if (EVEN(sts))
+	    return sts;
+	  if (disabled)
+	    continue;
+
           sts = (backcall)(&aref, arg1, arg2, arg3, arg4, arg5);
           if (EVEN(sts))
             return sts;
@@ -1118,6 +1125,12 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
             continue;
         }
 
+	sts = ldh_AttributeDisabled(ldhses, &aref, &disabled);
+	if (EVEN(sts))
+	  return sts;
+	if (disabled)
+	  continue;
+
         sts = (backcall)(&aref, arg1, arg2, arg3, arg4, arg5);
         if (EVEN(sts))
           return sts;
@@ -1155,6 +1168,12 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
                   continue;
               }
 
+	      sts = ldh_AttributeDisabled(ldhses, &aref, &disabled);
+	      if (EVEN(sts))
+		return sts;
+	      if (disabled)
+		continue;
+
               sts = (backcall)(&aref, arg1, arg2, arg3, arg4, arg5);
               if (EVEN(sts))
                 return sts;
@@ -1175,6 +1194,13 @@ int trv_get_attrobjects(ldh_tSesContext ldhses, pwr_tOid oid, pwr_tCid* cid,
           if (trv_wildcard(name, aname) == 1)
             continue;
         }
+
+	sts = ldh_AttributeDisabled(ldhses, &aref, &disabled);
+	if (EVEN(sts))
+	  return sts;
+	if (disabled)
+	  continue;
+
         sts = (backcall)(&aref, arg1, arg2, arg3, arg4, arg5);
         if (EVEN(sts))
           return sts;

wb/lib/wb/src/wb_volume.cpp

@@ -1123,7 +1123,13 @@ void wb_volume::aref(pwr_tCid cid, pwr_sAttrRef* arp)
         arp->Offset = item->offset[0];
         arp->Size = bd_size;
         arp->Body = cdh_cidToBid(cid, pwr_eBix_rt);
+	
         o->unref();
+	if (item->flags[0] & PWR_MASK_DISABLEATTR) {
+	  wb_attribute a = attribute(arp);
+	  if (a.disabled())
+	    continue;
+	}
         return;
       }
     }