github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 08:36:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Use maxlen_snprintf() in do_witness_create()

Browse Source
This commit is contained in:
Ian Barwick
2016-01-20 15:13:52 +09:00
parent a4c07b23fb
commit ba71e1eedf
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
repmgr.c
View File

@@ -3361,11 +3361,11 @@ do_witness_create(void)
if (!runtime_options.superuser[0]) if (!runtime_options.superuser[0])
strncpy(runtime_options.superuser, "postgres", MAXLEN); strncpy(runtime_options.superuser, "postgres", MAXLEN);
sprintf(script, "%s %s -D %s init -o \"%s-U %s\"", maxlen_snprintf(script, "%s %s -D %s init -o \"%s-U %s\"",
make_pg_path("pg_ctl"), make_pg_path("pg_ctl"),
options.pg_ctl_options, runtime_options.dest_dir, options.pg_ctl_options, runtime_options.dest_dir,
runtime_options.initdb_no_pwprompt ? "" : "-W ", runtime_options.initdb_no_pwprompt ? "" : "-W ",
runtime_options.superuser); runtime_options.superuser);
log_info(_("initializing cluster for witness: %s.\n"), script); log_info(_("initializing cluster for witness: %s.\n"), script);
r = system(script); r = system(script);
@@ -3441,9 +3441,9 @@ do_witness_create(void)
/* start new instance */ /* start new instance */
sprintf(script, "%s %s -w -D %s start", maxlen_snprintf(script, "%s %s -w -D %s start",
make_pg_path("pg_ctl"), make_pg_path("pg_ctl"),
options.pg_ctl_options, runtime_options.dest_dir); options.pg_ctl_options, runtime_options.dest_dir);
log_info(_("starting witness server: %s\n"), script); log_info(_("starting witness server: %s\n"), script);
r = system(script); r = system(script);
if (r != 0) if (r != 0)
@@ -3464,11 +3464,11 @@ do_witness_create(void)
/* check if we need to create a user */ /* check if we need to create a user */
if (runtime_options.username[0] && runtime_options.localport[0] && strcmp(runtime_options.username,"postgres") != 0) if (runtime_options.username[0] && runtime_options.localport[0] && strcmp(runtime_options.username,"postgres") != 0)
{ {
/* create required user; needs to be superuser to create untrusted language function in c */ /* create required user; needs to be superuser to create untrusted language function in c */
sprintf(script, "%s -p %s --superuser --login -U %s %s", maxlen_snprintf(script, "%s -p %s --superuser --login -U %s %s",
make_pg_path("createuser"), make_pg_path("createuser"),
runtime_options.localport, runtime_options.superuser, runtime_options.username); runtime_options.localport, runtime_options.superuser, runtime_options.username);
log_info(_("creating user for witness db: %s.\n"), script); log_info(_("creating user for witness db: %s.\n"), script);
r = system(script); r = system(script);
@@ -3492,9 +3492,9 @@ do_witness_create(void)
if (runtime_options.dbname[0] && strcmp(runtime_options.dbname,"postgres") != 0 && runtime_options.localport[0]) if (runtime_options.dbname[0] && strcmp(runtime_options.dbname,"postgres") != 0 && runtime_options.localport[0])
{ {
/* create required db */ /* create required db */
sprintf(script, "%s -p %s -U %s --owner=%s %s", maxlen_snprintf(script, "%s -p %s -U %s --owner=%s %s",
make_pg_path("createdb"), make_pg_path("createdb"),
runtime_options.localport, runtime_options.superuser, runtime_options.username, runtime_options.dbname); runtime_options.localport, runtime_options.superuser, runtime_options.username, runtime_options.dbname);
log_info("creating database for witness db: %s.\n", script); log_info("creating database for witness db: %s.\n", script);
r = system(script); r = system(script);
@@ -3552,9 +3552,9 @@ do_witness_create(void)
} }
/* reload to adapt for changed pg_hba.conf */ /* reload to adapt for changed pg_hba.conf */
sprintf(script, "%s %s -w -D %s reload", maxlen_snprintf(script, "%s %s -w -D %s reload",
make_pg_path("pg_ctl"), make_pg_path("pg_ctl"),
options.pg_ctl_options, runtime_options.dest_dir); options.pg_ctl_options, runtime_options.dest_dir);
log_info(_("reloading witness server configuration: %s"), script); log_info(_("reloading witness server configuration: %s"), script);
r = system(script); r = system(script);
if (r != 0) if (r != 0)