d49338dc97
- some Fixes from upstream(bsc#1043045)
Added:
0004-main-Display-reason-why-cluster-cannot-be-formed.patch
0005-votequorum-Report-errors-from-votequorum_exec_send_r.patch
0006-coroapi-Use-size_t-for-private_data_size.patch
OBS-URL: https://build.opensuse.org/request/show/501563
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=90
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
From afd97d788494007462b95a237161310af4c6e233 Mon Sep 17 00:00:00 2001
|
|
From: Michael Jones <jonesmz@jonesmz.com>
|
|
Date: Thu, 25 May 2017 13:29:19 -0500
|
|
Subject: [PATCH 6/6] coroapi: Use size_t for private_data_size
|
|
|
|
Unsigned int and size_t represent two different concepts.
|
|
|
|
Same problem was present in ipc_glue.
|
|
|
|
Signed-off-by: Michael Jones <jonesmz@jonesmz.com>
|
|
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
|
|
---
|
|
exec/ipc_glue.c | 2 +-
|
|
include/corosync/coroapi.h | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/exec/ipc_glue.c b/exec/ipc_glue.c
|
|
index d0a25d98..8b34d495 100644
|
|
--- a/exec/ipc_glue.c
|
|
+++ b/exec/ipc_glue.c
|
|
@@ -272,7 +272,7 @@ static void cs_ipcs_connection_created(qb_ipcs_connection_t *c)
|
|
struct cs_ipcs_conn_context *context;
|
|
char proc_name[32];
|
|
struct qb_ipcs_connection_stats stats;
|
|
- int32_t size = sizeof(struct cs_ipcs_conn_context);
|
|
+ size_t size = sizeof(struct cs_ipcs_conn_context);
|
|
char key_name[ICMAP_KEYNAME_MAXLEN];
|
|
int set_client_pid = 0;
|
|
int set_proc_name = 0;
|
|
diff --git a/include/corosync/coroapi.h b/include/corosync/coroapi.h
|
|
index ff02a54f..3a36f255 100644
|
|
--- a/include/corosync/coroapi.h
|
|
+++ b/include/corosync/coroapi.h
|
|
@@ -494,7 +494,7 @@ struct corosync_service_engine {
|
|
unsigned short priority; /* Lower priority are loaded first, unloaded last.
|
|
* 0 is a special case which always loaded _and_ unloaded last
|
|
*/
|
|
- unsigned int private_data_size;
|
|
+ size_t private_data_size;
|
|
enum cs_lib_flow_control flow_control;
|
|
enum cs_lib_allow_inquorate allow_inquorate;
|
|
char *(*exec_init_fn) (struct corosync_api_v1 *);
|
|
--
|
|
2.12.0
|
|
|