File pacemaker-crmd-resilient-checking-LRM-command-f... of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-crmd-resilient-checking-LRM-command-from.patch of Package pacemaker (Revision 0e051afa0cc7159c73d2a3fcc79577e4)

Currently displaying revision 0e051afa0cc7159c73d2a3fcc79577e4 , Show latest

commit abef9e8bdc0401168b513c90ccc3cb33d62c2379
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Mon Jan 16 15:24:55 2017 -0600

Low: crmd: be more resilient when checking an LRM command's "from"
    
    da486ed accidentally checked from_sys against CRM_SYSTEM_TENGINE twice.
    Also, don't assume from_sys is not NULL.

diff --git a/crmd/lrm.c b/crmd/lrm.c
index 9068652e4..9075fa715 100644
--- a/crmd/lrm.c
+++ b/crmd/lrm.c
@@ -1595,7 +1595,7 @@ do_lrm_invoke(long long action,
         fsa_cib_update(XML_CIB_TAG_STATUS, fragment, cib_quorum_override, rc, user_name);
         crm_info("Forced a local LRM refresh: call=%d", rc);
 
-        if(strcmp(CRM_SYSTEM_CRMD, from_sys) != 0) {
+        if (safe_str_neq(CRM_SYSTEM_CRMD, from_sys)) {
             xmlNode *reply = create_request(
                 CRM_OP_INVOKE_LRM, fragment,
                 from_host, from_sys, CRM_SYSTEM_LRMD, fsa_our_uuid);
@@ -1629,8 +1629,9 @@ do_lrm_invoke(long long action,
 
         force_reprobe(lrm_state, from_sys, from_host, user_name, is_remote_node);
 
-        if(strcmp(CRM_SYSTEM_TENGINE, from_sys) != 0
-           && strcmp(CRM_SYSTEM_TENGINE, from_sys) != 0) {
+        if (safe_str_neq(CRM_SYSTEM_PENGINE, from_sys)
+           && safe_str_neq(CRM_SYSTEM_TENGINE, from_sys)) {
+
             xmlNode *reply = create_request(
                 CRM_OP_INVOKE_LRM, NULL,
                 from_host, from_sys, CRM_SYSTEM_LRMD, fsa_our_uuid);

Places

File pacemaker-crmd-resilient-checking-LRM-command-from.patch of Package pacemaker (Revision 0e051afa0cc7159c73d2a3fcc79577e4)

Places