summaryrefslogtreecommitdiffstats
path: root/src/common/options.cc
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2021-03-24 16:23:44 +0100
committerIlya Dryomov <idryomov@gmail.com>2021-03-25 12:17:32 +0100
commite5744672dbde2a897f5f4959339472b7b10c5688 (patch)
tree05916b87a720f49a98aa7e700595804a4292b101 /src/common/options.cc
parentMerge pull request #40344 from zdover23/wip-doc-cephadm-index-rewrite-2021-Ma... (diff)
downloadceph-e5744672dbde2a897f5f4959339472b7b10c5688.tar.xz
ceph-e5744672dbde2a897f5f4959339472b7b10c5688.zip
auth: require CEPHX_V2 by default
It's been almost three years and support is present in all relevant clients. From the security perspective, roughly the same could be achieved with "ceph osd set-require-min-compat-client nautilus", but this is more user friendly as the client gets ENOTSUP instead of spinning on "feature set mismatch" faults. Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'src/common/options.cc')
-rw-r--r--src/common/options.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/options.cc b/src/common/options.cc
index 8003b4bdcb6..b9215b20de5 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -2333,7 +2333,7 @@ std::vector<Option> get_global_options() {
.set_description(""),
Option("cephx_require_version", Option::TYPE_INT, Option::LEVEL_ADVANCED)
- .set_default(1)
+ .set_default(2)
.set_description("Cephx version required (1 = pre-mimic, 2 = mimic+)"),
Option("cephx_cluster_require_signatures", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
@@ -2341,7 +2341,7 @@ std::vector<Option> get_global_options() {
.set_description(""),
Option("cephx_cluster_require_version", Option::TYPE_INT, Option::LEVEL_ADVANCED)
- .set_default(1)
+ .set_default(2)
.set_description("Cephx version required by the cluster from clients (1 = pre-mimic, 2 = mimic+)"),
Option("cephx_service_require_signatures", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
@@ -2349,7 +2349,7 @@ std::vector<Option> get_global_options() {
.set_description(""),
Option("cephx_service_require_version", Option::TYPE_INT, Option::LEVEL_ADVANCED)
- .set_default(1)
+ .set_default(2)
.set_description("Cephx version required from ceph services (1 = pre-mimic, 2 = mimic+)"),
Option("cephx_sign_messages", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)