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 <anoopcs@cryptolab.net>

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 5982bd82057386c93c189007227497b40e0abbde..03a13341ff74203ee233d52fa81120996adaa5b8 100644 (file)
--- 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 05fc1d459ef9036d6ff11d9fcc3b2aed35eb599f..c21a074a11cd49624380b3c24bee55eec90fca1c 100644 (file)
--- 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 bbd39f6e8660017947f364e01b5acc60dc399266..058c8f183096462bdc53a4ebd01b2cefbde9cc9b 100644 (file)
--- 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 74d2b8d3f82b8b69d65b099e4eeaa3bd6f90ddc6..00ec4bf4a99a6e9e124ceeed64649dba1780172b 100644 (file)
--- 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',