Don't allow both --source-server and --source-target args to pg_rewind.

hlinnaka · hlinnaka · commit 010a1b5614cc · 2016-10-07T14:35:45.000+03:00
They are supposed to be mutually exclusive, but there was no check for
that.

Michael Banck

Discussion: &lt;20161007103414.GD12247@nighthawk.caipicrew.dd-dns.de&gt;
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
@@ -158,6 +158,13 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
+	if (datadir_source != NULL && connstr_source != NULL)
+	{
+		fprintf(stderr, _("%s: only one of --source-pgdata or --source-server can be specified\n"), progname);
+		fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
+		exit(1);
+	}
+
 	if (datadir_target == NULL)
 	{
 		fprintf(stderr, _("%s: no target data directory specified (--target-pgdata)\n"), progname);

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,13 @@ main(int argc, char **argv)`
`158`	`158`	`exit(1);`
`159`	`159`	`}`
`160`	`160`
	`161`	`+ if (datadir_source != NULL && connstr_source != NULL)`
	`162`	`+ {`
	`163`	`+ fprintf(stderr, _("%s: only one of --source-pgdata or --source-server can be specified\n"), progname);`
	`164`	`+ fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);`
	`165`	`+ exit(1);`
	`166`	`+ }`
	`167`	`+`
`161`	`168`	`if (datadir_target == NULL)`
`162`	`169`	`{`
`163`	`170`	`fprintf(stderr, _("%s: no target data directory specified (--target-pgdata)\n"), progname);`