diff --git a/docs-xml/smbdotconf/security/tlspriority.xml b/docs-xml/smbdotconf/security/tlspriority.xml index 6d1f0dcb912..471dc25ba3b 100644 --- a/docs-xml/smbdotconf/security/tlspriority.xml +++ b/docs-xml/smbdotconf/security/tlspriority.xml @@ -12,10 +12,8 @@ GNUTLS Priority-Strings documentation at http://gnutls.org/manual/html_node/Priority-Strings.html - By default it will try to find a config file matching "SAMBA", but if - that does not exist will use the entry for "SYSTEM" and last fallback to - NORMAL. In all cases the SSL3.0 protocol will be disabled. + The SSL3.0 protocol will be disabled. - @SAMBA,SYSTEM,NORMAL:!-VERS-SSL3.0 + NORMAL:-VERS-SSL3.0 diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 53eedeb0cb2..da639a8b0ff 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -2818,15 +2818,9 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lpcfg_do_global_parameter(lp_ctx, "tls keyfile", "tls/key.pem"); lpcfg_do_global_parameter(lp_ctx, "tls certfile", "tls/cert.pem"); lpcfg_do_global_parameter(lp_ctx, "tls cafile", "tls/ca.pem"); -#ifdef HAVE_GNUTLS_SET_DEFAULT_PRIORITY_APPEND - lpcfg_do_global_parameter(lp_ctx, - "tls priority", - "@SAMBA,SYSTEM,NORMAL:!-VERS-SSL3.0"); -#else lpcfg_do_global_parameter(lp_ctx, "tls priority", "NORMAL:-VERS-SSL3.0"); -#endif lpcfg_do_global_parameter(lp_ctx, "nsupdate command", "/usr/bin/nsupdate -g"); diff --git a/python/samba/tests/docs.py b/python/samba/tests/docs.py index 10339702a97..135be830521 100644 --- a/python/samba/tests/docs.py +++ b/python/samba/tests/docs.py @@ -29,22 +29,6 @@ import multiprocessing import concurrent.futures import tempfile -config_h = os.path.join("bin/default/include/config.h") -config_hash = dict() - -if os.path.exists(config_h): - config_hash = dict() - f = open(config_h, 'r') - try: - lines = f.readlines() - config_hash = dict((x[0], ' '.join(x[1:])) - for x in map(lambda line: line.strip().split(' ')[1:], - list(filter(lambda line: (line[0:7] == '#define') and (len(line.split(' ')) > 2), lines)))) - finally: - f.close() - -have_gnutls_system_config_support = ("HAVE_GNUTLS_SET_DEFAULT_PRIORITY_APPEND" in config_hash) - class TestCase(samba.tests.TestCaseInTempDir): def _format_message(self, parameters, message): @@ -234,11 +218,6 @@ class SmbDotConfTests(TestCase): 'smbd max async dosmode', ]) - # 'tls priority' has a legacy default value if we don't link against a - # modern GnuTLS version. - if not have_gnutls_system_config_support: - special_cases.add('tls priority') - def setUp(self): super(SmbDotConfTests, self).setUp() # create a minimal smb.conf file for testparm diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 0ceaa7d8edf..cf5da0aca21 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -886,15 +886,9 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals) lpcfg_string_set(Globals.ctx, &Globals._tls_keyfile, "tls/key.pem"); lpcfg_string_set(Globals.ctx, &Globals._tls_certfile, "tls/cert.pem"); lpcfg_string_set(Globals.ctx, &Globals._tls_cafile, "tls/ca.pem"); -#ifdef HAVE_GNUTLS_SET_DEFAULT_PRIORITY_APPEND lpcfg_string_set(Globals.ctx, &Globals.tls_priority, - "@SAMBA,SYSTEM,NORMAL:!-VERS-SSL3.0"); -#else - lpcfg_string_set(Globals.ctx, - &Globals.tls_priority, - "NORMAL!-VERS-SSL3.0"); -#endif + "NORMAL:-VERS-SSL3.0"); lpcfg_string_set(Globals.ctx, &Globals.share_backend, "classic");