diff -urNp a/snmp_subagent/hbagentv2.c b/snmp_subagent/hbagentv2.c
--- a/snmp_subagent/hbagentv2.c	2009-07-16 15:27:16.000000000 +0900
+++ b/snmp_subagent/hbagentv2.c	2009-07-16 15:58:32.000000000 +0900
@@ -353,11 +353,22 @@ hbagentv2_update_diff(const char *event,
             free_xml(diff);
             return;
         }
+
+#if SUPPORT_HEARTBET
         if (STRNCMP_CONST(node_id, myuuid) != 0) {
             /* This change is not at my node */
             free_xml(diff);
             return;
         }
+#endif
+
+#if SUPPORT_AIS
+        if (STRNCMP_CONST(node_id, myid) != 0) {
+            /* This change is not at my node */
+            free_xml(diff);
+            return;
+        }
+#endif
 
         /* get the head pointer of <lrm_resource>  */
         lrm_rsc = find_xml_node(node_state, XML_CIB_TAG_LRM, FALSE);