Commit 128e4c39 authored by Leigh B Stoller's avatar Leigh B Stoller

Bug fix in blockstore name checking.

parent 1b9405f6
......@@ -7061,12 +7061,16 @@ sub HandleBlockstore($$$$$$@)
$message = "Illegal blockstore class";
goto bad;
}
if ($class eq "local" &&
(!defined($bsname) ||
!TBcheck_dbslot($bsname, "blockstores", "bs_id",
TBDB_CHECKDBSLOT_WARN|TBDB_CHECKDBSLOT_ERROR))) {
$message = "Illegal blockstore name: $bsname";
goto bad;
if ($class eq "local") {
if (!defined($bsname)) {
$message = "Local blockstores must be named";
goto bad;
}
if (!TBcheck_dbslot($bsname, "blockstores", "bs_id",
TBDB_CHECKDBSLOT_WARN|TBDB_CHECKDBSLOT_ERROR)) {
$message = "Illegal blockstore name: $bsname";
goto bad;
}
}
if (!defined($mount)) {
$message = "Missing blockstore mount point";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment