From 6472b9bc2a64b3930753de86565f7ab86938c813 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Thu, 20 Jun 2024 10:54:27 +0530 Subject: [PATCH] mgr/smb: Use the default for minimum protocol version 'server min protocol' smb.conf option indicates the minimum SMB protocol version that the server can support during client negotiation phase. We can be generous in this case to accept various client implementations with a subset of supported protocol versions. With 'SMB2' it selects the highest available version from the list of sub protocols. Instead we refrain from configuring the option to support the least possible SMB2 version by default(which is SMB2_02 at this point in time) from Samba. ref: https://www.samba.org/samba/docs/current/man-html/smb.conf.5.html Signed-off-by: Anoop C S --- qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml | 1 - qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml | 1 - src/pybind/mgr/smb/handler.py | 1 - src/pybind/mgr/smb/tests/test_smb.py | 1 - 4 files changed, 4 deletions(-) diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml index 5982bd8205738..03a13341ff742 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml @@ -52,7 +52,6 @@ tasks: "read only" = "no" "browseable" = "yes" [globals.default.options] - "server min protocol" = "SMB2" "load printers" = "no" "printing" = "bsd" "printcap name" = "/dev/null" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml index 05fc1d459ef90..c21a074a11cd4 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml @@ -51,7 +51,6 @@ tasks: "read only" = "no" "browseable" = "yes" [globals.default.options] - "server min protocol" = "SMB2" "load printers" = "no" "printing" = "bsd" "printcap name" = "/dev/null" diff --git a/src/pybind/mgr/smb/handler.py b/src/pybind/mgr/smb/handler.py index bbd39f6e86600..058c8f1830964 100644 --- a/src/pybind/mgr/smb/handler.py +++ b/src/pybind/mgr/smb/handler.py @@ -1069,7 +1069,6 @@ def _generate_config( 'globals': { 'default': { 'options': { - 'server min protocol': 'SMB2', 'load printers': 'No', 'printing': 'bsd', 'printcap name': '/dev/null', diff --git a/src/pybind/mgr/smb/tests/test_smb.py b/src/pybind/mgr/smb/tests/test_smb.py index 74d2b8d3f82b8..00ec4bf4a99a6 100644 --- a/src/pybind/mgr/smb/tests/test_smb.py +++ b/src/pybind/mgr/smb/tests/test_smb.py @@ -446,7 +446,6 @@ def test_share_dump_config(tmodule): 'globals': { 'default': { 'options': { - 'server min protocol': 'SMB2', 'load printers': 'No', 'printing': 'bsd', 'printcap name': '/dev/null', -- 2.39.5