Convert execd to use pcmk__request_t

daemons/attrd/attrd_ipc.c

@@ -596,7 +596,7 @@ attrd_ipc_dispatch(qb_ipcs_connection_t * c, void *data, size_t size)
 
     if (xml == NULL) {
         crm_debug("Unrecognizable IPC data from PID %d", pcmk__client_pid(c));
-        pcmk__ipc_send_ack(client, id, flags, PCMK__XE_ACK, NULL,
+        pcmk__ipc_send_ack(client, id, flags, PCMK__XE_NACK, NULL,
                            CRM_EX_PROTOCOL);
         return 0;
 

daemons/attrd/attrd_messages.c

@@ -59,7 +59,8 @@ handle_unknown_request(pcmk__request_t *request)
             request->op, pcmk__request_origin_type(request),
             pcmk__request_origin(request));
     pcmk__format_result(&request->result, CRM_EX_PROTOCOL, PCMK_EXEC_INVALID,
-                        "Unknown request type '%s' (bug?)", request->op);
+                        "Unknown request type '%s' (bug?)",
+                        pcmk__s(request->op, ""));
     return NULL;
 }
 

daemons/attrd/attrd_sync.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the Pacemaker project contributors
+ * Copyright 2022-2025 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -379,7 +379,7 @@ confirmation_timeout_cb(gpointer data)
             crm_trace("Timed out waiting for confirmations for client %s", client->id);
             pcmk__ipc_send_ack(client, action->ipc_id,
                                action->flags|crm_ipc_client_response,
-                               PCMK__XE_ACK, ATTRD_PROTOCOL_VERSION,
+                               PCMK__XE_NACK, ATTRD_PROTOCOL_VERSION,
                                CRM_EX_TIMEOUT);
 
             g_hash_table_iter_remove(&iter);

daemons/based/based_callbacks.c

@@ -292,7 +292,14 @@ cib_common_callback_worker(uint32_t id, uint32_t flags, xmlNode * op_request,
             }
         }
 
-        pcmk__ipc_send_ack(cib_client, id, flags, PCMK__XE_ACK, NULL, status);
+        if (status == CRM_EX_OK) {
+            pcmk__ipc_send_ack(cib_client, id, flags, PCMK__XE_ACK, NULL,
+                               status);
+        } else {
+            pcmk__ipc_send_ack(cib_client, id, flags, PCMK__XE_NACK, NULL,
+                               status);
+        }
+
         return;
     }
 

daemons/controld/controld_control.c

@@ -413,7 +413,7 @@ dispatch_controller_ipc(qb_ipcs_connection_t * c, void *data, size_t size)
     }
 
     if (msg == NULL) {
-        pcmk__ipc_send_ack(client, id, flags, PCMK__XE_ACK, NULL,
+        pcmk__ipc_send_ack(client, id, flags, PCMK__XE_NACK, NULL,
                            CRM_EX_PROTOCOL);
         return 0;
     }

daemons/execd/Makefile.am

@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2024 the Pacemaker project contributors
+# Copyright 2012-2025 the Pacemaker project contributors
 #
 # The version control history for this file may have further details.
 #
@@ -25,7 +25,8 @@ pacemaker_execd_LDADD += $(top_builddir)/lib/services/libcrmservice.la
 pacemaker_execd_LDADD += $(top_builddir)/lib/common/libcrmcommon.la
 pacemaker_execd_SOURCES	= pacemaker-execd.c 	\
 			  execd_commands.c 	\
-			  execd_alerts.c
+			  execd_alerts.c 	\
+			  execd_messages.c
 
 sbin_PROGRAMS		= pacemaker-remoted
 if BUILD_SYSTEMD

daemons/execd/execd_alerts.c

@@ -102,7 +102,7 @@ alert_complete(svc_action_t *action)
 }
 
 int
-process_lrmd_alert_exec(pcmk__client_t *client, uint32_t id, xmlNode *request)
+execd_process_alert_exec(pcmk__client_t *client, xmlNode *request)
 {
     static int alert_sequence_no = 0;
 
@@ -114,17 +114,17 @@ process_lrmd_alert_exec(pcmk__client_t *client, uint32_t id, xmlNode *request)
                                                PCMK__XA_LRMD_ALERT_PATH);
     svc_action_t *action = NULL;
     int alert_timeout = 0;
-    int rc = pcmk_ok;
+    int rc = pcmk_rc_ok;
     GHashTable *params = NULL;
     struct alert_cb_s *cb_data = NULL;
 
     if ((alert_id == NULL) || (alert_path == NULL) ||
         (client == NULL) || (client->id == NULL)) { /* hint static analyzer */
-        rc = -EINVAL;
+        rc = EINVAL;
         goto err;
     }
     if (draining_alerts) {
-        return pcmk_ok;
+        return pcmk_rc_ok;
     }
 
     crm_element_value_int(alert_xml, PCMK__XA_LRMD_TIMEOUT, &alert_timeout);
@@ -144,20 +144,21 @@ process_lrmd_alert_exec(pcmk__client_t *client, uint32_t id, xmlNode *request)
     action = services_alert_create(alert_id, alert_path, alert_timeout, params,
                                    alert_sequence_no, cb_data);
     if (action->rc != PCMK_OCF_UNKNOWN) {
-        rc = -E2BIG;
+        rc = E2BIG;
         goto err;
     }
 
     rc = services_action_user(action, CRM_DAEMON_USER);
     if (rc < 0) {
+        rc = pcmk_legacy2rc(rc);
         goto err;
     }
 
     add_inflight_alert(cb_data->call_id, alert_timeout);
     if (services_alert_async(action, alert_complete) == FALSE) {
         services_action_free(action);
     }
-    return pcmk_ok;
+    return pcmk_rc_ok;
 
 err:
     if (cb_data) {