--- bin/PrepareSnapshot	2003/10/30 22:51:45	1.9
+++ bin/PrepareSnapshot	2003/10/30 23:01:07	1.10
@@ -22,14 +22,12 @@
 my ($help,$masterhost,$masterport,$masteruser,$masterpassword,
 	$slavehost,$slaveport,$slaveuser,$slavepassword);
 my $snapshot;
-my $mserver = 0;
 
 my $result = GetOptions(
 	"debug!" => \$debug, "verbose!" => \$verbose, "help" => \$help,
 	"masterhost=s" => \$masterhost, "masterport=i" => \$masterport,
 	"masteruser=s" => \$masteruser, "masterpassword=s" => \$masterpassword,
 	"snapshot=s" => \$snapshot,
-	"masterserver=i" => \$mserver,
 	);
 
 if (defined($help) || (scalar(@ARGV) < 2)) {
@@ -38,7 +36,6 @@
 	--masterhost=hostname --masterport=port
 	--masteruser=username --masterpassword=string
 	--snapshot=snapshot
-	[--masterserver=master_number]
 ";
     exit ((scalar(@ARGV) < 2)? 1:0);
 }
@@ -86,13 +83,20 @@
 
 $slavehost = 'localhost' if (! $slavehost);
 my $slaveId  = GetServerId($mconn, $slave, $slavehost);
-if (! $slaveId) {
+if (! defined($slaveId)) {
 	print STDERR "Can't find SlaveId for db '$slave' on host $slavehost. Is this database slave?\n";
 	exit 1;
 }
 die "Unknown SlaveId $slaveId for host $slavehost" if ($slaveId < 0);
 
-my $res = PrepareSnapshot ($mconn, $sconn, $outf, $mserver, $slaveId);
+$masterhost = 'localhost' if (! $masterhost);
+my $masterId  = GetServerId($mconn, $master, $masterhost);
+if (! defined($masterId)) {
+	print STDERR "Can't find masterId for db '$master' on host $masterhost. Is this database master?\n";
+	exit 1;
+}
+die "Unknown masterId $masterId for host $masterhost" if ($masterId < 0);
+my $res = PrepareSnapshot ($mconn, $sconn, $outf, $masterId, $slaveId);
 
 if ($res == 0)
 {