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

Merge branch 'no-passwords'

Browse Source 
GitHub pull request #255
This commit is contained in:
Ian Barwick
2016-12-08 22:56:04 +09:00
parent a21b16f960 402e02f4b7
commit f5e3d7c041
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
repmgr.c
View File

@@ -242,6 +242,7 @@ main(int argc, char **argv)
{"local-port", required_argument, NULL, 'l'}, {"local-port", required_argument, NULL, 'l'},
{"initdb-no-pwprompt", no_argument, NULL, OPT_INITDB_NO_PWPROMPT}, {"initdb-no-pwprompt", no_argument, NULL, OPT_INITDB_NO_PWPROMPT},
{"ignore-external-config-files", no_argument, NULL, OPT_IGNORE_EXTERNAL_CONFIG_FILES}, {"ignore-external-config-files", no_argument, NULL, OPT_IGNORE_EXTERNAL_CONFIG_FILES},
{"no-conninfo-password", no_argument, NULL, OPT_NO_CONNINFO_PASSWORD},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
@@ -528,6 +529,9 @@ main(int argc, char **argv)
case OPT_UPSTREAM_CONNINFO: case OPT_UPSTREAM_CONNINFO:
strncpy(runtime_options.upstream_conninfo, optarg, MAXLEN); strncpy(runtime_options.upstream_conninfo, optarg, MAXLEN);
break; break;
case OPT_NO_CONNINFO_PASSWORD:
runtime_options.no_conninfo_password = true;
break;
case OPT_REGISTER_WAIT: case OPT_REGISTER_WAIT:
runtime_options.wait_register_sync = true; runtime_options.wait_register_sync = true;
if (optarg != NULL) if (optarg != NULL)
@@ -6361,6 +6365,7 @@ do_help(void)
printf(_(" --no-upstream-connection (standby clone) when using Barman, do not connect to upstream node\n")); printf(_(" --no-upstream-connection (standby clone) when using Barman, do not connect to upstream node\n"));
printf(_(" --upstream-conninfo (standby clone) 'primary_conninfo' value to write in recovery.conf\n" \ printf(_(" --upstream-conninfo (standby clone) 'primary_conninfo' value to write in recovery.conf\n" \
" when the intended upstream server does not yet exist\n")); " when the intended upstream server does not yet exist\n"));
printf(_(" --no-conninfo-password (standby clone) do not write passwords into primary_conninfo\n"));
printf(_(" --without-barman (standby clone) do not use Barman even if configured\n")); printf(_(" --without-barman (standby clone) do not use Barman even if configured\n"));
printf(_(" --recovery-min-apply-delay=VALUE (standby clone, follow) set recovery_min_apply_delay\n" \ printf(_(" --recovery-min-apply-delay=VALUE (standby clone, follow) set recovery_min_apply_delay\n" \
" in recovery.conf (PostgreSQL 9.4 and later)\n")); " in recovery.conf (PostgreSQL 9.4 and later)\n"));
@@ -6543,6 +6548,8 @@ write_primary_conninfo(char *line, t_conninfo_param_list *param_list)
*/ */
if (strcmp(param_list->keywords[c], "dbname") == 0 || if (strcmp(param_list->keywords[c], "dbname") == 0 ||
strcmp(param_list->keywords[c], "replication") == 0 || strcmp(param_list->keywords[c], "replication") == 0 ||
(runtime_options.no_conninfo_password &&
strcmp(param_list->keywords[c], "password") == 0) ||
(param_list->values[c] == NULL) || (param_list->values[c] == NULL) ||
(param_list->values[c] != NULL && param_list->values[c][0] == '\0')) (param_list->values[c] != NULL && param_list->values[c][0] == '\0'))
continue; continue;

4
repmgr.h
View File

@@ -64,6 +64,7 @@
#define OPT_CLUSTER 13 #define OPT_CLUSTER 13
#define OPT_LOG_TO_FILE 14 #define OPT_LOG_TO_FILE 14
#define OPT_UPSTREAM_CONNINFO 15 #define OPT_UPSTREAM_CONNINFO 15
#define OPT_NO_CONNINFO_PASSWORD 16
/* deprecated command line options */ /* deprecated command line options */
#define OPT_INITDB_NO_PWPROMPT 998 #define OPT_INITDB_NO_PWPROMPT 998
@@ -108,6 +109,7 @@ typedef struct
bool fast_checkpoint; bool fast_checkpoint;
bool without_barman; bool without_barman;
bool no_upstream_connection; bool no_upstream_connection;
bool no_conninfo_password;
bool copy_external_config_files; bool copy_external_config_files;
int copy_external_config_files_destination; int copy_external_config_files_destination;
bool wait_register_sync; bool wait_register_sync;
@@ -152,7 +154,7 @@ typedef struct
false, false, false, \ false, false, false, \
/* standby clone parameters */ \ /* standby clone parameters */ \
false, DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, false, \ false, DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, false, \
CONFIG_FILE_SAMEPATH, false, 0, "", "", \ false, CONFIG_FILE_SAMEPATH, false, 0, "", "", \
/* witness create parameters */ \ /* witness create parameters */ \
false, \ false, \
/* standby follow parameters */ \ /* standby follow parameters */ \