summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-10-10 04:22:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:20:54 -0500
commita3a7c28765f100a28557ba30ec57bde030a6e363 (patch)
tree7a5b264659a0284ff944859063611ecd569267b4
parent7135bb9e6372b5514dcbd27c64b140bb4025edec (diff)
downloadsamba-a3a7c28765f100a28557ba30ec57bde030a6e363.tar.gz
samba-a3a7c28765f100a28557ba30ec57bde030a6e363.tar.bz2
samba-a3a7c28765f100a28557ba30ec57bde030a6e363.zip
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)
-rw-r--r--source4/lib/tls/tls.c3
1 files changed, 2 insertions, 1 deletions
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(&params->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;