postgres.git / summary / log / commit / refs

commit    0d4d7d61850f4f4bc5f6fd0b7a9adb70232aed61
Author:   Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date:     Fri Oct 07 11:35:17 2016 +0000

    Don't allow both --source-server and --source-target args to pg_rewind.
    
    They are supposed to be mutually exclusive, but there was no check for
    that.
    
    Michael Banck
    
    Discussion: <20161007103414.GD12247@nighthawk.caipicrew.dd-dns.de>


 src/bin/pg_rewind/pg_rewind.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 5fdd4c56050..dd62dd05491 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -162,6 +162,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);


[parent: 275bf98601b2]