--- bin/ApplySnapshot	2003/08/05 21:10:28	1.4
+++ bin/ApplySnapshot	2003/11/02 15:43:05	1.7
@@ -19,13 +19,16 @@
 $| = 1;
 
 my ($debug,$verbose) = (0,0);
-my ($help,$slavehost,$slaveport,$slaveuser,$slavepassword);
-my $snapshot = "__Snapshot";
+my ($help,$slavehost,$slaveport,$slaveuser,$slavepassword,
+	$multiplemaster,
+);
+my $snapshot;
 
 my $result = GetOptions(
 	"debug!" => \$debug, "verbose!" => \$verbose, "help" => \$help,
 	"slavehost=s" => \$slavehost, "slaveport=i" => \$slaveport,
 	"slaveuser=s" => \$slaveuser, "slavepassword=s" => \$slavepassword,
+	"multiplemaster" => \$multiplemaster,
 	"snapshot=s" => \$snapshot,
 	);
 
@@ -34,6 +37,7 @@
 Options:
 	--slavehost=hostname --slaveport=port
 	--slaveuser=username --slavepassword=string
+	--multiplemaster
 	--snapshot=snapshot
 ";
     exit ((scalar(@ARGV) < 1)? 1:0);
@@ -41,11 +45,7 @@
 
 my $slave = $ARGV[0] || "slave";
 
-my $sinfo = "dbname=$slave";
-$sinfo = "$sinfo host=$slavehost" if (defined($slavehost));
-$sinfo = "$sinfo port=$slaveport" if (defined($slaveport));
-$sinfo = "$sinfo user=$slaveuser" if (defined($slaveuser));
-$sinfo = "$sinfo password=$slavepassword" if (defined($slavepassword));
+my $sinfo = MkInfo($slave,$slavehost,$slaveport,$slaveuser,$slavepassword);
 
 my $conn = Pg::connectdb($sinfo);
 
@@ -57,7 +57,7 @@
     $inpf = *STDIN;
 }
 
-my $res = ApplySnapshot ($conn, $inpf);
+my $res = ApplySnapshot ($conn, $inpf, $multiplemaster);
 
 if ($res > 0)
 {