1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00

tls: Use NORMAL:-VERS-SSL3.0 as the default configuration

This seems to be really broken in GnuTLS and the documentation is also
not correct.

This partially reverts 53e3a959b9

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14408

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Jul  1 14:56:33 UTC 2020 on sn-devel-184
This commit is contained in:
Andreas Schneider
2020-06-30 17:12:17 +02:00
committed by Andrew Bartlett
parent cabf873b75
commit d308650145
4 changed files with 3 additions and 38 deletions

View File

@ -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