File pacemaker-cib-do-not-terminate.patch of Package pacemaker.3577
commit 2cbbb6654e847d12b1ce10c525bd534057ea1d7c
Author: Andrew Beekhof <andrew@beekhof.net>
Date: Thu Oct 22 15:00:56 2015 +1100
Fix: cib: Do not terminate due to badly behaving clients
diff --git a/cib/callbacks.c b/cib/callbacks.c
index 2def784..8c32955 100644
--- a/cib/callbacks.c
+++ b/cib/callbacks.c
@@ -267,7 +267,7 @@ cib_common_callback(qb_ipcs_connection_t * c, void *data, size_t size, gboolean
}
if (is_set(call_options, cib_sync_call)) {
- CRM_ASSERT(flags & crm_ipc_client_response);
+ CRM_LOG_ASSERT(flags & crm_ipc_client_response);
CRM_LOG_ASSERT(cib_client->request_id == 0); /* This means the client has two synchronous events in-flight */
cib_client->request_id = id; /* Reply only to the last one */
}
@@ -286,7 +286,7 @@ cib_common_callback(qb_ipcs_connection_t * c, void *data, size_t size, gboolean
crm_xml_add(op_request, F_CIB_CLIENTNAME, cib_client->name);
#if ENABLE_ACL
- CRM_ASSERT(cib_client->user != NULL);
+ CRM_LOG_ASSERT(cib_client->user != NULL);
crm_acl_get_set_user(op_request, F_CIB_USER, cib_client->user);
#endif