From a3a7c28765f100a28557ba30ec57bde030a6e363 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 10 Oct 2006 04:22:00 +0000 Subject: r19217: Merge from SAMBA_4_0_RELEASE: Re-enable TLS in the default configuration. We passed on the build farm because we have an explicit diffie-hilliman parameters file set. Andrew Bartlett (This used to be commit d20ab6a5ed7f980cb653e965c4de3de8d058d9c4) --- source4/lib/tls/tls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/lib') diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c index 8c885543ee..0c3f707582 100644 --- a/source4/lib/tls/tls.c +++ b/source4/lib/tls/tls.c @@ -417,12 +417,13 @@ struct tls_params *tls_initialise(TALLOC_CTX *mem_ctx) ret = gnutls_dh_params_init(¶ms->dh_params); if (ret < 0) goto init_failed; - if (dhpfile) { + if (dhpfile && *dhpfile) { gnutls_datum_t dhparms; size_t size; dhparms.data = (uint8_t *)file_load(dhpfile, &size, mem_ctx); if (!dhparms.data) { + DEBUG(0,("Failed to read DH Parms from %s\n", dhpfile)); goto init_failed; } dhparms.size = size; -- cgit