From 3f1fe9b6c2ab5ebdf3bd79a5f18494356d1acf20 Mon Sep 17 00:00:00 2001 From: Ian Barwick Date: Thu, 28 Mar 2019 14:29:03 +0900 Subject: [PATCH] Updae BDR repmgrd to handle node_name as a max 63 char string Follow-up from commit 1953ec7. --- repmgr-action-bdr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/repmgr-action-bdr.c b/repmgr-action-bdr.c index 647d69bc..91f86385 100644 --- a/repmgr-action-bdr.c +++ b/repmgr-action-bdr.c @@ -216,7 +216,7 @@ do_bdr_register(void) ExtensionStatus other_node_extension_status = REPMGR_UNKNOWN; /* skip the local node */ - if (strncmp(node_info.node_name, bdr_cell->node_info->node_name, MAXLEN) == 0) + if (strncmp(node_info.node_name, bdr_cell->node_info->node_name, sizeof(node_info.node_name)) == 0) { continue; } @@ -304,9 +304,9 @@ do_bdr_register(void) node_info.active = true; node_info.priority = config_file_options.priority; - strncpy(node_info.node_name, config_file_options.node_name, MAXLEN); - strncpy(node_info.location, config_file_options.location, MAXLEN); - strncpy(node_info.conninfo, config_file_options.conninfo, MAXLEN); + strncpy(node_info.node_name, config_file_options.node_name, sizeof(node_info.node_name)); + strncpy(node_info.location, config_file_options.location, sizeof(node_info.location)); + strncpy(node_info.conninfo, config_file_options.conninfo, sizeof(node_info.conninfo)); if (record_status == RECORD_FOUND) { @@ -330,7 +330,7 @@ do_bdr_register(void) * name set when the node was registered. */ - if (strncmp(node_info.node_name, config_file_options.node_name, MAXLEN) != 0) + if (strncmp(node_info.node_name, config_file_options.node_name, sizeof(node_info.node_name)) != 0) { log_error(_("a record for node %i is already registered with node_name \"%s\""), config_file_options.node_id, node_info.node_name);