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)

diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
index 8c885543ee60783b50abf25b821002b73112753d..0c3f707582264148e634693c670172f0815c1b56 100644 (file)
--- 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;