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

Update handling of --replication-user

Browse Source
This commit is contained in:
Ian Barwick
2017-06-16 22:10:07 +09:00
parent 030fdc046b
commit 6f77e84b62
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
repmgr-client.c
View File

@@ -204,6 +204,11 @@ main(int argc, char **argv)
runtime_options.force = true; runtime_options.force = true;
break; break;
/* --replication-user (master/standby register only) */
case OPT_REPLICATION_USER:
strncpy(runtime_options.replication_user, optarg, MAXLEN);
break;
/* -W/--wait */ /* -W/--wait */
case 'W': case 'W':
runtime_options.wait = true; runtime_options.wait = true;
@@ -350,10 +355,6 @@ main(int argc, char **argv)
break; break;
} }
case OPT_REPLICATION_USER:
strncpy(runtime_options.replication_user, optarg, MAXLEN);
break;
case OPT_UPSTREAM_CONNINFO: case OPT_UPSTREAM_CONNINFO:
strncpy(runtime_options.upstream_conninfo, optarg, MAXLEN); strncpy(runtime_options.upstream_conninfo, optarg, MAXLEN);
break; break;
@@ -1066,6 +1067,25 @@ check_cli_parameters(const int action)
} }
} }
if (runtime_options.replication_user[0])
{
switch (action)
{
case MASTER_REGISTER:
case STANDBY_REGISTER:
break;
case STANDBY_CLONE:
case STANDBY_FOLLOW:
item_list_append_format(&cli_warnings,
_("--replication-user ignored when executing %s)"),
action_name(action));
default:
item_list_append_format(&cli_warnings,
_("--replication-user not required when executing %s"),
action_name(action));
}
}
if (runtime_options.limit_provided) if (runtime_options.limit_provided)
{ {
switch (action) switch (action)