From f1b05a2b062a59ec1b6682f7683bfd816433a931 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 5 Jun 2017 13:17:19 -0400 Subject: [PATCH] rbd: properly decode features when using image name optional Fixes: http://tracker.ceph.com/issues/20185 Signed-off-by: Jason Dillaman --- src/tools/rbd/action/Feature.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/tools/rbd/action/Feature.cc b/src/tools/rbd/action/Feature.cc index 94a800b76f94e..45d4fcb4ff5c7 100644 --- a/src/tools/rbd/action/Feature.cc +++ b/src/tools/rbd/action/Feature.cc @@ -56,9 +56,14 @@ int execute(const po::variables_map &vm, bool enabled) { return r; } - const std::vector &args = vm[at::POSITIONAL_ARGUMENTS] - .as >(); - std::vector feature_names(args.begin() + 1, args.end()); + std::vector feature_names; + if (vm.count(at::POSITIONAL_ARGUMENTS)) { + const std::vector &args = + vm[at::POSITIONAL_ARGUMENTS].as >(); + feature_names.insert(feature_names.end(), args.begin() + arg_index, + args.end()); + } + if (feature_names.empty()) { std::cerr << "rbd: at least one feature name must be specified" << std::endl; -- 2.39.5